工种列表

src/views/modules/tech/work-type-add-or-update.vue

@@ -66,7 +66,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="负责人" prop="masterIds">
+            <el-form-item label="负责人" prop="foreman">
               <user-component v-model="dataForm.foreman" :user-id="dataForm.foreman" @userSelected='foremanChange' :disabled="display" style="width:100%;"/>
             </el-form-item>
           </el-col>
@@ -104,7 +104,9 @@
           name: [{ required: true, message: '工种名称不能为空', trigger: 'blur' }],
           level: [{ required: true, message: '工种级别不能为空', trigger: 'change' }],
           requirement: [{ required: true, message: '工种要求不能为空', trigger: 'blur' }],
-          quotedPrice: [{ required: true, message: '工时单价不能为空', trigger: 'blur' }]
+          quotedPrice: [{ required: true, message: '工时单价不能为空', trigger: 'blur' }],
+          masterIds: [{ required: true, message: '请选择掌握人', trigger: 'blur' }],
+          foreman: [{ required: true, message: '请选择工种负责人', trigger: 'blur' }]
         }
       }
     },
@@ -137,10 +139,6 @@
       // 表单提交
       dataFormSubmit () {
         this.$refs['dataForm'].validate((valid) => {
-          // 检查掌握人
-          if (!this.id && (!this.dataForm.masterIds || this.dataForm.masterIds.length === 0)) {
-            this.$message.warning('掌握人不能为空')
-          }
           if (valid) {
             let params = {
               level: this.dataForm.level,

src/views/modules/tech/work-type-detail.vue

@@ -33,6 +33,7 @@
         <e-desc-item label="工种要求" span="3">{{dataForm.requirement}}</e-desc-item>
         <e-desc-item label="备注" span="3">{{dataForm.notes}}</e-desc-item>
         <e-desc-item label="掌握人" span="3">{{dataForm.masterNames?dataForm.masterNames.toString():''}}</e-desc-item>
+        <e-desc-item label="负责人" span="3">{{dataForm.foremanName}}</e-desc-item>
       </e-desc>
     </div>
     <span slot="footer" class="dialog-footer">

src/views/modules/tech/work-type.vue

@@ -87,10 +87,9 @@
           label="掌握人">
         </el-table-column>
         <el-table-column
-          prop="foreman"
+          prop="foremanName"
           header-align="center"
           align="center"
-          :formatter="formatNames"
           min-width="140"
           :show-tooltip-when-overflow="true"
           label="负责人">