优化

src/views/workforceManagement/team/components/search.vue

@@ -7,22 +7,50 @@
     @submit.native.prevent
   >
     <el-row>
-
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="名称:">
-          <el-input
-            clearable
-            v-model.trim="where.name"
-            placeholder="请输入"
-          />
+          <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
-        <el-form-item label=":">
- 
+        <el-form-item label="所属工厂:">
+          <el-select
+            style="width: 100%"
+            clearable
+            v-model="where.factoryId"
+            @change="change_factoryId"
+            filterable
+            placeholder="请选择所属工厂"
+          >
+            <el-option
+              v-for="item in factoryList"
+              :label="item.name"
+              :value="item.id"
+              :key="item.id"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-col>
 
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+        <el-form-item label="所属厂房:">
+          <el-select
+            style="width: 100%"
+            clearable
+            v-model="where.workshopPlanId"
+            @change="change_workshopPlanId"
+            filterable
+            placeholder="请选择所属厂房"
+          >
+            <el-option
+              v-for="item in workshopPlanList"
+              :label="item.name"
+              :value="item.id"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
         <div class="ele-form-actions">
@@ -37,25 +65,32 @@
           <el-button @click="reset">重置</el-button>
         </div>
       </el-col>
- 
     </el-row>
   </el-form>
 </template>
 
 <script>
+  import { getFactoryarea } from '@/api/factoryModel';
   export default {
     data() {
       // 默认表单数据
       const defaultWhere = {
-
         name: '',
-  
+        factoryId: '',
+        workshopPlanId: ''
       };
       return {
         // 表单数据
         where: { ...defaultWhere },
+
+        factoryList: [],
+        workshopPlanList: []
       };
     },
+
+    created() {
+      this.getFactoryList();
+    },
     computed: {
       // 是否开启响应式布局
       styleResponsive() {
@@ -63,6 +98,30 @@
       }
     },
     methods: {
+      async getFactoryList() {
+        const { list } = await getFactoryarea({
+          pageNum: 1,
+          size: 999,
+          type: 1
+        });
+        this.factoryList = list || [];
+      },
+
+      // 获取厂房
+      change_factoryId() {
+        this.where.workshopPlanId = '';
+        this.workshopPlanList = [];
+
+        let par = {
+          type: 2,
+          parentId: this.where.factoryId,
+          size: 9999
+        };
+        getFactoryarea(par).then((res) => {
+          this.workshopPlanList = res.list;
+        });
+      },
+
       /* 搜索 */
       search() {
         this.$emit('search', this.where);

src/views/workforceManagement/team/index.vue

@@ -1,13 +1,9 @@
 <template>
   <div class="ele-body">
-
-
-
     <el-card shadow="never">
+      <!-- 搜索表单 -->
+      <search @search="reload" />
 
-               <!-- 搜索表单 -->
-               <search @search="reload" />
-               
       <ele-pro-table
         ref="table"
         :columns="columns"
@@ -74,7 +70,7 @@
       edit,
       setclasses
     },
-    data () {
+    data() {
       return {
         selection: [],
         columns: [
@@ -83,14 +79,14 @@
             type: 'selection',
             columnKey: 'selection',
             align: 'center',
-            fixed:'left'
+            fixed: 'left'
           },
           {
             width: 45,
             type: 'index',
             columnKey: 'index',
             align: 'center',
-            fixed:'left'
+            fixed: 'left'
           },
           {
             prop: 'code',
@@ -110,7 +106,7 @@
             label: '所属产线',
             prop: 'productionLineName'
           },
-       
+
           {
             label: '生产版本',
             prop: 'produceVersionName'
@@ -127,7 +123,7 @@
             resizable: false,
             slot: 'action',
             showOverflowTooltip: true,
-            fixed:'right'
+            fixed: 'right'
           }
         ],
         dict: {
@@ -140,7 +136,7 @@
       };
     },
     methods: {
-      datasource ({ page, where, limit }) {
+      datasource({ page, where, limit }) {
         let data = getteampage({
           ...where,
           pageNum: page,
@@ -148,10 +144,10 @@
         });
         return data;
       },
-      openEdit (type, row) {
+      openEdit(type, row) {
         this.$refs.edit.open(type, row);
       },
-      remove (row) {
+      remove(row) {
         let par = [row.id];
         deleteteam(par)
           .then((message) => {
@@ -163,17 +159,17 @@
           });
       },
 
-          /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ page: 1, where: where });
-    },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where: where });
+      },
 
-      done () {
+      done() {
         this.$refs.table.reload({
           page: 1
         });
       },
-      openclass () {
+      openclass() {
         if (this.selection.length <= 0) {
           this.$message.error('请选择班组');
           return;