更多

ghsApp/src/admin/home/components/OrderItem.vue

@@ -116,14 +116,14 @@
           <!-- #endif -->
           <block v-if="currentStatus == 2">
             <block v-if="item.book == 0">
-              <view><button @click.stop="directFh(item)" class="admin-button-com bule">自配送</button> </view>
+              <view><button @click.stop="directFh(item)" class="admin-button-com bule">发货</button> </view>
             </block>
             <block v-else>
               <view><button @click.stop="confirmFh(item)" class="admin-button-com bule">发货</button> </view>
             </block>
           </block>
           <block v-else>
-            <view><button disabled="true" class="admin-button-com bule active">自配送</button> </view>
+            <view><button disabled="true" class="admin-button-com bule active">发货</button> </view>
           </block>
           <view v-if="currentStatus == 1">
             <button disabled="true" class="admin-button-com bule active">打印(${item.printNum})</button>
@@ -134,7 +134,12 @@
             </button>
           </view>
           <view>
-            <button @click.stop="openMore(item)" class="admin-button-com bule">更多</button>
+            <button @click.stop="printWlFlag(item)" class="admin-button-com bule">
+              打物流<text>({{ item.printWlNum || 0 }})</text>
+            </button>
+          </view>
+          <view class="more-icon-btn" @click.stop="openMore(item)">
+            <image class="more-icon-btn__icon" :src="iconSrc('more_button')" mode="aspectFit" />
           </view>
         </view>
       </view>
@@ -260,6 +265,8 @@ import { getUserDet } from '@/api/member';
 import { createExpressOrder, cancelExpressOrder as cancelSFExpressOrder } from '@/api/express';
 import { cancelDeliveryOrder } from '@/api/express/delivery';
 import { createCallExpressOrder, cancelCallExpressOrder,getOrderFee } from '@/api/shop/shop-express';
+import { printWlLabel } from '@/api/order';
+import { iconSrc } from '@/utils/iconSrc';
 export default {
   name: 'OrderItem',
   options: {
@@ -302,6 +309,7 @@ export default {
     }
   },
   methods: {
+    iconSrc,
     modifyAddress(item) {
       this.closeExpressPop()
       this.$util.pageTo({url: '/pagesClient/member/modify?id=' + item.customId + '&name=' + item.customName,type:2})
@@ -332,6 +340,22 @@ export default {
         that.$emit('printOrder', item);
       }
     },
+    printWlFlag(item) {
+      const that = this
+      const doPrint = () => {
+        printWlLabel({ id: item.id }).then(res => {
+          if (res.code == 1) {
+            that.$msg(res.msg)
+            that.$set(item, 'printWlNum', (Number(item.printWlNum) || 0) + 1)
+          }
+        })
+      }
+      if (item.printWlNum && Number(item.printWlNum) > 0) {
+        this.$util.confirmModal({ content: '确认补打物流标？' }, doPrint)
+      } else {
+        doPrint()
+      }
+    },
     openMore(item) {
       this.$refs.morePopup.open('center');
     },
@@ -498,6 +522,19 @@ export default {
       flex: none;
       box-sizing: border-box;
     }
+    .more-icon-btn {
+      margin: 0 6upx 12upx 6upx;
+      width: 65upx;
+      height: 65upx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex: none;
+    }
+    .more-icon-btn__icon {
+      width: 63upx;
+      height: 63upx;
+    }
   }
 }
 .order-top_box {

ghsApp/src/pagesOrder/detail.vue

@@ -186,11 +186,11 @@
 
 					<view class="price" style="font-weight:normal;">
 						<block v-if="detailInfo.status == 2 && detailInfo.book == 0">
-							<button class="admin-button-com bule" @click.stop="directFh(detailInfo)">自配送</button>
+							<button class="admin-button-com bule" @click.stop="directFh(detailInfo)">发货</button>
 							<button class="admin-button-com bule" style="margin-left:30upx;" @click.stop="fillNoFh(detailInfo)">物流单发货</button>
 						</block>
 						<block v-else>
-							<button disabled="true" class="admin-button-com bule active" style="border:1rpx solid #ccc;">自配送</button>
+							<button disabled="true" class="admin-button-com bule active" style="border:1rpx solid #ccc;">发货</button>
 							<button disabled="true" class="admin-button-com bule active" style="margin-left:30upx;border:1rpx solid #ccc;">物流单发货</button>
 						</block>
 					</view>
@@ -1364,11 +1364,20 @@ export default {
 			this.$util.pageTo({url:'/pagesOrder/refund?id='+this.option.id})
 		},
 		printWlFlag(){
-			printWlLabel({id:this.option.id}).then(res=>{
-				if(res.code == 1){
-					this.$msg(res.msg)
-				}
-			})
+			const that = this
+			const doPrint = () => {
+				printWlLabel({ id: this.option.id }).then(res => {
+					if (res.code == 1) {
+						that.$msg(res.msg)
+						that.detailInfo.printWlNum = (Number(that.detailInfo.printWlNum) || 0) + 1
+					}
+				})
+			}
+			if (this.detailInfo.printWlNum && Number(this.detailInfo.printWlNum) > 0) {
+				this.$util.confirmModal({ content: '确认补打物流标？' }, doPrint)
+			} else {
+				doPrint()
+			}
 		},
 		allotFn(){
 			this.$util.pageTo({url:'/pagesOrder/allot?id='+this.option.id})

hdApp/src/static/icons/more_button.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1780155316023" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2140" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M258.5 261.9h731.6c18.7 0 33.8-15.1 33.8-33.8s-15.1-33.8-33.8-33.8H258.5c-18.7 0-33.8 15.1-33.8 33.8s15.1 33.8 33.8 33.8zM60.7 167.3C27.2 167.3 0 194.5 0 228s27.2 60.7 60.7 60.7 60.7-27.2 60.7-60.7c0.1-33.5-27.1-60.7-60.7-60.7zM990.1 503.7H258.5c-18.7 0-33.8 15.1-33.8 33.8 0 18.7 15.1 33.8 33.8 33.8h731.6c18.7 0 33.8-15.1 33.8-33.8 0-18.7-15.1-33.8-33.8-33.8zM60.7 476.7C27.2 476.7 0 503.9 0 537.5c0 33.5 27.2 60.7 60.7 60.7s60.7-27.2 60.7-60.7c0.1-33.6-27.1-60.8-60.7-60.8zM990.1 813.1H258.5c-18.7 0-33.8 15.1-33.8 33.8s15.1 33.8 33.8 33.8h731.6c18.7 0 33.8-15.1 33.8-33.8s-15.1-33.8-33.8-33.8zM60.7 786.2C27.2 786.2 0 813.4 0 847c0 33.5 27.2 60.7 60.7 60.7s60.7-27.2 60.7-60.7c0.1-33.6-27.1-60.8-60.7-60.8z" fill="#09c567" p-id="2141"></path></svg>