35

src/views/ProductionOrderList/Deliverylist/DeliveryDetail.vue

@@ -79,11 +79,11 @@
         <a
           class="map-margin"
           @click="outShip([row.orders_procedure_id], 1)"
-          >{{ row.transport_no != 1 ? "发货完成" : "" }}</a
+          >{{ row.in_out_value != 1 ? "发货完成" : "" }}</a
         ><a
           class="map-margin"
-          @click="outShip([row.orders_procedure_id], 2)"
-          >{{ row.transport_no != 1 ? "收货完成" : "" }}</a
+          @click="row.in_out_value == 1?outShip([row.orders_procedure_id], 2):$Message.warning('请先确认发货')"
+          >{{ row.transportation_value != 1 ? "收货完成" : "" }}</a
         >
       </template>
       <Modal
@@ -203,7 +203,7 @@ export default {
          {
             title: "发货状态",
             name: "Select",
-            serverName: "transportation_value",
+            serverName: "in_out_value",
             value: "",
             option: [
               { label: "已确认", value: 1 },
@@ -261,7 +261,7 @@ export default {
             h(
               "span",
               {},
-              params.row.sub_state == 0
+              params.row.in_out_value == 0
                 ? "未确认"
                 : '已确认'
             ),
@@ -275,7 +275,7 @@ export default {
             h(
               "span",
               {},
-              params.row.sub_state == 0
+              params.row.transport_no == 0
                 ? "未收获"
                 : '已收货'
             ),

src/views/ProductionOrderList/InboundForm/details.vue

@@ -101,7 +101,7 @@
         >
         <a
           class="map-margin"
-          @click="row.order_in_no ? outDelivery(row) : ''"
+          @click="row.order_in_no ? outDelivery(row) : $Message.warning('请先确认包装')"
           >{{ row.in_out_value != 1 ? "发货指令" : "" }}</a
         >
       </template>