Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-supplychain

canteen/pages/delivery/detail.vue

@@ -18,10 +18,6 @@
 				<view>采购单</view>
 				<view class="lf-font-bold">{{order.sheet[0].purchase.p_sn}}</view>
 			</view>
-			<view class="lf-row-between list">
-				<view>批次号</view>
-				<view class="lf-font-bold">{{order.batch_sn}}</view>
-			</view>
 			<view class="lf-row-between list" @click="call(order.sheet[0].purchase.contact_phone)">
 				<view>联系电话</view>
 				<view class="lf-font-bold" style="color: rgb(17, 209, 137);">{{order.sheet[0].purchase.contact_phone}}</view>
@@ -144,7 +140,7 @@
 							quality_level: item.material.quality_level,
 							m_sn: item.material.m_sn,
 							supplier_name: item.purchase.supplier.supplier_name,
-							purchase_id: item.purchase_id,
+							purchase_id: item.purchase.batch_sn,
 							delivery_number: item.out_number,
 							unit: item?.material?.unit?.unit_name || '',
 							category: item?.material?.category?.m_cate_name || ''

canteen/pages/purchase/detail.vue

@@ -76,7 +76,7 @@
 				</view>
 				<view v-else-if="type == '已收货' || type == '已入库'" class="lf-row-between">
 					<button class="btn btn1" @click="$url('/pages/purchase/launch?p_sn='+ order.p_sn+'&enter_type=2')">复用采购单</button>
-					<view class="lf-font-32" style="color: #11D189;">已完成</view>
+					<view class="lf-font-32" style="color: #11D189;">{{order.state}}</view>
 				</view>
 				<view v-else-if="type == '已撤销'" class="lf-row-between">
 					<button class="btn btn1" @click="$url('/pages/purchase/launch?p_sn='+ order.p_sn+'&enter_type=2')">复用采购单</button>

supplier/pages/gonghuo/detail.vue

@@ -357,7 +357,7 @@
 					deliver_man: driver_name,
 					car_license: l_p_num
 				}).then(res => {
-					this.$msg('确认收货成功');
+					this.$msg('确认发货成功');
 					this.getData();
 				});
 			}