Răsfoiți Sursa

供货商打印数量加1

jf 5 ani în urmă
părinte
comite
40cfceba45

+ 9 - 30
ghsApp/src/admin/home/order.vue

@@ -29,19 +29,7 @@
     </view>
     </view>
     <div class="list-wrap">
     <div class="list-wrap">
       <block v-if="!$util.isEmpty(list.data)">
       <block v-if="!$util.isEmpty(list.data)">
-        <div
-          class="list"
-          v-for="(item, index) in list.data"
-          :key="index"
-          @click="
-            pageTo({
-              url: '/pagesOrder/detail',
-              query: {
-                id: item.id,
-              },
-            })
-          "
-        >
+        <div class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({url: '/pagesOrder/detail',query: {id: item.id,},})">
           <view class="order-top_box">
           <view class="order-top_box">
             <app-avatar-module :src="item.customAvatarUrl" :width="38" />
             <app-avatar-module :src="item.customAvatarUrl" :width="38" />
             <view class="tit">
             <view class="tit">
@@ -89,23 +77,12 @@
           <div class="list-bottom">
           <div class="list-bottom">
             <div class="list-button">
             <div class="list-button">
               <view v-for="s in item.buttonList" :key="s.type">
               <view v-for="s in item.buttonList" :key="s.type">
-                <button
-                  @click.stop="openBt(s, item)"
-                  v-if="s.show == 1"
-                  :disabled="s.disable === 1"
-                  class="admin-button-com bule"
-                  :class="s.disable === 1 ? 'active' : ''"
-                >
-                  <!--{{-->
-                    <!--s.type === "item"-->
-                      <!--? "改花材"-->
-                      <!--: s.type === "selfGet"-->
-                      <!--? "自取"-->
-                      <!--: "发货"-->
-                  <!--}}-->
+                <button @click.stop="openBt(s, item)" v-if="s.show == 1&&s.type!='print'" :disabled="s.disable === 1" class="admin-button-com bule" :class="s.disable === 1 ? 'active' : ''">
 																	{{ s.type === "item" ? "改花材" : s.type === "selfGet" ? "自取" :s.type === "print" ? "打印" :s.type === "debtPay" ? "延期收款" :s.type === "hasPay" ? "已收款" : "发货" }}
 																	{{ s.type === "item" ? "改花材" : s.type === "selfGet" ? "自取" :s.type === "print" ? "打印" :s.type === "debtPay" ? "延期收款" :s.type === "hasPay" ? "已收款" : "发货" }}
-
 																</button>
 																</button>
+															<button @click.stop="openBt(s, item)" v-if="s.show == 1&&s.type=='print'" :disabled="s.disable === 1" class="admin-button-com bule" :class="s.disable === 1 ? 'active' : ''">
+																打印{{item.printNum>0?`(${item.printNum})`:''}}
+															</button>
               </view>
               </view>
             </div>
             </div>
           </div>
           </div>
