fix: BUG修改

src/assets/js/api/insect.js

@@ -17,5 +17,7 @@ export const getCheckPointApi = data => post('/xmgl/checkingPointInfo/selectPage
 export const editCheckPointApi = data => post('/xmgl/checkingPointInfo/edit', data); // 编辑巡检点记录列表
 export const deleteCheckPointApi = data => post('/xmgl/checkingPointInfo/delete', data); // 删除巡检点记录列表
 
+// 区域
+export const pointAreaApi = data => post('/xmgl/qualityRegion/notTreeList', data); // 删除巡检点记录列表
 
 

src/assets/js/api/progressManagement.js

@@ -69,5 +69,11 @@ export const getProgressContentPageApi = data => get('xmgl/xzTaskProgressContent
 export const editProgressContentApi = data => post('xmgl/xzTaskProgressContent/edit', data);
 export const deleteProgressContentApi = data => post('xmgl/xzTaskProgressContent/delete', data);
 
+// 里程碑部分
+export const getXzMilestonePageApi = data => get('xmgl/xzMilestone/page', data);
+export const addXzMilestoneApi = data => post('xmgl/xzMilestone/add', data);
+export const editXzMilestoneApi = data => post('xmgl/xzMilestone/edit', data);
+export const deleteXzMilestoneApi = data => post('xmgl/xzMilestone/delete', data);
+export const xzMilestoneDataApi = data => post('xmgl/xzTaskProgress/statsByEnterprise', data);
 
 

src/router/index.js

@@ -2527,6 +2527,14 @@ const routes2 = [
             "@/views/projectFront/progressManagementAg/divisionSubManage.vue",
           ], resolve),
       },
