shish 11 месяцев назад
Родитель
Сommit
f806acd1e6
3 измененных файлов с 34 добавлено и 48 удалено
  1. 28 42
      hdApp/src/admin/home/apply.vue
  2. 4 4
      hdApp/src/admin/home/workbench.vue
  3. 2 2
      hdApp/src/pages.json

+ 28 - 42
hdApp/src/admin/home/apply.vue

@@ -29,61 +29,37 @@ export default {
   data () {
     return {
       menuList: [
-        {
-            title:'花材',
-            list:[
-
-                {name: "花材",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/item/list2",pf:1},
-                {name: "花材分类",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/itemClass/list",pf:1},
-                {name: "停用",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/item/list?delStatus=1",pf:1},
-                { name: "花材盘点", img: `${this.$constant.hostUrl}/image/ghs/home/pandian2.png`, url: "/pagesStorehouse/inventory/list",pf:1}
-            ]
-        },
         {
             title:'花束',
             list:[
-                { name: "花束", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/list",pf:1},
-                { name: "花束分类", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/category",pf:1},
+                { name: "列表", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/list",pf:1},
+                { name: "分类", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/category",pf:1},
+                { name: "排序", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/categorySort",pf:1},
                 { name: "涨价设置", img: `${this.$constant.hostUrl}/image/ghs/home/gj2.png`, url: "/admin/goods/price-increase",pf:1},
-                { name: "花束排序", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/categorySort",pf:1},
-                { name: "图文", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/picText/picTextList",pf:1},
             ]
         },
         {
-            title:'绿植',
+            title:'绿植花材',
             list:[
-                { name: "绿植", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/lz",pf:1},
-                { name: "绿植品种", img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`, url: "/admin/goods/lzKind",pf:1},
-                { name: "绿植采购", img: `${this.$constant.hostUrl}/image/ghs/home/icon_caigou2.png`, url: "/admin/goods/plantCg",pf:1},
-                { name: "绿植盘点", img: `${this.$constant.hostUrl}/image/ghs/home/pandian2.png`, url: "/admin/goods/pdList",pf:1}
+                {name: "列表",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/item/list2",pf:1},
+                {name: "分类",img: `${this.$constant.hostUrl}/image/ghs/home/hcgl2.png`,url: "/admin/itemClass/list",pf:1},
+                { name: "盘点", img: `${this.$constant.hostUrl}/image/ghs/home/pandian2.png`, url: "/pagesStorehouse/inventory/list",pf:1},
+                { name: "调拨出库", img: `${this.$constant.hostUrl}/image/ghs/home/dbck2.png`, url: "/pagesStorehouse/allot/allotEx",pf:0},
+                { name: "调拨入库", img: `${this.$constant.hostUrl}/image/ghs/home/dbrk2.png`, url: "/pagesStorehouse/allot/allotPut",pf:0},
+                { name: "库存预警", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/pagesStorehouse/stockWarn/manage",pf:1},
+                { name: "供货商", img: `${this.$constant.hostUrl}/image/ghs/home/icon_ghs2.png`, url: "/pagesPurchase/order",pf:1},
+                { name: "采购单", img: `${this.$constant.hostUrl}/image/ghs/home/icon_caigou2.png`, url: "/pagesPurchase/shopping",pf:1},
+                { name: "已屏蔽", img: `${this.$constant.hostUrl}/image/ghs/home/icon_ghs2.png`, url: "/pagesPurchase/pb",pf:1},
+                { name: "损耗", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/breakage/list",pf:1},
+                { name: "拆散", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/part/list",pf:1}
             ]
         },
         {
-          title: '生产',
-          list: [
-
-            { name: "列表", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/work/list",pf:1},
-            {name: "生产统计",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/kind",pf:1},
-            { name: "员工生产统计", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/stat/makeStat",pf:1},
-            { name: "设置", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/work/set",pf:1},
-          ]
-        },
-        {
-          title: '门店仓库',
+          title: '门店',
           list: [
-
             { name: "门店", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/shop/list",pf:1},
-            { name: "调拨出库", img: `${this.$constant.hostUrl}/image/ghs/home/dbck2.png`, url: "/pagesStorehouse/allot/allotEx",pf:0},
-            { name: "调拨入库", img: `${this.$constant.hostUrl}/image/ghs/home/dbrk2.png`, url: "/pagesStorehouse/allot/allotPut",pf:0},
-            { name: "库存预警", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/pagesStorehouse/stockWarn/manage",pf:1},
             { name: "员工", img: `${this.$constant.hostUrl}/image/ghs/home/yggl2.png`, url: "/admin/staff/list",pf:1},
             { name: "员工业绩", img: `${this.$constant.hostUrl}/image/ghs/home/icon_ygyj2.png`, url: "/admin/staff/achieve",pf:1},
-            { name: "供货商", img: `${this.$constant.hostUrl}/image/ghs/home/icon_ghs2.png`, url: "/pagesPurchase/order",pf:1},
-            { name: "已屏蔽", img: `${this.$constant.hostUrl}/image/ghs/home/icon_ghs2.png`, url: "/pagesPurchase/pb",pf:1},
-            { name: "采购单", img: `${this.$constant.hostUrl}/image/ghs/home/icon_caigou2.png`, url: "/pagesPurchase/shopping",pf:1},
-            { name: "损耗", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/breakage/list",pf:1},
-            { name: "拆散", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/part/list",pf:1},
-            { name: "商城", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/cg/mall",pf:1},
             { name: "开关商城", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/pagesPurchase/open",pf:1},
             { name: "失信人员", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/ll/list",pf:1},
             { name: "充值规则", img: `${this.$constant.hostUrl}/image/ghs/home/shop2.png`, url: "/admin/recharge/discount",pf:1},
@@ -93,16 +69,26 @@ export default {
         {
           title: '数据统计',
           list: [
-                  {name: "利润表",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/profit",pf:1},
+            {name: "利润表",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/profit",pf:1},
             {name: "收入统计",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/kdIncome",pf:1},
             {name: "花材销量",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/productSale",pf:1},
-            // {name: "客户下单榜",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/customSale",pf:1},
+            {name: "客户榜单",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/customSale",pf:1},
             {name: "采购统计",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/cgStat",pf:1},
             {name: "采购花材",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/cgItem",pf:1},
             {name: "绿植统计",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/kindLz",pf:1},
             {name: "损耗总览",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/waste"},
 			      {name: "赊账汇总",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/custom/showTotalBalance"},
           ]
+        },
+        {
+          title: '生产',
+          list: [
+
+            { name: "列表", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/work/list",pf:1},
+            {name: "花材统计",img: `${this.$constant.hostUrl}/image/ghs/home/jyzk2.png`,url: "/admin/stat/kind",pf:1},
+            { name: "员工统计", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/stat/makeStat",pf:1},
+            { name: "设置", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/work/set",pf:1},
+          ]
         }
       ]
     }

+ 4 - 4
hdApp/src/admin/home/workbench.vue

@@ -124,11 +124,11 @@
           </view>
         </view>
         
-        <!-- 盆栽花材 -->
+        <!-- 绿植花材 -->
         <view class="flower-section">
           <view class="section-header">
             <view class="header-line"></view>
-            <view class="header-title">盆栽花材</view>
+            <view class="header-title">绿植花材</view>
             <view class="header-line"></view>
           </view>
           <view class="icon-grid">
@@ -448,7 +448,7 @@ export default {
       tabsData: [
         { name: "商城", img: `ghs/home/shop2.png`, url: "/admin/cg/mall",pf:1},
         { name: "改价", img: `ghs/home/gj2.png`, url: "/admin/changePrice/list2",pf:1},
-        { name: "花材绿植", img: `ghs/home/hcgl2.png`, url: "/admin/item/list2",pf:1 },
+        { name: "绿植花材", img: `ghs/home/hcgl2.png`, url: "/admin/item/list2",pf:1 },
         { name: "接花束", img: `ghs/home/shop2.png`, url: "/admin/order/workOrder",pf:1 },
         { name: "拆散", img: `ghs/home/kcyjs2.png`, url: "/admin/part/list",pf:1},
         { name: "损耗", img: `ghs/home/kcyjs2.png`, url: "/admin/breakage/list",pf:1},
@@ -1153,7 +1153,7 @@ export default {
     }
   }
 }
-// 新的花束花礼和盆栽花材样式
+// 新的花束花礼和绿植花材样式
 .flower-module {
   padding: 0;
   

+ 2 - 2
hdApp/src/pages.json

@@ -84,8 +84,8 @@
 		{
 			"root": "admin/item",
 			"pages": [
-				{"path": "list","style": {"navigationBarTitleText": "花材绿植"}},
-				{"path": "list2","style": {"navigationBarTitleText": "花材绿植"}},
+				{"path": "list","style": {"navigationBarTitleText": "绿植花材"}},
+				{"path": "list2","style": {"navigationBarTitleText": "绿植花材"}},
 				{"path": "copy","style": {"navigationBarTitleText": "复制新建"}},
 				{"path": "detail","style": {"navigationBarTitleText": "花材详情"}},
 				{"path": "add","style": {"navigationBarTitleText": "添加花材"}}