39

src/views/ProductionOrderList/Deliverylist/DeliveryDetail.vue

@@ -79,11 +79,13 @@
         <a
           class="map-margin"
           @click="outShip([row.orders_procedure_id], 1)"
-          >{{ row.in_out_value != 1 ? "发货完成" : "" }}</a
+          v-show="row.in_out_value==0"
+          > 发货完成 </a
         ><a
           class="map-margin"
+          v-show='row.transportation_value==0&&row.in_out_value==1'
           @click="row.in_out_value == 1?outShip([row.orders_procedure_id], 2):$Message.warning('请先确认发货')"
-          >{{ row.transportation_value != 1 ? "收货完成" : "" }}</a
+          >收货完成</a
         >
       </template>
       <Modal

src/views/ProductionOrderList/Deliverylist/Deliverylist.vue

@@ -41,14 +41,14 @@
           @click="confirmOutStock(row, 1)"
           v-if="row.state == 0"
           class="map-margin"
-          >发货</a
+          >发货完成</a
         >
         <!-- &&(persimissionData['确认出库'] || persimissionData.all) -->
         <a
           @click="confirmOutStock(row, 2)"
           v-if="row.state == 1"
           class="map-margin"
-          >确认运输</a
+          >收货完成</a
         >
         <!-- &&(persimissionData['确认运输'] || persimissionData.all) -->
         <a
@@ -393,14 +393,14 @@ export default {
       this.getData(this.proxyObj);
     },
     confirmOutStock(row, type) {
-      //type 1出库  2运输
+      //type 1发货完成  2收货完成
       let params = {};
       let post_url =
         type == 1 ? "/api/orders_transport" : "/api/orders_transport_confirm";
       params.transport_no = row.transport_no || row.order_no;
       this.confirmDelete({
-        title: type == 1 ? "确认出库" : "确认运输",
-        content: type == 1 ? "确认出库么？" : "确认运输么？",
+        title: type == 1 ? "确认发货" : "确认收货",
+        content: type == 1 ? "确认发货么？" : "确认收货么？",
         type: "primary",
         then: (e) => {
           this.axios.post(post_url, params).then((res) => {

src/views/ProductionOrderList/InboundForm/details.vue

@@ -95,14 +95,15 @@
         > -->
         <a
           class="map-margin"
-          v-if="row.in_out_value !== 1"
+          v-show="!row.order_in_no"
           @click="outShip(row, 3)"
-          >{{row.order_in_no?'':'包装完成'}}</a
+          >包装完成</a
         >
         <a
           class="map-margin"
-          @click="row.order_in_no ? outDelivery(row) : $Message.warning('请先确认包装')"
-          >{{ row.in_out_value == 0? "发货指令" : "" }}</a
+          v-show="row.in_out_value == 0 && row.order_in_no"
+          @click="row.order_in_no ? outDelivery(row) : $Message.warning('请先确认包装')">
+          发货指令</a
         >
       </template>
       <Modal