采购

ghsApp/src/admin/home/apply.vue

@@ -149,7 +149,7 @@ export default {
                 }
             }
             .tabs-name {
-                color: $fontColor2;
+                color: #444444;
                 margin-top: 10upx;
             }
             &:nth-child(-n + 4) {

hdApp/src/admin/goods/cgNewPlant.vue

@@ -15,7 +15,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">销售单价</view>
-          <input v-model="form.salePrice" placeholder-class="phcolor" class="tui-input" name="salePrice" @focus="form.salePrice=''" placeholder="请填写销售单价" maxlength="50" type="digit" />
+          <input v-model="form.salePrice" placeholder-class="phcolor" class="tui-input" name="salePrice" @focus="form.salePrice=''" placeholder="需要看人报价请填0" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">

hdApp/src/admin/goods/list.vue

@@ -2,7 +2,7 @@
   <view class="app-content">
 		<view class="input-wrap" >
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="这里搜索" @input="searchFn" />
+				<app-search-module v-model="searchText" placeholder="这里搜索" @input="searchFn" />
 			</view>
 			<view style="padding-left:10upx;">
         <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="selectFlowerNumFn()">按支数查</button>
@@ -104,7 +104,7 @@ export default {
       autoLoad:false,
       flowerNum:0,
       flowerNumList:[{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99},{num:0,name:'取消'}],
-      py:''
+      searchText:''
     };
   },
   computed: {
@@ -182,6 +182,17 @@ export default {
         }
       });
     },
+    searchFn(){
+      if (this.$util.isEmpty(this.searchText)){
+        this.resetList()
+        this.getGoodsList()
+      }else{
+        this.resetList()
+        getCategoryToGoods({status:'',page:this.list.page,flower:1,searchText:this.searchText,flowerNum:this.flowerNum}).then(res => {
+          this.completes(res)
+        })
+      }
+    },
     getGoodsList() {
       return getCategoryToGoods({ status:'', page: this.list.page, catId:this.catId,flowerNum:this.flowerNum }).then(res => {
         this.completes(res)

hdApp/src/admin/goods/lz.vue

@@ -2,7 +2,7 @@
   <view class="app-content">
 		<view class="input-wrap" >
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="这里搜索" @input="searchFn" />
+				<app-search-module v-model="searchText" placeholder="这里搜索" @input="searchFn" />
 			</view>
 			<view style="padding-left:10upx;">
         <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="addGoods()">新增绿植</button>
@@ -103,7 +103,7 @@ export default {
       autoLoad:false,
       flowerNum:0,
       flowerNumList:[{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99},{num:0,name:'取消'}],
-      py:''
+      searchText:''
     };
   },
   computed: {
@@ -181,6 +181,17 @@ export default {
         }
       });
     },
+    searchFn(){
+      if (this.$util.isEmpty(this.searchText)){
+        this.resetList()
+        this.getGoodsList()
+      }else{
+        this.resetList()
+        getCategoryToGoods({status:'',page:this.list.page,flower:0,searchText:this.searchText,flowerNum:this.flowerNum}).then(res => {
+          this.completes(res)
+        })
+      }
+    },
     getGoodsList() {
       return getCategoryToGoods({ status:'', page: this.list.page, catId:this.catId,flowerNum:this.flowerNum }).then(res => {
         this.completes(res)

hdApp/src/admin/goods/pdGoods.vue

@@ -110,10 +110,12 @@ export default {
     },
     searchFn(){
       if (this.$util.isEmpty(this.searchText)){
-
+        this.resetList()
+        this.getPlantList()
       }else{
+        this.resetList()
         this.form.catId = 0
-        getCategoryToGoods({status:'',page:this.list.page,...this.form,flower:'',searchText:this.searchText}).then(res => {
+        getCategoryToGoods({status:'',page:this.list.page,...this.form,flower:0,searchText:this.searchText}).then(res => {
           this.completes(res)
         })
       }
@@ -134,7 +136,7 @@ export default {
       this.getPlantClass()
     },
     getPlantClass() {
-      categoryListInfo({flower:''}).then(res => {
+      categoryListInfo({flower:0}).then(res => {
         this.tabbar = res.data;
         if(this.tabbar && this.tabbar[0] && this.tabbar[0].id){
           this.form.catId = this.tabbar[0].id
@@ -143,7 +145,7 @@ export default {
       })
     },
     getPlantList() {
-      return getCategoryToGoods({status:'',page:this.list.page,...this.form,flower:'',searchText:this.searchText}).then(res => {
+      return getCategoryToGoods({status:'',page:this.list.page,...this.form,flower:0,searchText:this.searchText}).then(res => {
         this.completes(res)
       })
     },

hdApp/src/admin/goods/pdGoodsDetail.vue

@@ -101,6 +101,9 @@ onLoad() {
 	this.initData();
 },
 methods: {
+	init(){
+
+	},
 	goToStockDetail(item){
 		this.pageTo({url: "/admin/goods/stockChange?id="+item.goodsId+'&name='+item.name})
 	},

hdApp/src/admin/home/apply.vue

@@ -38,15 +38,20 @@ export default {
             ]
         },
         {
-            title:'商品',
+            title:'花束',
             list:[
                 { name: "花束", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1},
                 { name: "花束品种", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/kind",pf:1},
+                //{ name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/price-increase",pf:1},
+                { name: "商城分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/category",pf:1},
+            ]
+        },
+        {
+            title:'绿植',
+            list:[
                 { name: "绿植", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/lz",pf:1},
                 { name: "绿植品种", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/lzKind",pf:1},
-                { name: "商城分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/category",pf:1},
-                { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/price-increase",pf:1},
-                { name: "商品盘点", img: `${this.$constant.imgUrl}/ghs/home/pandian.png`, url: "/admin/goods/pdList",pf:1},
+                { name: "绿植盘点", img: `${this.$constant.imgUrl}/ghs/home/pandian.png`, url: "/admin/goods/pdList",pf:1}
             ]
         },
         {
@@ -150,7 +155,7 @@ export default {
         }
       }
       .tabs-name {
-        color: $fontColor2;
+        color:  #444444;
         margin-top: 10upx;
       }
       &:nth-child(-n + 4) {

hdApp/src/admin/home/workbench.vue

@@ -637,7 +637,7 @@ export default {
       }
     }
     .tabs-name {
-      color: $fontColor2;
+      color:  #444444;
       margin-top: 10upx;
     }
     &:nth-child(-n + 4) {

hdApp/src/pages.json

@@ -261,7 +261,7 @@
 				{ "path": "stockChange", "style": { "navigationBarTitleText": "库存变动记录" } },
 				{ "path": "plantCg", "style": { "navigationBarTitleText": "绿植采购记录" } },
 				{ "path": "plantCgDetail", "style": { "navigationBarTitleText": "明细" } },
-				{ "path": "pdList", "style": { "navigationBarTitleText": "商品盘点列表" } },
+				{ "path": "pdList", "style": { "navigationBarTitleText": "绿植盘点记录" } },
 				{ "path": "pdGoods", "style": { "navigationBarTitleText": "选择商品" } },
 				{ "path": "pdGoodsConfirm", "style": { "navigationBarTitleText": "确认盘点" } },
 				{ "path": "pdGoodsDetail", "style": { "navigationBarTitleText": "详情" } }
@@ -473,7 +473,7 @@
 		"backgroundColor": "#f9fbfc"
 	},
 	"tabBar": {
-		"color": "#C0C4CC",
+		"color": "#444444",
 		"selectedColor": "#3385FF",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",