shish 3 lat temu
rodzic
commit
82c2748081

+ 2 - 2
ghsApp/src/admin/home/components/OrderItem.vue

@@ -50,11 +50,11 @@
             <div class="list-button">
             <div class="list-button">
 
 
 <block v-if="item.status != 1 && item.status != 5 &&item.fhStatus == 0">
 <block v-if="item.status != 1 && item.status != 5 &&item.fhStatus == 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>
 <view><button @click.stop="fillNoFh(item)" class="admin-button-com bule">填单发货</button> </view>
 <view><button @click.stop="fillNoFh(item)" class="admin-button-com bule">填单发货</button> </view>
 </block>
 </block>
 <block v-else>
 <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>
 <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>
 </block>
                 <view v-if="item.status == 1 || item.status == 5"><button disabled="true" class="admin-button-com bule active">打印(${item.printNum})</button> </view>
                 <view v-if="item.status == 1 || item.status == 5"><button disabled="true" class="admin-button-com bule active">打印(${item.printNum})</button> </view>

+ 1 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -23,7 +23,7 @@
 			<view class="bills-info_box content-box" v-if="detailInfo.fhStatus == 1">
 			<view class="bills-info_box content-box" v-if="detailInfo.fhStatus == 1">
 				<view class="order-info_box">
 				<view class="order-info_box">
 					<view>发货状态:</view>
 					<view>发货状态:</view>
-					<view style="color:green;font-weight:bold;font-size:30upx;">已发货</view>
+					<view style="color:green;font-weight:bold;font-size:30upx;">本单已发货</view>
 				</view>
 				</view>
 				<view class="order-info_box" v-if="detailInfo.fhType == 1">
 				<view class="order-info_box" v-if="detailInfo.fhType == 1">
 					<view>物流单号:</view>
 					<view>物流单号:</view>

+ 23 - 0
hdApp/src/pagesPurchase/purDetails.vue

@@ -16,6 +16,20 @@
         </view>
         </view>
       </view>
       </view>
 
 
+      <view class="bills-info_box content-box" v-if="detailInfo.fhStatus == 1">
+        <view class="order-info_box">
+          <view>发货状态:</view>
+          <view style="color:green;font-weight:bold;font-size:30upx;">商家已发货</view>
+        </view>
+        <view class="order-info_box">
+          <view>物流单号:</view>
+					<view>{{ detailInfo.fhWl }} {{detailInfo.fhWlNo}}</view>
+					<view class="price">
+						<button @click="copyWl(detailInfo.fhWlNo)" class="admin-button-com default">复制单号</button>
+					</view>
+        </view>
+      </view>
+
       <view class="bills-info_box content-box">
       <view class="bills-info_box content-box">
         <view class="order-info_box">
         <view class="order-info_box">
           <view>采购门店:</view>
           <view>采购门店:</view>
@@ -285,6 +299,15 @@ export default {
 			})
 			})
 	},
 	},
   methods: {
   methods: {
+		copyWl(val){
+			const self = this;
+			uni.setClipboardData({
+				data: val,
+				success: function() {
+					self.$msg("复制成功");
+				}
+			});
+		},
     clearOrder(){
     clearOrder(){
       let arr = []
       let arr = []
       arr.push(this.detailInfo.id)
       arr.push(this.detailInfo.id)