班组

src/views/group/base/groupTeam/components/groupTeamAdd.vue

@@ -1,18 +1,30 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="100px" :model="form">
     <el-row>
+      <el-col :span="12">
+        <el-form-item label="车间名称" prop="roomNameDict">
+          <el-select v-model="form.roomNameDict" placeholder="请选择" style="width: 100%;" filterable>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.WORK_SHOP)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
       <el-col :span="12">
         <el-form-item label="班组名称" prop="name">
           <el-input v-model="form.name"></el-input>
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="12">
         <el-form-item label="班组编码" prop="code">
           <el-input v-model="form.code" disabled></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row>
       <el-col :span="12">
         <el-form-item label="班组组长" prop="leaderId">
           <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" filterable @change="selectLeader">
@@ -25,6 +37,8 @@
           </el-select>
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="12">
         <el-form-item label="手机号" prop="telephone">
           <el-input v-model="form.telephone" disabled></el-input>
@@ -45,10 +59,12 @@ export default {
         name: '',
         code: '',
         leaderId: '',
-        telephone: ''
+        telephone: '',
+        roomNameDict: ''
       },
       isEdit: false, //是否是编辑
       rules: {
+        roomNameDict: [{ required: true, message: '请选择车间名称', trigger: 'select' }],
         name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
         code: [{ required: true, message: '请输入班组编码', trigger: 'blur' }],
         leaderId: [{ required: true, message: '请选择组长', trigger: 'select' }]
@@ -64,7 +80,11 @@ export default {
         this.form.id = id
         getGroupTeam( id ).then((res) => {
           if (res.code === 0) {
-            this.form = res.data
+            this.form.name = res.data.name
+            this.form.code = res.data.code
+            this.form.leaderId = res.data.leaderId
+            this.form.telephone = res.data.telephone
+            this.form.roomNameDict = (res.data.roomNameDict || res.data.roomNameDict===0) ? String(res.data.roomNameDict) : ''
             this.selectLeader()
           }
         })

src/views/group/base/groupTeam/index.vue

@@ -54,6 +54,7 @@ import GroupTeamAdd from './components/groupTeamAdd'
 import StatusBtn from './components/statusBtn'
 import WorkerOperate from './components/workerOperate'
 import WorkerEdit from './components/workerEdit'
+import { publicFormatter } from '@/utils/dict'
 const tableProps = [
   {
     prop: 'createTime',
@@ -61,6 +62,11 @@ const tableProps = [
     filter: parseTime,
     minWidth: 160
   },
+  {
+    prop: 'roomNameDict',
+    label: '车间名称',
+    filter: publicFormatter('workshop')
+  },
   {
     prop: 'name',
     label: '班组名称'