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

src/views/Dispatching/DispatchingDetail.vue

@@ -63,28 +63,54 @@
               ></Option>
             </Select>
           </FormItem>
-          <FormItem
-            v-for="(item, index) in headerList"
-            :key="item.title + index"
-            :label="item.title"
-          >
-            <!-- <Input
-              type="text"
+         <FormItem label="材质:">
+            <Select
               size="small"
               clearable
-              v-model="item.value"
-              :placeholder="'请输入' + item.title"
-            ></Input> -->
-             <Select
+              filterable
+              filter-by-label
+              placeholder="请选择材质 "
+              v-model="searchData.material"
+              @on-change="material"
+            >
+              <Option
+                v-for="(_part, _index) in materialList"
+                :key="_index"
+                :value="_part"
+                :label="_part"
+              ></Option>
+            </Select>
+          </FormItem>
+          <FormItem label="颜色:">
+            <Select
               size="small"
               clearable
               filterable
               filter-by-label
-              placeholder="'请输入' + item.title"
-              v-model="searchData.part_title"
+              placeholder="请选择颜色"
+              v-model="searchData.color"
+              @on-change="color"
             >
               <Option
-                v-for="(_part, _index) in partList"
+                v-for="(_part, _index) in colorList"
+                :key="_index"
+                :value="_part"
+                :label="_part"
+              ></Option>
+            </Select>
+          </FormItem>
+          <FormItem label="工艺:">
+            <Select
+              size="small"
+              clearable
+              filterable
+              filter-by-label
+              placeholder="请选择工艺"
+              v-model="searchData.work"
+              @on-change="work"
+            >
+              <Option
+                v-for="(_part, _index) in workList"
                 :key="_index"
                 :value="_part"
                 :label="_part"
@@ -237,6 +263,9 @@ export default {
         },
         { title: "产品", align: "center", key: "product_title", minWidth: 150 },
         { title: "部件", align: "center", key: "part_title", minWidth: 150 },
+        // { title: "材质", align: "center", key: "material", minWidth: 150 },
+        // { title: "颜色", align: "center", key: "color", minWidth: 150 },
+        // { title: "工艺", align: "center", key: "work", minWidth: 150 },
       ],
       tableColumnsAdd: [],
       page_index: 1,
@@ -247,6 +276,9 @@ export default {
         client_name: "",
         product_title: "",
         part_title: "",
+        material: "",
+        color: "",
+        work: "",
       },
       infoData: {},
       selected: [],
@@ -303,14 +335,14 @@ export default {
               key: key,
               minWidth: 150,
             });
-            this.headerList.push({ title: element, key: key, value: "",materialList: res.data.header.material,colorList: res.data.header.color,workList: res.data.header.workmanship});
+            this.headerList.push({ title: element, key: key, value: ""});
           }
           this.productList = res.data.header.product_list;
           this.partList = res.data.header.part_list;
           this.projectList = res.data.header.project;
-          // this.materialList = res.data.header.material;
-          // this.colorList = res.data.header.color;
-          // this.workList = res.data.header.workmanship;
+          this.materialList = res.data.header.material;
+          this.colorList = res.data.header.color;
+          this.workList = res.data.header.workmanship;
           this.infoData = res.data.detail;
           this.tableData = res.data.data;
 
@@ -321,8 +353,6 @@ export default {
           });
           this.total = res.data.total;
         }
-      
-         console.log(this.headerList);
       });
     },
     handleSearch() {
@@ -334,10 +364,11 @@ export default {
           page_index: this.page_index,
           page_size: this.page_size,
           ...this.searchData,
+          
           // process: JSON.stringify(this.headerList),
           process: JSON.stringify(this.headerList),
         },
-      }).then((res) => {
+      }).then((res) => { 
         if (res.code == 200) {
           this.tableData = res.data.data;
           this.tableData.forEach((element) => {
@@ -347,8 +378,18 @@ export default {
           });
           this.total = res.data.total;
         }
+        
       });
     },
+    material(){
+      this.headerList[0].value = this.searchData.material
+    },
+    color(){
+      this.headerList[1].value = this.searchData.color
+    },
+    work(){ 
+      this.headerList[2].value = this.searchData.work
+    },
     goBack() {
       this.$router.go(-1);
     },