@@ -168,6 +145,7 @@ export default {
   computed: { ...mapGetters(["getLoginInfo", "getDictionariesInfo"]) },
   computed: { ...mapGetters(["getLoginInfo", "getDictionariesInfo"]) },
   data() {
   data() {
     return {
     return {
+    	orderId:'',
       seekVal: "",
       seekVal: "",
       isShow: false, //是否显选择时间段
       isShow: false, //是否显选择时间段
       customizationTime: [], //时间段
       customizationTime: [], //时间段
@@ -299,7 +277,8 @@ export default {
       }
       }
     }, // 操作按钮
     }, // 操作按钮
   openBt(s, item) {
   openBt(s, item) {
-      console.log(123);
+      console.log(item);
+						this.orderId=item.id;
       // 花材
       // 花材
       if (s.type === "item") {
       if (s.type === "item") {
         uni.navigateTo({ url: `/pagesOrder/select?id=${item.id}` });
         uni.navigateTo({ url: `/pagesOrder/select?id=${item.id}` });
@@ -325,7 +304,7 @@ export default {
             id: item.id,
             id: item.id,
           },
           },
         });
         });
-      }else if (s.type === "print") {
+      }else if (s.type === "print") {//打印
       	let BleVal = JSON.parse(item.printData);
       	let BleVal = JSON.parse(item.printData);
         switch(uni.getSystemInfoSync().platform){
         switch(uni.getSystemInfoSync().platform){
           case 'android':
           case 'android':

+ 2 - 0
ghsApp/src/api/order/index.js

@@ -167,3 +167,5 @@ export const thirdSend = data => https.get("/order/third-send", data);
 export const selfSend = data => https.get("/order/self-send", data);
 export const selfSend = data => https.get("/order/self-send", data);
 
 
 export const reachOrder = data => https.get("/order/reach", data);
 export const reachOrder = data => https.get("/order/reach", data);
+//打印次数+1
+export const addPrintNum = data => https.get("/order/add-print-num", data);

+ 14 - 0
ghsApp/src/mixins/BLE.js

@@ -1,4 +1,5 @@
 /** -姜枫 2021.06.13- **/
 /** -姜枫 2021.06.13- **/
+import { addPrintNum } from "@/api/order";
 var util = require("@/pagesOrder/js/util.js");
 var util = require("@/pagesOrder/js/util.js");
 export default {
 export default {
 	data() {
 	data() {
@@ -251,6 +252,7 @@ export default {
 		},
 		},
 		senBleLabel() {
 		senBleLabel() {
 			let BleVal = this.BleVal;
 			let BleVal = this.BleVal;
+			let self = this;
 			console.log(BleVal,'BleValBleVal')
 			console.log(BleVal,'BleValBleVal')
 			let currDev = uni.getStorageSync('BLE');
 			let currDev = uni.getStorageSync('BLE');
 			//标签模式
 			//标签模式
@@ -286,7 +288,19 @@ export default {
 			arrPrint.push(util.sendDirective([0x1B, 0x61, 0x00]));
 			arrPrint.push(util.sendDirective([0x1B, 0x61, 0x00]));
 			arrPrint.push(util.hexStringToBuff("门店地址:"+BleVal.address+"\n"));
 			arrPrint.push(util.hexStringToBuff("门店地址:"+BleVal.address+"\n"));
 			arrPrint.push(util.hexStringToBuff("\n\n\n"));
 			arrPrint.push(util.hexStringToBuff("\n\n\n"));
+			addPrintNum({id:self.orderId}).then(res=>{
+				if(!self.$util.isEmpty(self.detailInfo)){
+					self.detailInfo.printNum++;
+				}
+				if(!self.$util.isEmpty(self.list.data)){
+					self.list.data.forEach(ele=>{
+						if (ele.id==self.orderId) {
+							ele.printNum++;
+						}
+					})
+				}
 
 
+			})
 			this.printInfo({deviceId:deviceId, serviceId:serviceId, characteristicId:characteristicId}, arrPrint);
 			this.printInfo({deviceId:deviceId, serviceId:serviceId, characteristicId:characteristicId}, arrPrint);
 
 
 		},
 		},

+ 6 - 7
ghsApp/src/pagesOrder/detail.vue

@@ -146,14 +146,12 @@
 		</view>
 		</view>
 		<div class="app-footer">
 		<div class="app-footer">
 			<template v-for="s in detailInfo.buttonList">
 			<template v-for="s in detailInfo.buttonList">
-				<button
-					:key="s.type"
-					@click="openBt(s, detailInfo)"
-					v-if="s.show == 1"
-					:disabled="s.disable === 1"
-					class="admin-button-com default" :class="s.disable === 1?'active':''">
+				<button :key="s.type" @click="openBt(s, detailInfo)" v-if="s.show == 1&&s.type != 'print'" :disabled="s.disable === 1" class="admin-button-com default" :class="s.disable === 1?'active':''">
 					{{ s.type === "item" ? "改花材" : s.type === "selfGet" ? "自取" :s.type === "print" ? "打印" :s.type === "debtPay" ? "延期收款" :s.type === "hasPay" ? "已收款" : "发货" }}
 					{{ s.type === "item" ? "改花材" : s.type === "selfGet" ? "自取" :s.type === "print" ? "打印" :s.type === "debtPay" ? "延期收款" :s.type === "hasPay" ? "已收款" : "发货" }}
 				</button>
 				</button>
+				<button :key="s.type" @click="openBt(s, detailInfo)" v-if="s.show == 1&&s.type == 'print'" :disabled="s.disable === 1" class="admin-button-com default" :class="s.disable === 1?'active':''">
+					打印{{detailInfo.printNum>0?`(${detailInfo.printNum})`:''}}
+				</button>
 			</template>
 			</template>
 <!--			<button-->
 <!--			<button-->
 <!--				@click="pageTo({-->
 <!--				@click="pageTo({-->
@@ -193,6 +191,7 @@ export default {
 	data() {
 	data() {
 		return {
 		return {
 			ORDER_STATUS,
 			ORDER_STATUS,
+			orderId:'',
 			pageType: "order_change",
 			pageType: "order_change",
 			autoLoad: false,
 			autoLoad: false,
 			stepActive: 0,
 			stepActive: 0,
@@ -229,7 +228,7 @@ export default {
 			this.freeShipModal = false;
 			this.freeShipModal = false;
 		},
 		},
 		openBt(s, item) {
 		openBt(s, item) {
-			
+			this.orderId = item.id;
 			if (s.type === "item") {
 			if (s.type === "item") {
 				// 花材
 				// 花材
 				this.gotoSelect();
 				this.gotoSelect();