Merge pull request 'dev-2024年1月8日' (#8) from dev-2024年1月8日 into 2024年2月1日测试

Reviewed-on: #8

src/views/keyprojects/outsourced/components/edit.vue

@@ -801,6 +801,21 @@ export default {
     // 保存
     confirm() {
       for (let i = 0; i < this.inspectorList.length; i++) {
+        requestFN(
+          '/outsourced/checkDepartment',
+          {
+            departmentId: this.form.JURISDICTION_UNIT
+          }
+        ).then((data) => {
+          if (data.data.errInfo === 'fail') {
+            this.$message({
+              message: '勿选其他公司部门！',
+              type: 'error'
+            })
+          }
+          resolve(true)
+        }).catch((e) => {
+        });
         if (this.inspectorList[i].INSPECTION_USER_ID == '') {
           this.$message.warning('第' + (i + 1) + '行必须添加处罚人')
           return

src/views/risk/corpinfo/components/point.vue

@@ -67,7 +67,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="ACCIDENTS_NAME" label="事故类型" />
-        <el-table-column prop="USER_ID" label="管控责任人" />
+        <el-table-column prop="USER_NAME" label="管控责任人" />
         <el-table-column label="操作" align="center" width="200">
           <template slot-scope="{row}">
             <el-button type="success" icon="el-icon-view" size="mini" @click="goDetails(row)">查看</el-button>