九方优化

src/views/Dispatching/DispatchingDetail.vue

@@ -15,13 +15,20 @@
       <div class="header">
         <Form :label-width="85" :model="searchData">
           <FormItem label="项目名称:">
-            <Input
-              type="text"
+             <Select
               size="small"
               clearable
+              filterable
+              placeholder="请选择项目名称"
               v-model="searchData.client_name"
-              placeholder="请输入项目名称"
-            ></Input>
+            >
+            <Option
+                v-for="(_product, _index) in projectList"
+                :key="_index"
+                :value="_product"
+                :label="_product"
+              ></Option>
+            </Select>
           </FormItem>
           <FormItem label="产品:">
             <Select
@@ -61,13 +68,28 @@
             :key="item.title + index"
             :label="item.title"
           >
-            <Input
+            <!-- <Input
               type="text"
               size="small"
               clearable
               v-model="item.value"
               :placeholder="'请输入' + item.title"
-            ></Input>
+            ></Input> -->
+             <Select
+              size="small"
+              clearable
+              filterable
+              filter-by-label
+              placeholder="'请输入' + item.title"
+              v-model="searchData.part_title"
+            >
+              <Option
+                v-for="(_part, _index) in partList"
+                :key="_index"
+                :value="_part"
+                :label="_part"
+              ></Option>
+            </Select>
           </FormItem>
           <FormItem>
             <Button
@@ -240,6 +262,10 @@ export default {
       headerList: [],
       productList: [],
       partList: [],
+      projectList: [],
+      materialList: [],
+      colorList: [],
+      workList: [],
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -277,12 +303,17 @@ export default {
               key: key,
               minWidth: 150,
             });
-            this.headerList.push({ title: element, key: key, value: "" });
+            this.headerList.push({ title: element, key: key, value: "",materialList: res.data.header.material,colorList: res.data.header.color,workList: res.data.header.workmanship});
           }
           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.infoData = res.data.detail;
           this.tableData = res.data.data;
+
           this.tableData.forEach((element) => {
             Object.assign(element, element.process);
             element.order_produce_id = element.id;
@@ -290,6 +321,8 @@ export default {
           });
           this.total = res.data.total;
         }
+      
+         console.log(this.headerList);
       });
     },
     handleSearch() {

src/views/ProductionOrderList/Dispatchlist/list.vue

@@ -145,7 +145,7 @@ export default {
     // 获取紧急程度
     this.axios.get('/api/warning_list').then(res => { this.warningList = res.data.data })
     // 获取用户列表
-    this.axios({ method: 'get', url: '/api/user', }).then((res) => { this.userList = res.data.data }).catch((err) => { });
+    this.axios({ method: 'get', url: '/api/employee_list', }).then((res) => { this.userList = res.data }).catch((err) => { });
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {

src/views/ProductionOrderList/ProductionPlanlist/list.vue

@@ -107,8 +107,10 @@ export default {
         {
           title: '订单状态', align: 'center', key: 'state', minWidth: 150,
           render: (h, params) => h('span', {},
-              (params.row.state == 1 ? '未派工'
-                : (params.row.state == 2 ? '已派工':'完成'))
+              (params.row.state == 0 ? '未派工'
+                : params.row.state == 1 ? '未派工'
+                  : params.row.state == 2 ? '已派工'
+                    : (params.row.state == 3 ? '完工':''))
           )
         },
         { title: '业务员', align: 'center', key: 'nickname', minWidth: 150 },
@@ -208,7 +210,7 @@ export default {
         {
           title: '订单状态', name: 'Select', placeholder: '请选择', serverName: 'state', value: '',
           option: [
-            { label: '未派工', value: 1 },
+            { label: '未派工', value: '0,1' },
             { label: '已派工', value: 2 },
             { label: '完成', value: 3 },
           ]