Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/views/ProductionOrderList/Dispatchlist/details.vue

@@ -572,7 +572,9 @@ export default {
       this.axios.post(url, data).then((res) => {
         if (res.code == 200) {
           this.$Message.success(res.msg);
-          this.getData(this.$route.query);
+           let data = {};
+      data = {...this.formData,...this.$route.query};
+          this.getData(data);
         }
       });
     },

src/views/ProductionOrderList/InboundForm/details.vue

@@ -443,42 +443,42 @@ export default {
       this.getData(row);
     },
     getOptions() {
-      this.axios("/api/orders_list_detail", {
-        params: { order_no: this.$route.query.order_no ,type:this.$route.query.type},
-      }).then((res) => {
-        res.data.house.map((v) => {
-          v.value = v.house;
-          v.label = v.house;
-        });
-        res.data.unit.map((v) => {
-          v.value = v.unit;
-          v.label = v.unit;
-        });
-        res.data.layer.map((v) => {
-          v.value = v.layer;
-          v.label = v.layer;
-        });
-        res.data.number_detail.map((v) => {
-          v.value = v.number;
-          v.label = v.number;
-        });
-        res.data.product_title.map((v) => {
-          (v.value = v.title), (v.label = v.title);
-        });
-        res.data.part_title.map((v) => {
-          (v.value = v.title), (v.label = v.title);
-        });
-        res.data.url_number.map(v=>{
-          (v.value=v.url_number),(v.label = v.url_number);
-        })
-        this.list[0].option = res.data.house;
-        this.list[1].option = res.data.unit;
-        this.list[2].option = res.data.layer;
-        this.list[3].option = res.data.number_detail;
-        this.list[4].option = res.data.product_title;
-        this.list[5].option = res.data.url_number;
-        this.list[6].option = res.data.part_title;
-      });
+      // this.axios("/api/orders_list_detail", {
+      //   params: { order_no: this.$route.query.order_no ,type:this.$route.query.type},
+      // }).then((res) => {
+      //   res.data.house.map((v) => {
+      //     v.value = v.house;
+      //     v.label = v.house;
+      //   });
+      //   res.data.unit.map((v) => {
+      //     v.value = v.unit;
+      //     v.label = v.unit;
+      //   });
+      //   res.data.layer.map((v) => {
+      //     v.value = v.layer;
+      //     v.label = v.layer;
+      //   });
+      //   res.data.number_detail.map((v) => {
+      //     v.value = v.number;
+      //     v.label = v.number;
+      //   });
+      //   res.data.product_title.map((v) => {
+      //     (v.value = v.title), (v.label = v.title);
+      //   });
+      //   res.data.part_title.map((v) => {
+      //     (v.value = v.title), (v.label = v.title);
+      //   });
+      //   res.data.url_number.map(v=>{
+      //     (v.value=v.url_number),(v.label = v.url_number);
+      //   })
+      //   this.list[0].option = res.data.house;
+      //   this.list[1].option = res.data.unit;
+      //   this.list[2].option = res.data.layer;
+      //   this.list[3].option = res.data.number_detail;
+      //   this.list[4].option = res.data.product_title;
+      //   this.list[5].option = res.data.url_number;
+      //   this.list[6].option = res.data.part_title;
+      // });
     },
     getData(row) {
       this.loading = true;

src/views/ProductionOrderList/ProductionsOrder/BST_list.vue

@@ -226,13 +226,13 @@ export default {
         this.page_index = this.corssPageData.page_index;
         this.page_size = this.corssPageData.page_size;
         this.set_list[0].value = this.corssPageData.order_no
-        this.set_list[1].value = this.corssPageData.type
-        this.set_list[2].value = this.corssPageData.client_name
-        this.set_list[3].value = this.corssPageData.mobile
-        this.set_list[4].value = this.corssPageData.warning_state
-        this.set_list[5].value = this.corssPageData.state
-        this.set_list[6].start_value = this.corssPageData.start_time ? this.corssPageData.start_time : ''
-        this.set_list[6].end_value = this.corssPageData.end_time ? this.corssPageData.end_time : ''
+        // this.set_list[1].value = this.corssPageData.type
+        this.set_list[1].value = this.corssPageData.client_name
+        // this.set_list[3].value = this.corssPageData.mobile
+        this.set_list[2].value = this.corssPageData.warning_state
+        this.set_list[3].value = this.corssPageData.state
+        this.set_list[4].start_value = this.corssPageData.start_time ? this.corssPageData.start_time : ''
+        this.set_list[4].end_value = this.corssPageData.end_time ? this.corssPageData.end_time : ''
         this.corssPageData.type = this.$route.query.type
         this.getData(this.corssPageData)
       } else {
@@ -240,13 +240,13 @@ export default {
         row.page_index = this.page_index;
         row.page_size = this.page_size;
         this.corssPageData.order_no = this.set_list[0].value
-        this.corssPageData.type = this.set_list[1].value
-        this.corssPageData.client_name = this.set_list[2].value
-        this.corssPageData.mobile = this.set_list[3].value
-        this.corssPageData.warning_state = this.set_list[4].value
-        this.corssPageData.state = this.set_list[5].value
-        this.corssPageData.start_time = this.func.setDate(this.set_list[6].start_value)
-        this.corssPageData.end_time = this.func.setDate(this.set_list[6].end_value)
+        // this.corssPageData.type = this.set_list[1].value
+        this.corssPageData.client_name = this.set_list[1].value
+        // this.corssPageData.mobile = this.set_list[2].value
+        this.corssPageData.warning_state = this.set_list[2].value
+        this.corssPageData.state = this.set_list[3].value
+        this.corssPageData.start_time = this.func.setDate(this.set_list[4].start_value)
+        this.corssPageData.end_time = this.func.setDate(this.set_list[4].end_value)
         this.proxyObj = row
         this.getData(row)
       }