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

src/views/ProductionOrderList/Dispatchlist/details.vue

@@ -14,6 +14,7 @@
       :pageIndex="pageIndex"
       :pageSize="pageSize"
       :total="total"
+      @changeSelected="changeSelected"
     >
       <div slot="titleButton">
         <Button @click="back" style="margin-right:10px;">返回</Button>
@@ -153,6 +154,19 @@
 export default {
   data() {
     return {
+      formData:{
+           house:'',
+           unit:'',
+           layer:'',
+           number_detail:'',
+           product_title:'',
+           url_number:'',
+           part_title:'',
+           label:'',
+           basic_title:'',
+           procedure_title:'',
+           state:''
+      },
       form_modal: {
         return_list: [
           {
@@ -271,6 +285,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "house",
           optionName: "house",
           optionValue: "house",
@@ -281,6 +296,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "unit",
           optionName: "unit",
           optionValue: "unit",
@@ -291,6 +307,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "layer",
           optionName: "layer",
           optionValue: "layer",
@@ -301,6 +318,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "number_detail",
           optionName: "number",
           optionValue: "number",
@@ -311,6 +329,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "product_title",
           optionName: "title",
           optionValue: "title",
@@ -321,6 +340,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "url_number",
           optionName: "url_number",
           optionValue: "url_number",
@@ -331,6 +351,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "part_title",
           optionName: "title",
           optionValue: "title",
@@ -341,6 +362,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "label",
           option: this.tip_state,
         },
@@ -349,6 +371,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "basic_title",
           optionName: "title",
           optionValue: "id",
@@ -359,6 +382,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "procedure_title",
           optionName: "title",
           optionValue: "id",
@@ -369,6 +393,7 @@ export default {
           filterable: true,
           name: "Select",
           value: "",
+          change:true,
           serverName: "state",
           option: this.room_list,
         },
@@ -384,6 +409,19 @@ export default {
     });
   },
   methods: {
+    changeSelected(row){
+         this.formData.house = row[0].value;
+          this.formData.unit = row[1].value;
+          this.formData. layer = row[2].value;
+          this.formData. number_detail = row[3].value;
+           this.formData.product_title = row[4].value;
+           this.formData.url_number = row[5].value;
+           this.formData.part_title = row[6].value;
+           this.formData.label = row[7].value;
+           this.formData.basic_title = row[8].value;
+           this.formData.procedure_title = row[9].value;
+           this.formData.state = row[10].value;
+    },
     updata() {
       if (this.selectIds == "") {
         this.$Message.warning("请选择产品！");
@@ -573,12 +611,16 @@ export default {
     changePage(e) {
       this.pageIndex = e;
       this.proxyObj.page_index = this.pageIndex;
-      this.getData(this.proxyObj);
+      let data = {};
+      data = {...this.formData,...this.proxyObj}
+      this.getData(data);
     },
     changeSize(e) {
       this.pageSize = e;
       this.proxyObj.page_size = this.page_size;
-      this.getData(this.proxyObj);
+       let data = {};
+      data = {...this.formData,...this.proxyObj}
+      this.getData(data);
     },
     batchPrint() {
       this.confirmForm({

src/views/ProductionOrderList/ProductionsOrder/BST_Decorationlist.vue

@@ -7,6 +7,7 @@
       :logList="logList"
       :loading="loading"
       @searchData="init"
+      @changeSelected='changeSelected'
       @changePage="changePage"
       @changeSize="changeSize"
       @selectTable="selectTable"
@@ -465,6 +466,7 @@ export default {
           multiple: true,
           filterable: true,
           value: "",
+           change:true,
           serverName: "house",
           placeholder: "请选择楼幢",
           option: [],
@@ -476,6 +478,7 @@ export default {
           multiple: true,
           filterable: true,
           value: "",
+           change:true,
           serverName: "unit",
           placeholder: "请选择单元",
           option: [],
@@ -486,6 +489,7 @@ export default {
           multiple: true,
           filterable: true,
           value: "",
+           change:true,
           serverName: "layer",
           placeholder: "请选择楼层",
           option: [],
@@ -496,6 +500,7 @@ export default {
           multiple: true,
           filterable: true,
           value: "",
+           change:true,
           serverName: "number_detail",
           placeholder: "请选择房号",
           option: [],
@@ -506,6 +511,7 @@ export default {
           multiple: true,
           filterable: true,
           value: "",
+          change:true,
           serverName: "part",
           placeholder: "请选择部件",
           option: [],
@@ -516,6 +522,7 @@ export default {
           multiple: true,
           filterable: true,
           value: "",
+           change:true,
           serverName: "product",
           placeholder: "请选择产品",
           option: [],
@@ -524,6 +531,7 @@ export default {
           title: "是否存在工艺路线",
           name: "Select",
           value: "",
+           change:true,
           serverName: "process_router",
           option: [
             { label: "是", value: 1 },
@@ -554,6 +562,7 @@ export default {
           title: "部件状态",
           name: "Select",
           value: "",
+           change:true,
           serverName: "part_state",
           option: [
             { label: "未下计划", value: 0 },
@@ -566,6 +575,7 @@ export default {
           multiple: true,
           filterable: true,
           value: "",
+           change:true,
           serverName: "img_number",
           placeholder: "请选择图号",
           option: [],
@@ -862,6 +872,17 @@ export default {
       show_add_detail: false,
       show_add: false,
       processLineTableData: [],
+      formData:{
+        house:'',
+        unit:'',
+        layer:'',
+        number_detail:'',
+        part:'',
+        product:'',
+        process_router:'',
+        part_state:'',
+        img_number:''
+      },
       info: {
         title: "",
         price: "",
@@ -994,6 +1015,17 @@ export default {
         }
       );
     },
+    changeSelected(row){
+       this.formData.house = row[0].value;
+       this.formData.unit = row[1].value;
+         this.formData.layer = row[2].value;
+         this.formData.number_detail= row[3].value;
+        this.formData.part= row[4].value;
+        this.formData.product= row[5].value;
+        this.formData.process_router= row[6].value;
+        this.formData.part_state= row[7].value;
+        this.formData.img_number= row[8].value;
+    },
     getOptions() {
       this.axios("/api/order_detail_word", {
         params: { order_no: this.$route.query.order_no },
@@ -1054,7 +1086,28 @@ export default {
       if (Array.isArray(row)) {
         //批量下生产操作
         if (row.length < 1) {
-          return this.$Message.warning("请至少选择一项");
+          
+            if(this.formData.house||this.formData.unit||this.formData.layer||this.formData.number_detail||this.formData.part||this.formData.product||this.formData.process_router||this.formData.part_state||this.formData.img_number){
+              //  this.axios.post('/api/orders_plan',this.formData);
+          let data = {zero:{},type:1};
+          data.zero.order_no = this.$route.query.order_no;
+              for(let i in this.formData){
+                data.zero[i]=this.formData[i]
+              };
+               this.downProduction({
+        title: "下生产排产",
+        type: 1,
+        params: data,
+        then: (e) => {
+          this.getData(this.proxyObj);
+        },
+        cancel: (e) => {},
+      });
+               return;
+            }else{
+               return this.$Message.warning("请至少选择一项");
+            }
+         
         }
         let result = [];
         row.map((v) => result.push(v.pr_id));