发货单二次修改

src/views/Dispatching/Dispatching.vue

@@ -265,6 +265,7 @@ export default {
       dispatchInfo: {},
       subArr: [],
       subUrl: "",
+      show_type:true
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -511,11 +512,22 @@ export default {
 
   handleDispatchConfirm() {
     if (this.wood_select.length!=0||this.paint_select.length!=0||this.packing_select.length!=0||this.transit_select.length!=0||this.install_select.length!=0) {
-        this.showModal = true;
-        this.subArr =[...this.wood_select,...this.paint_select,...this.packing_select,...this.transit_select,...this.install_select]
+      this.show_type = true;
+        this.subArr =[...this.wood_select,...this.paint_select,...this.packing_select,...this.transit_select,...this.install_select];
+        console.log(this.subArr);
         this.subUrl = "/api/order_produce_pull_all";
+       try{this.subArr.forEach(v=>{
+          if(!v.employee_id){
+            this.show_type = false;
+            throw new Error();
+          }
+        })} catch(e){
+          
+          this.$Message.warning('请设置班组');
+        };
+        this.showModal = this.show_type;
       } else {
-        this.$Message.warning("请选择班组");
+        this.$Message.warning("请选择工序");
       }
     },
     handleDispatch(target, url) {

src/views/ProductionOrderList/Deliverylist/DeliveryDetail.vue

@@ -206,8 +206,8 @@ export default {
             serverName: "in_out_value",
             value: "",
             option: [
-              { label: "已确认", value: 1 },
-              { label: "未确认", value: 0 },
+              { label: "已发货", value: 1 },
+              { label: "未发货", value: 0 },
             ],
           },
            {
@@ -275,8 +275,8 @@ export default {
             h(
               "span",
               {},
-              params.row.transport_no == 0
-                ? "未收获"
+              params.row.transportation_value == 0
+                ? "未收货"
                 : '已收货'
             ),
         },
@@ -423,9 +423,11 @@ export default {
       if (!this.selectedReturnArr || this.selectedReturnArr.length < 1) {
         return this.$Message.error("请至少选择一项");
       }
-      params = this.selectedReturnArr.map((v) => {
-        return v.chip;
-      });
+      // params = this.selectedReturnArr.map((v) => {
+      //   return v.chip;
+      // });
+      // console.log(this.selectedReturnArr)
+      // console.log(row)
       this.$Modal.confirm({
         title: "确认退回？",
         content: "此操作无法恢复，请确认！",
@@ -434,7 +436,7 @@ export default {
             method: "post",
             url: "/api/transport_callback",
             data: {
-              tag: params,
+              tag: row,//params
             },
           }).then((res) => {
             if (res.code == 200) {

src/views/ProductionOrderList/Dispatchlist/details.vue

@@ -161,6 +161,25 @@
             </FormItem> -->
         </Form>
       </Modal>
+      <Modal
+       title="返工"
+        v-model="finish_modal"
+        width="400"
+      
+        @on-ok="finish_Ok">
+        <Form>
+          <FormItem label="返工班组:">
+              <Select v-model="finish_nickname" style="width:180px">
+                <Option
+                  :value="item.id"
+                  v-for="(item, index) in username_list"
+                  :key="index"
+                  >{{ item.nickname }}</Option
+                >
+              </Select>
+            </FormItem>
+        </Form>
+      </Modal>
     </div>
   </div>
 </template>
@@ -169,6 +188,8 @@
 export default {
   data() {
     return {
+      finish_modal:false,
+      finish_nickname:'',
       formData:{
            house:'',
            unit:'',
@@ -242,7 +263,8 @@ export default {
           minWidth: 150,
           key: "procedure_title",
         },
-        { title: "班组", align: "center", minWidth: 150, key: "nickname" },
+        { title: "派工班组", align: "center", minWidth: 150, key: "nickname" },
+        { title: "完工班组", align: "center", minWidth: 150, key: "finish_nickname" },
         { title: "测量尺寸", align: "center", minWidth: 150, key: "measure" },
         { title: "单位", align: "center", minWidth: 100, key: "company" },
         { title: "芯片编号", align: "center", minWidth: 150, key: "chip" },
@@ -459,6 +481,9 @@ export default {
     });
   },
   methods: {
+    finish_Ok(){
+           
+    },
     download(){
       this.axios.get('/api/nc_export').then(res=>{
            if (res.code == 200) {
@@ -649,15 +674,7 @@ export default {
         return this.$Message.warning("请至少选择一项");
       }
       let str = Array.isArray(row) ? row.join(",") : row.id;
-      this.confirmDelete({
-        content: type == 1 ? "是否手动操作此订单生产完成" : "确认驳回？",
-        title: type == 1 ? "生产完成" : "驳回",
-        type: type == 1 ? "primary" : "error",
-        then: () => {
-          this.postData({ id: str }, type);
-        },
-        cancel: () => {},
-      });
+     this.finish_modal = true;
     },
     selectTable(e) {
       let result = [];