+      {
+        path: "/project/progressManagementAg/lcbManage",
+        name: "进度管理_里程碑管理",
+        component: (resolve) =>
+          require([
+            "@/views/projectFront/progressManagementAg/lcbManage.vue",
+          ], resolve),
+      },
       {
         path: "/project/progressManagementAg/progressWarning",
         name: "进度管理_进度预警2",

src/views/infoCenter/allInfo/componentsModule/dataListData.vue

@@ -194,7 +194,7 @@ export default {
         // 质量
         path = "/project/quality/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",
@@ -205,7 +205,7 @@ export default {
         // 安全
         path = "/project/safeSame/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",

src/views/infoCenter/hadRead/componentsModule/dataListData.vue

@@ -182,7 +182,7 @@ export default {
         // 质量
         path = "/project/quality/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",
@@ -193,7 +193,7 @@ export default {
         // 安全
         path = "/project/safeSame/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",

src/views/infoCenter/notRead/componentsModule/dataListData.vue

@@ -183,7 +183,7 @@ export default {
         // 质量
         path = "/project/quality/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",
@@ -194,7 +194,7 @@ export default {
         // 安全
         path = "/project/safeSame/inspectionLedger";
         const res = await getNoticeStatusApi({ id: payLoadParams.data.id });
-        if (res.result && res.result.status == 6) {
+        if (!res.result && res.result.status == 6) {
           this.$message({
             type: "error",
             message: "检查单已撤回",

src/views/projectFront/inspecPoint/inspection.vue

@@ -169,7 +169,62 @@
               :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
-          <el-form-item label="巡检人员：" prop="inspectUserIds">
+          <el-form-item label="所属区域：" prop="qualityRegionId">
+            <el-select
+              :disabled="cardDialogTitle == '详情'"
+              collapse-tags
+              filterable
+              v-model="cardForm.qualityRegionId"
+              :placeholder="isAdding ? '请选择' : ''"
+              @change="updateArea"
+            >
+              <el-option
+                v-for="item in pointAreaList"
+                :key="item.id"
+                :label="item.regionName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="责任企业：" prop="enterpriseId">
+            <el-select
+              :disabled="cardDialogTitle == '详情'"
+              collapse-tags
+              filterable
+              v-model="cardForm.enterpriseId"
+              multiple
+              :placeholder="isAdding ? '请选择' : ''"
+              @change="changeDutyId"
+            >
+              <el-option
+                v-for="item in enterpriseList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+           <el-form-item label="责任人：" prop="inspectUserIds">
+            <el-select
+              :disabled="cardDialogTitle == '详情'"
+              collapse-tags
+              filterable
+              v-model="cardForm.inspectUserIds"
+              multiple
+              :placeholder="isAdding ? '请选择' : ''"
+            >
+              <el-option
+                v-for="item in chargerList"
+                :key="item.userId + 'inspectUserIds'"
+                :label="item.realName"
+                :value="item.userId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="巡检人员：" prop="inspectUserIds">
             <el-select
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
@@ -186,7 +241,7 @@
               >
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="巡检记录通知人员：" prop="noticeUserIds">
             <el-select
               :disabled="cardDialogTitle == '详情'"
@@ -328,6 +383,7 @@ import {
   addPointApi,
   deletePointApi,
   editPointApi,
+  pointAreaApi
 } from "@/assets/js/api/insect.js";
 import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
 import dynamicForms from "./components/dynamicForms/index.vue"
@@ -339,6 +395,8 @@ export default {
   components: { dynamicForms },
   data() {
     return {
+      chargerList: [],
+      enterpriseList: [],
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 1 * 24 * 3600 * 1000
@@ -355,6 +413,8 @@ export default {
       cardForm: {
         checkingPointName: "",
         position: "",
+        qualityRegionId: "", // 区域ID
+        enterpriseId: "", // 责任企业
         inspectUserIds: "", //检查人
         noticeUserIds: "", //通知人
         startTime: "",
@@ -376,6 +436,12 @@ export default {
         position: [
           { required: true, message: "请输入巡检位置", trigger: "blur" },
         ],
+        qualityRegionId: [
+          { required: true, message: "请选择", trigger: "blur" },
+        ],
+        enterpriseId: [
+          { required: true, message: "请选择", trigger: "blur" },
+        ],
         inspectUserIds: [
           { required: true, message: "请输入检查人员", trigger: "blur" },
         ],
@@ -402,13 +468,55 @@ export default {
       locationList: [],
       formData: [], // 存储动态表单数据
       isAdding: true,
+      pointAreaList: []
     };
   },
   mounted() {
     this.projectSn = this.$store.state.projectSn;
     this.getPointList();
+    this.getPointAreaFn();
   },
   methods: {
+     //切换 整改人
+     changeDutyId(value) {
+      console.log(this.cardForm,777888)
+      if (this.cardForm.enterpriseId.length > 0) {
+        let shouldHavePersonIdList = this.chargerList.map((item) => {
+          if (this.cardForm.enterpriseId.includes(item.enterpriseId)) {
+            return item.userId;
+          }
+        });
+        if(this.cardForm.inspectUserIds){
+          const newArr = this.cardForm.inspectUserIds.filter((item) =>
+            shouldHavePersonIdList.includes(item)
+          );
+          this.cardForm.inspectUserIds = newArr;
+        }
+      } else {
+        this.cardForm.inspectUserIds = "";
+      }
+    },
+    updateArea(){
+      let findItem = this.pointAreaList.find(item => {
+        return item.id == this.cardForm.qualityRegionId
+      })
+      this.cardForm.enterpriseId = "";
+      this.cardForm.inspectUserIds = "";
+      if(findItem){
+        this.chargerList = findItem.systemUsers;
+        this.enterpriseList = findItem.enterpriseInfos;
+      }
+    },
+    // 获取区域列表
+    getPointAreaFn(){
+      let requestData = {
+        projectSn: this.projectSn
+      }
+      pointAreaApi(requestData).then(res => {
+        console.log(res)
+        this.pointAreaList = res.result;
+      })
+    },
     //查看详情
     deilBtn(obj) {
       this.isAdding = false
@@ -431,6 +539,10 @@ export default {
         this.cardForm.inspectUserIds =
           this.cardForm.inspectUserIds.split(',')
       }
+      if (this.cardForm.enterpriseId) {
+        this.cardForm.enterpriseId =
+          this.cardForm.enterpriseId.split(',')
+      }
       if (this.cardForm.noticeUserIds) {
         this.cardForm.noticeUserIds =
           this.cardForm.noticeUserIds.split(',')
@@ -681,6 +793,10 @@ export default {
         this.cardForm.inspectUserIds =
           this.cardForm.inspectUserIds.split(',')
       }
+      if (this.cardForm.enterpriseId) {
+        this.cardForm.enterpriseId =
+          this.cardForm.enterpriseId.split(',')
+      }
       if (this.cardForm.noticeUserIds) {
         this.cardForm.noticeUserIds =
           this.cardForm.noticeUserIds.split(',')
@@ -786,6 +902,7 @@ export default {
           data.createUserId = this.$store.state.userInfo.userId;
           data.createUserName = this.$store.state.userInfo.account;
           data.inspectUserIds = data.inspectUserIds.toString(',');
+          data.enterpriseId = data.enterpriseId.toString(',');
           data.noticeUserIds = data.noticeUserIds.toString(',');
           data.template = JSON.stringify(formTemplate);
           if (this.cardDialogTitle == '新建巡检点') {

src/views/projectFront/progressManagementAg/ganttChart.vue

@@ -98,10 +98,10 @@
         <span>项目剩余天数：{{progressData.projectSurplusDayNum || 0}}天</span>
         </div>
       <div class="update-operate">
-        <el-button v-permission="{key: 'gtt_update0verallProjectSchedule', menuPath: '/project/progressManagementAg/projectganttChart'}"  type="primary" size="medium" @click="updateProgressFn(1)" :disabled="![5,10].includes($store.state.userInfo.accountType)"
+        <el-button v-permission="{key: 'gtt_update0verallProjectSchedule', menuPath: '/project/progressManagementAg/ganttChart'}"  type="primary" size="medium" @click="updateProgressFn(1)" :disabled="![5,10].includes($store.state.userInfo.accountType)"
           >更新项目总进度</el-button
         >
-        <el-button v-permission="{key: 'get_updateContractor Progress', menuPath: '/project/progressManagementAg/projectganttChart'}" type="primary" size="medium" @click="updateProgressFn(2)"
+        <el-button v-permission="{key: 'get_updateContractor Progress', menuPath: '/project/progressManagementAg/ganttChart'}" type="primary" size="medium" @click="updateProgressFn(2)"
           >更新承包商进度</el-button
         >
       </div>