Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature

src/views/modules/base/organization/organization.vue

@@ -1823,14 +1823,18 @@ export default {
     },
     // 人员修改
     async updatePeoDo () {
-      const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
+      if(this.peoForm.manageScopes){
+        const targetAgencyIds =this.peoForm.manageScopes?this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]):this.peoForm.manageScopes;
       // 用于存储提取结果的 Set 对象
       const result = new Set();
       // 调用递归函数提取 level 与 agencyId 组合成的字符串
       this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
       // 将 Set 对象转换为数组
+       var manageScopeArray = Array.from(result);
+      console.log(this.peoForm,"查看");
+      }
 
-      const manageScopeArray = Array.from(result);
+      
       const url = "/gov/org/staff/editstaff";
       let params = {
         staffId: this.userStaffId,
@@ -2118,7 +2122,6 @@ export default {
       this.gridTableFlag = false;
       this.agencyTableFlag = false;
       this.departmentTableFlag = false;
-
       this.selDeptType = row.deptType;
       this.getDepartmentStaffListData();
       this.assembleBreadcrumbArr(row.departmentId, "department");
@@ -2303,7 +2306,7 @@ export default {
         this.peoForm.post = data.workType;
         this.peoForm.idCard = data.idCard;
         this.peoForm.manageOrgIds = data.manageOrgIdStr?data.manageOrgIdStr.split(','):[];
-        this.peoForm.orgLevels = data.orgLevels;
+        this.peoForm.orgLevels = data.manageLevelStr;
         this.manageOrgIds = data.manageOrgIdStr;
         // 已有的权限（角色）
         let existedRoleArr = [];
@@ -2313,6 +2316,7 @@ export default {
           }
         });
         this.peoForm.newRoles = existedRoleArr;
+        
       } else {
         this.$message.error(msg);
       }

src/views/modules/shequzhili/event/cpts/event-info.vue

@@ -202,7 +202,7 @@
 
                                         <div class="detail" v-if="item.irregularity!==''&&item.irregularity!==null&&item.irregularity!==''&&item.irregularity!==null">
                                             <div class="detail-field">填报不合规诉求：</div>
-                                            <div class="detail-value">{{ irregularity.find(v => v.value ==item.irregularity).label }}</div>
+                                            <div class="detail-value">{{ binaryOptionList.find(v => v.value ==item.irregularity).label }}</div>
                                         </div>
                                         <div class="detail" v-if="item.nonComplianceType!==''&&item.nonComplianceType!==null&&item.irregularity!==''&&item.irregularity!==null">
                                             <div class="detail-field">不合规诉求类型：</div>
@@ -252,7 +252,7 @@
     </div>
 </template>
 <script>
-import { examine, confirmSolved, satisfactionResult, solveState, irregularity, nonComplianceType } from "@/js/columns/constants";
+import { examine, confirmSolved, satisfactionResult, solveState, irregularity, nonComplianceType,binaryOptionList } from "@/js/columns/constants";
 import { requestPost,requestGet } from "@/js/dai/request";
 import { Loading } from "element-ui"; // 引入Loading服务
 import foldText from "@/views/components/foldText";
@@ -267,6 +267,7 @@ import processForm from "./process-form";
 let loading; // 加载动画
 function iniData() {
     return {
+        binaryOptionList:[],
         formData: {
             operationType: "",
         },
@@ -357,6 +358,7 @@ export default {
         this.satisfactionResult = satisfactionResult
         this.solveState = solveState
         this.irregularity = irregularity
+       this.binaryOptionList= binaryOptionList
         this.nonComplianceType = nonComplianceType
         if(this.pageType === 'check'){
             this.replayDetail()

src/views/modules/shequzhili/event/cpts/process-form-complete.vue

@@ -262,7 +262,7 @@
           </div>
           <div class="item">
             <el-form-item label="是否解决" label-width="118px" :class="{ 'form-item': source === 'visiual' }"
-              prop="examine">
+              prop="confirmSolved">
               <div :class="{ 'visiual-form': source === 'visiual' }">
                 <el-select v-model.trim="formData.confirmSolved" clearable class="item_width_4">
                   <el-option v-for="item in confirmSolved" :key="item.value" :label="item.label" :value="item.value">
@@ -273,7 +273,7 @@
           </div>
           <div class="item">
             <el-form-item  label="是否满意" label-width="118px" :class="{ 'form-item': source === 'visiual' }"
-              prop="examine">
+              prop="satisfactionResult">
               <div :class="{ 'visiual-form': source === 'visiual' }">
                 <el-select v-model.trim="formData.satisfactionResult" clearable class="item_width_4">
                   <el-option v-for="item in satisfactionResult" :key="item.value" :label="item.label"
@@ -486,6 +486,12 @@ showHotline:false,
         examine: [
           { required: true, message: "请选择审核结果", trigger: "blur" },
         ],
+        confirmSolved: [
+          { required: true, message: "请选择是否解决", trigger: "blur" },
+        ],
+        satisfactionResult: [
+          { required: true, message: "请选择是否满意", trigger: "blur" },
+        ],
         // examine: [
         //   { required: true, message: "请选择审核结果", trigger: "blur" },
         // ],

src/views/modules/shequzhili/eventOld/cpts/event-info.vue

@@ -513,12 +513,15 @@ export default {
             this.grid = val.value;
         },
         async handelDispose() {
-            console.log(this.grid,"DSFKDSFJDKS");
+            console.log(this.$refs.ref_detail.info,"sdf;lsdk");
-            if(!this.grid){
+            if(this.$refs.ref_detail.info.gridId){
-                console.log(this.grid,"DSFKDSFJDKS");
+                this.grid=this.$refs.ref_detail.info.gridId
+            }else{
                 this.$message.error("请选择网格");
                 return 
             }
+            // console.log(this.grid,"DSFKDSFJDKS");
+
             this.$refs.ref_processinfo_dispose.getProcessInfo();         
             if (this.$refs.ref_processinfo_dispose.okflag) {
                 this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType;

src/views/modules/shequzhili/eventOld/eventList.vue

@@ -753,8 +753,9 @@ export default {
         },
         async delEvent(eventId) {
             const url = "/governance/icEventOld/delete";
-            let idsArr = [eventId];
+            const formData  = new FormData();
-            const { data, code, msg } = await requestPost(url, idsArr);
+            formData.append('ids', eventId)
+            const { data, code, msg } = await requestPost(url, formData);
             if (code === 0) {
                 this.$message.success("删除成功！");
                 this.getTableData();