更新js

hdApp/src/admin/billing/affirm.vue

@@ -261,7 +261,7 @@ export default {
 			let customId = this.option.customId ? this.option.customId:0
 			let customName = this.option.customName?this.option.customName:''
 			let orderId = this.option.orderId ? this.option.orderId : 0
-			this.$util.pageTo({url: '/admin/billing/index?customId='+customId+'&customName='+customName+'&orderId='+orderId,type:2})
+			this.$util.pageTo({url: '/admin/billing/index2?customId='+customId+'&customName='+customName+'&orderId='+orderId,type:2})
 		}
 	}
 };

hdApp/src/admin/custom/selectCustom.vue

@@ -36,8 +36,7 @@
                   <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1年未下单</text>
   
                 </div>
-  <image :src="`${constant.imgUrl}/icon/scan/scan.png`" mode="widthFix" @click.stop="selectCurrent(item,1)" v-if="getMyShopInfo && getMyShopInfo.scan == 1"
-  style="position:absolute;right:0upx;top:20upx;width:60upx;"></image>
+  
               </div>
             </div>
             <div class="tui-msg-right">

hdApp/src/admin/home/workbench.vue

@@ -349,7 +349,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({ loginInfo: "getLoginInfo",dictInfo:"getDictionariesInfo" })
+    ...mapGetters({ loginInfo: "getLoginInfo",dictInfo:"getDictionariesInfo",myShopInfo:"getMyShopInfo" })
   },
 	watch: {
 		//只需要采购花材的花店不显示底部菜单
@@ -611,7 +611,11 @@ export default {
       this.$util.pageTo({url:'/admin/order/workOrder'})
     },
     goKjKd(){
-      this.$util.pageTo({url:'/admin/billing/index?customId=0'})
+      if(this.myShopInfo && Number(this.myShopInfo.defaultCustomId)>0){
+        this.$util.pageTo({url:'/admin/billing/index2?customId='+this.myShopInfo.defaultCustomId})
+      }else{
+        this.$msg('请设置快捷开单的对应客户')
+      }
     },
     goShKd(){
       this.$util.pageTo({url:'/admin/custom/selectCustom'})

hdApp/src/api/item-class/index.js

@@ -15,3 +15,7 @@ export const updateClass = data => {
 export const getAllItemClass = data => {
 	return https.get('/item-class/all', data)
 }
+
+export const getMenu = data => {
+	return https.get('/item-class/get-menu', data)
+}

hdApp/src/api/item/index.js

@@ -6,4 +6,8 @@ export const getPriceChangeList = data => {
 
 export const changeHalf = data => {
 	return https.post('/item/change-half', data)
-}
+}
+
+export const getItemList = data => {
+	return https.get('/item/get-item-list', data)
+}

hdApp/src/pages.json

@@ -342,6 +342,7 @@
 			"root": "admin/billing",
 			"pages": [
 				{ "path": "index", "style": { "navigationBarTitleText": "开单" } },
+				{ "path": "index2", "style": { "navigationBarTitleText": "开单" } },
 				{ "path": "customerPlace", "style": { "navigationBarTitleText": "开单" } },
 				{ "path": "priceChange", "style": { "navigationBarTitleText": "改价", "enablePullDownRefresh": true } },
 				{ "path": "result", "style": { "navigationBarTitleText": "开单状态" } },