Sfoglia il codice sorgente

工位管理新增所属工作中心和工序名称显示和工序的搜索

695593266@qq.com 2 mesi fa
parent
commit
f4fb60f9bc

+ 41 - 10
src/views/factoryModel/station/components/search.vue

@@ -24,16 +24,17 @@
           <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
-        <el-form-item label="负责人:">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="所属工作中心:" prop="extInfo.workCenterId">
           <el-select
-            v-model.trim="where.leaderId"
+            v-model="where.workCenterId"
             filterable
             placeholder="请选择"
             style="width: 100%"
+            clearable
           >
             <el-option
-              v-for="item in options.leaderId"
+              v-for="item in workCenterList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
@@ -42,17 +43,36 @@
           </el-select>
         </el-form-item>
       </el-col>
-
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="所属工作中心:" prop="extInfo.workCenterId">
+        <el-form-item label="工序:" prop="where.sourceTaskId">
           <el-select
-            v-model="where.workCenterId"
+            v-model="where.sourceTaskId"
             filterable
             placeholder="请选择"
             style="width: 100%"
+            clearable
           >
             <el-option
-              v-for="item in workCenterList"
+              v-for="item in sourceTaskList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
+        <el-form-item label="负责人:">
+          <el-select
+            v-model.trim="where.leaderId"
+            filterable
+            placeholder="请选择"
+            style="width: 100%"
+            clearable
+          >
+            <el-option
+              v-for="item in options.leaderId"
               :key="item.id"
               :label="item.name"
               :value="item.id"
@@ -88,6 +108,7 @@
   import AreaSelect from '@/views/enterpriseModel/regionalManage/components/area-cascader.vue';
   import { basicAreaPageAPI } from '@/api/regionalManage';
   import work from '@/api/technology/work';
+  import producetask from '@/api/technology/production';
   export default {
     components: { AreaSelect },
     props: {
@@ -115,7 +136,8 @@
         code: '',
         name: '',
         leaderId: '',
-        workCenterId: ''
+        workCenterId: '',
+        sourceTaskId: ''
       };
       return {
         defaultWhere,
@@ -126,7 +148,8 @@
           leaderId: []
         },
         workCenterList: [],
-        areaTreeList: []
+        areaTreeList: [],
+        sourceTaskList: []
       };
     },
     computed: {
@@ -139,6 +162,7 @@
       this.getUserPage();
       this.getBasicAreaList();
       this.getListWorkCenter();
+      this.getListProduce();
     },
     methods: {
       /* 获取区域集合 */
@@ -160,6 +184,13 @@
         });
       },
 
+      getListProduce() {
+        producetask.list({ pageNum: 1, size: -1 }).then((res) => {
+          console.log(res.list, '工序列表');
+          this.sourceTaskList = res.list || [];
+        });
+      },
+
       /* 搜索 */
       search() {
         this.$emit('search', this.where);

+ 8 - 0
src/views/factoryModel/station/index.vue

@@ -151,6 +151,10 @@
             label: '所属厂房',
             prop: 'workshopPlanName'
           },
+          {
+            label: '所属工作中心',
+            prop: 'workCenterName'
+          },
           {
             label: '所属车间',
             prop: 'workshopName'
@@ -159,6 +163,10 @@
             label: '所属产线',
             prop: 'productionLineName'
           },
+          {
+            label: '工序',
+            prop: 'taskNames'
+          },
           {
             label: '设备名称',
             prop: 'extInfo.assetName',