禅道bug 929 935 1400 1800 2127 修复

src/components/AssetDialog/categoryDialog.vue

@@ -241,6 +241,10 @@
       },
 
       async submit() {
+        if (this.selectionList.length == 0) {
+          this.$message.warning('请选择一条数据');
+          return;
+        }
         this.$emit('success', this.selectionList[0].id);
         this.handleClose();
         //   this.form.exportList = this.selectionList

src/views/maintenance/components/signingUpWork.vue

@@ -177,9 +177,13 @@
         time: [],
         options: [
           {
-            label: '正常',
+            label: '未定义',
             value: 0
           },
+          {
+            label: '正常',
+            value: 1
+          },
           {
             label: '缺陷',
             value: -1

src/views/maintenance/equipment/workOrder/index.vue

@@ -278,7 +278,7 @@
         data.deviceList = data.deviceList.map((item) => {
           return item.substance;
         });
-
+        console.log(3333333333333,111)
         this.$refs.edit.open(data, 'add');
       },
       goDetail({ id }) {

src/views/maintenance/repair/repairNotes/components/addDialog.vue

@@ -104,17 +104,27 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="片区负责人部门：" prop="repairGroupName">
+            <!-- <el-form-item label="片区负责人部门：" prop="repairGroupName">
               <dept-select
                 v-model="addForm.repairGroupName"
                 placeholder="选择设备带出"
                 disabled
               />
+            </el-form-item> -->
+            <el-form-item
+              label="片区负责人部门："
+              prop="areaPersonInChargeGroupId"
+            >
+              <dept-select
+                v-model="addForm.areaPersonInChargeGroupId"
+                placeholder="选择设备带出"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="片区负责人：" prop="repairUserName">
               <person-select
                 v-model="addForm.repairUserId"
@@ -123,6 +133,16 @@
                 disabled
               />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="片区负责人：" prop="areaPersonInChargeUserId">
+              <person-select
+                v-model="addForm.areaPersonInChargeUserId"
+                clearable
+                placeholder="选择设备带出"
+                disabled
+              />
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="领导部门：" prop="leaderDeptId">
@@ -169,7 +189,33 @@
               /> -->
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="维修部门" prop="repairGroupId">
+              <dept-select
+                v-model="addForm.repairGroupId"
+                @changeGroup="searchDeptNodeClick"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="维修人：" prop="repairUserId">
+              <el-select
+                v-model="addForm.repairUserId"
+                @change="changeExecutor"
+                size="small"
+                style="width: 100%"
+                filterable
+              >
+                <el-option
+                  v-for="item in executorList"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" style="margin-top: 8px">
             <el-form-item label="故障描述：" prop="remark">
               <el-input
                 type="textarea"
@@ -265,21 +311,71 @@
         initData: [],
         userList: [],
         addFormRules: {
-          remark: {
-            required: true,
-            message: '请输入故障描述',
-            trigger: 'blur'
-          }
+          remark: [
+            {
+              required: true,
+              message: '请输入故障描述',
+              trigger: 'blur'
+            }
+          ],
+          repairGroupId: [
+            {
+              required: true,
+              message: '请选择维修部门',
+              trigger: 'change'
+            }
+          ],
+          repairUserId: [
+            {
+              required: true,
+              message: '请选择维修人',
+              trigger: 'change'
+            }
+          ]
         },
         loading: false,
         row: null,
-        receiverList: []
+        receiverList: [],
+        executorList: []
       };
     },
     created() {
       this.getUserList();
     },
     methods: {
+      //选择部门(搜索)
+      searchDeptNodeClick(info, row) {
+        this.executorList = [];
+        if (info) {
+          const params = { groupId: info };
+          this.getUserListD(params);
+          this.addForm.repairGroupName = row.name;
+        } else {
+          this.addForm.repairGroupId = null;
+        }
+      },
+      // 人员
+      async getUserListD(params) {
+        try {
+          let data = { pageNum: 1, size: -1 };
+          // 如果传了参数就是获取巡点检人员数据
+          if (params) {
+            data = Object.assign(data, params);
+          }
+          const res = await getUserPage(data);
+          this.executorList = res.list;
+        } catch (error) {}
+      },
+      // 人员选择
+      changeExecutor(val) {
+        if (val) {
+          this.addForm.repairUserId = val;
+          this.addForm.repairUserName = this.executorList.filter(
+            (item) => item.id === val
+          )[0].name;
+        }
+      },
+
       // 切换领导部门更换人员
       async auditorDeptClick(data) {
         console.log(data);
@@ -349,8 +445,11 @@
         } else {
           constApi = getRepairInfoById;
         }
-        constApi(id).then((res) => {
+        constApi(id).then(async (res) => {
           console.log('res--------------', res);
+          if (res.repairGroupId) {
+            await this.getUserListD({ groupId: res.repairGroupId });
+          }
           if (this.title === '新增') {
             this.addForm = {
               ...res.category.category,
@@ -365,6 +464,7 @@
             };
             this.getStaffList(this.addForm.leaderDeptId);
           }
+
           console.log('addForm--------------', this.addForm);
           this.addForm.equiLocation =
             this.addForm.deviceLocationName +

src/views/sparePartsApply/components/edit.vue

@@ -83,21 +83,21 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="使用部门" prop="useDeptName">
-            <el-input v-model="form.useDeptName" :disabled="type == 'detail'" />
-
-            <!-- <deptSelect
+          <!-- <el-form-item label="使用部门" prop="useDeptName"> -->
+          <!-- <el-input v-model="form.useDeptName" :disabled="type == 'detail'" /> -->
+          <el-form-item label="使用部门" prop="useDeptId">
+            <deptSelect
               :disabled="type == 'detail'"
               v-model="form.useDeptId"
               @changeGroup="searchDeptNodeClick"
-            /> -->
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="使用人" prop="userName">
-            <el-input v-model="form.userName" :disabled="type == 'detail'" />
+          <el-form-item label="使用人" prop="userId">
+            <!-- <el-input v-model="form.userName" :disabled="type == 'detail'" /> -->
 
-            <!-- <el-select
+            <el-select
               :disabled="type == 'detail'"
               v-model="form.userId"
               @change="changeExecutor"
@@ -111,7 +111,7 @@
                 :value="item.id"
                 :label="item.name"
               ></el-option>
-            </el-select> -->
+            </el-select>
           </el-form-item>
         </el-col>
 
@@ -294,10 +294,12 @@
           deviceName: [
             { required: true, message: '请选择', trigger: 'change' }
           ],
-          useDeptName: [
-            { required: true, message: '请输入', trigger: 'change' }
-          ],
-          userName: [{ required: true, message: '请输入', trigger: 'change' }]
+          // useDeptName: [
+          //   { required: true, message: '请输入', trigger: 'change' }
+          // ],
+          useDeptId: [{ required: true, message: '请选择', trigger: 'change' }],
+          userId: [{ required: true, message: '请选择', trigger: 'change' }]
+          // userName: [{ required: true, message: '请输入', trigger: 'change' }]
         },
         sparePartsApplyList: [],
         tableList: [],
@@ -513,6 +515,14 @@
       },
       /* 保存编辑 */
       async save() {
+        if (!this.form.useDeptId) {
+          this.$message.error('请选择使用部门！');
+          return;
+        }
+        if (!this.form.userId) {
+          this.$message.error('请选择使用人！');
+          return;
+        }
         if (this.deviceList.length == 0) {
           this.$message.error('请选择设备！');
           return;
@@ -527,8 +537,11 @@
           return;
         }
         this.form.detailList = this.tableList;
+        if (this.deviceList[0] == null) {
+          this.deviceList = [];
+        }
         this.form.deviceList = this.deviceList;
-
+        this.loading = true;
         save(this.form)
           .then((res) => {
             this.loading = false;