Răsfoiți Sursa

修改班组信息

695593266@qq.com 9 luni în urmă
părinte
comite
3a622bbf5a

+ 14 - 0
src/views/factoryModel/productionLine/index.vue

@@ -33,6 +33,14 @@
         <template v-slot:enabled="{ row }">
           {{ dict.enabled[row.enabled] }}
         </template>
+
+        <template v-slot:workCenterList="{ row }">
+          <p v-for="item in row.workCenterList">
+            {{ item.name }}
+          </p>
+
+          <!-- {{ row.workCenterList }} -->
+        </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <el-link
@@ -123,6 +131,12 @@
             prop: 'workshopName'
           },
 
+          {
+            label: '工作中心',
+            prop: 'workCenterList',
+            slot: 'workCenterList'
+          },
+
           {
             label: '所属区域',
             prop: 'areaName'

+ 16 - 16
src/views/workforceManagement/team/components/edit.vue

@@ -99,7 +99,7 @@
               </el-select>
             </el-form-item>
           </el-col> -->
-          <el-col :span="8" style="margin-bottom: 22px">
+          <!-- <el-col :span="8" style="margin-bottom: 22px">
             <el-form-item label="产线:" prop="productionLineId">
               <el-select
                 v-model="form.productionLineId"
@@ -115,7 +115,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8" style="margin-bottom: 22px">
             <el-form-item label="工作中心:" prop="workCenterId">
               <div class="location-warp">
@@ -215,7 +215,7 @@
           code: '',
           leaderUserId: '',
           name: '',
-          productionLineId: [],
+          // productionLineId: [],
           userIds: '',
           userNumber: '',
           // workshopPlanId: null,
@@ -249,9 +249,9 @@
             { required: true, message: '请选择所属工厂', trigger: 'change' }
           ],
 
-          productionLineId: [
-            { required: true, message: '请输入', trigger: 'change' }
-          ],
+          // productionLineId: [
+          //   { required: true, message: '请输入', trigger: 'change' }
+          // ],
 
           workCenterId: [
             { required: true, message: '请选择工作中心', trigger: 'change' }
@@ -262,7 +262,7 @@
         loading: false,
         options: {
           workshopId: [],
-          productionLineId: [],
+          // productionLineId: [],
           workCenterList: []
         },
 
@@ -317,7 +317,7 @@
           // 获取下拉列表
           // await this.getlistWorkshopByParentId();
           // await this.getlistCf();
-          await this.getlistFactoryLineByParentId();
+          // await this.getlistFactoryLineByParentId();
           await this.getlistByProductionLineId();
         }
         if (type != 'edit') {
@@ -396,11 +396,11 @@
         this.workshopPlanList = [];
         // this.form.workshopId = '';
         this.options.workshopId = [];
-        this.form.productionLineId = '';
-        this.options.productionLineId = [];
+        // this.form.productionLineId = '';
+        // this.options.productionLineId = [];
 
         // this.getlistCf();
-        this.getlistFactoryLineByParentId();
+        // this.getlistFactoryLineByParentId();
         this.form.workCenterId = null;
         this.form.workCenterIds = [];
         this.options.workCenterList = [];
@@ -469,18 +469,18 @@
       change_workshopPlanId() {
         this.form.workshopId = '';
         this.options.workshopId = [];
-        this.form.productionLineId = '';
-        this.options.productionLineId = [];
+        // this.form.productionLineId = '';
+        // this.options.productionLineId = [];
 
         this.getlistWorkshopByParentId();
       },
       // 选择车间
       change_workshopId() {
-        this.form.productionLineId = '';
+        // this.form.productionLineId = '';
 
-        this.options.productionLineId = [];
+        // this.options.productionLineId = [];
 
-        this.getlistFactoryLineByParentId();
+        // this.getlistFactoryLineByParentId();
       },
 
       async getVersionList() {

+ 4 - 4
src/views/workforceManagement/team/index.vue

@@ -124,10 +124,10 @@
           //   prop: 'workshopPlanName'
           // },
 
-          {
-            label: '所属产线',
-            prop: 'productionLineName'
-          },
+          // {
+          //   label: '所属产线',
+          //   prop: 'productionLineName'
+          // },
           {
             label: '工作中心',
             prop: 'workCenterNames'

+ 0 - 2
vue.config.js

@@ -38,11 +38,9 @@ module.exports = {
 
         // target: 'http://192.168.1.251:18086',
         target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
 
         // target: 'http://192.168.1.251:18087',
-        target: 'http://192.168.1.251:18086',
 
         // target: 'http://192.168.1.116:18086',