Merge remote-tracking branch 'origin/master'

src/views/bpm/handleTask/components/sparePartsApply/edit.vue

@@ -60,17 +60,21 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="使用部门" prop="useDeptId">
-            <deptSelect
+          <el-form-item label="使用部门" prop="useDeptName">
+            <el-input v-model="form.useDeptName" :disabled="type == 'detail'" />
+
+            <!-- <deptSelect
               :disabled="type == 'detail'"
               v-model="form.useDeptId"
               @changeGroup="searchDeptNodeClick"
-            />
+            /> -->
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="使用人" prop="userId">
-            <el-select
+          <el-form-item label="使用人" prop="userName">
+            <el-input v-model="form.userName" :disabled="type == 'detail'" />
+
+            <!-- <el-select
               :disabled="type == 'detail'"
               v-model="form.userId"
               @change="changeExecutor"
@@ -84,7 +88,7 @@
                 :value="item.id"
                 :label="item.name"
               ></el-option>
-            </el-select>
+            </el-select> -->
           </el-form-item>
         </el-col>
     
@@ -241,7 +245,9 @@ export default {
       executorList: [],
       form: { ...defForm },
       rules: {
-        deviceName: [{ required: true, message: '请选择', trigger: 'change' }]
+        deviceName: [{ required: true, message: '请选择', trigger: 'change' }],
+        useDeptName: [{ required: true, message: '请输入', trigger: 'change' }],
+        userName: [{ required: true, message: '请输入', trigger: 'change' }],
       },
       sparePartsApplyList: [],
       tableList: [],