安全交底人单选变多选功能模块更新

pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue

@@ -153,7 +153,7 @@
 
         </view>
 
-        <view class="wui-form-list" style="padding-top: 20upx;" v-if="pd.APPLY_STATUS > 1">
+        <view class="wui-form-list" style="padding-top: 20upx;">
           <view class="wui-title" style="margin-left: 20upx;">
             <text class="text-semi">安全防护措施</text>
           </view>
@@ -485,31 +485,41 @@
             </picker>
           </view>
         </view>
-        <view class="wui-form-list" v-if="!forbidEdit">
+        <view class="add_pard_box" v-if="!forbidEdit">
+          <view class="add_pard_btns">
+            <view class="add_pard_b" style="width: 170px;">
+              <button class="cu-btn round bg-blue" @click="addConfessUser">添加安全交底人</button>
+            </view>
+          </view>
+          <view class="add_pard_item" v-for="(item,index) of confessList">
+            <view class="add_pard_del" v-if="index>0" @click="removeConfessUser(index)">
+              <text class="cuIcon-roundclosefill text-red f40"></text>
+            </view>
             <view class="cu-form-group">
               <view class="title">安全交底人单位</view>
               <view class="picker-tree-box">
-              <view class="picker-tree" @tap="showConfessTree">
+                <view class="picker-tree" @tap="showConfessTree(index)">
-                {{ pd.CONFESS_DEPARTMENT_NAME ? pd.CONFESS_DEPARTMENT_NAME : '请选择' }}
+                  {{ item.CONFESS_DEPARTMENT_NAME ? item.CONFESS_DEPARTMENT_NAME : '请选择' }}
                 </view>
               </view>
               <tki-tree ref="tkiTree_confess"
                         :selectParent=true
                         :range="treeNode"
                         rangeKey="name"
-                      @confirm="confesstreeConfirm"
+                        @confirm="confesstreeConfirm($event,index)"
                         @cancel="confesstreeCancel"></tki-tree>
             </view>
             <view class="cu-form-group">
               <view class="title">安全交底人</view>
-            <picker @change="PickerConfess" :value="confessindex" :range="confessUserList" range-key="NAME"
+              <picker @change="PickerConfess($event,index)" :value="item.confessindex" :range="item.confessUserList" range-key="NAME"
-                    :disabled="confessUserList.length == 0" @click="isBlankList('confess')">
+                      :disabled="item.confessUserList.length === 0">
                 <view class="picker">
-                {{ pd.CONFESS_USER_NAME ? pd.CONFESS_USER_NAME : '请选择' }}
+                  {{ item.CONFESS_USER_NAME ? item.CONFESS_USER_NAME : '请选择' }}
                 </view>
               </picker>
             </view>
           </view>
+        </view>
         <view class="wui-form-list" v-if="!forbidEdit">
           <view class="cu-form-group">
             <view class="title">接受交底人单位</view>
@@ -771,12 +781,21 @@ export default {
         {name: 'MONITOR_USER_ID', message: '请选择验票班长'},
         {name: 'ACCEPT_USER_ID', message: '请选择验收部门负责人'},
         {name: 'GUARDIAN_USER_ID', message: '请选择监护人'},
-        {name: 'CONFESS_USER_ID', message: '请选择安全交底人'},
         {name: 'ACCEPT_CONFESS_USER_ID', message: '请选择接受交底人'},
       ],
       todayDate: '',
       otherAssignments: false,
       otherIdentification: false,
+      confessList:[
+          {
+            CONFESS_DEPARTMENT_NAME:'',
+            CONFESS_DEPARTMENT_ID:'',
+            CONFESS_USER_NAME:'',
+            CONFESS_USER_ID:'',
+            confessUserList:[],
+            confessindex: -1
+          }
+      ],
 
     }
   },
@@ -800,6 +819,7 @@ export default {
     // 初始化现场作业负责人
     this.getDept();
     this.getLimitSpace();
+    this.getSafetyCheck();
     loginSession();
 
   },
@@ -871,7 +891,10 @@ export default {
                   "MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5]
                 })
             _this.pd.OTHER_PROTECTIVE_MEASURES = ''
+            // created by liu jun description: 在查看详情时如果有安全防护措施信息则用接口返回的数据，如果没有则用默认的数据
+            if (res.data.measuresList && res.data.measuresList.length > 0) {
               _this.measuresList = res.data.measuresList
+            }
             _this.files = res.data.imgList;
             _this.files1 = res.data.imgList1;
             let dongHuoCaoZuoRenPic = res.data.imgList2
@@ -881,7 +904,6 @@ export default {
                 _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
               }
             }
-            console.log(this.pd.dongHuoCaoZuoRenPic)
             if (_this.pd.APPLY_STATUS < 1) {
               _this.forbidEdit = false;
             }
@@ -895,6 +917,13 @@ export default {
             this.getUserList(this.pd.MONITOR_DEPARTMENT_ID, 'monitorUserList');
             this.getUserList(this.pd.ACCEPT_DEPARTMENT_ID, 'acceptUserList');
             this.getWorkUserList();
+            // created by liu jun description: 拼装安全交底人数据
+            if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
+              _this.confessList = res.data.pd.confessList
+              for (let i = 0; i < _this.confessList.length; i++) {
+                this.getUserListForJiaoDiRen(_this.confessList[i].CONFESS_DEPARTMENT_ID, i);
+              }
+            }
 
 
           } else if ("exception" == data.result) {
@@ -990,6 +1019,21 @@ export default {
         if (!required) {
           return
         }
+        console.log(this.confessList)
+        for (let i = 0; i < this.confessList.length; i++) {
+          if (!this.confessList[i].CONFESS_USER_ID) {
+            uni.showToast({
+              icon: 'none',
+              title: '请选择安全交底人',
+              duration: 1500
+            });
+            required = false
+          }
+        }
+        // 清空非必要信息
+        for (let i = 0; i < this.confessList.length; i++) {
+          this.confessList[i].confessUserList = []
+        }
       }
       const formData = {}
       Object.keys(this.pd).map(key => {
@@ -1005,6 +1049,7 @@ export default {
       formData.dongHuoCaoZuoRenPic = this.pd.dongHuoCaoZuoRenPic
       formData.CORPINFO_ID = loginUser.CORPINFO_ID
       formData.USER_ID = loginUser.USER_ID
+      formData.confessList = JSON.stringify(this.confessList)
       this.buttonloading = true
       uni.request({
         url: basePath + "/app/hotwork/cfd/" + _this.msg,
@@ -1019,7 +1064,7 @@ export default {
           USER_ID: loginUser.USER_ID,
         },
         success: (res) => {
-          console.log(res)
+          if (res.data.result == 'success') {
             for (let i = 0; i < this.pd.dongHuoCaoZuoRenPic.length; i++) {
               uni.uploadFile({
                 url: basePath + "/app/hotwork/cfd/uploadImg",
@@ -1048,8 +1093,14 @@ export default {
                 }
               })
             }
-
+          }else{
-
+            uni.hideLoading();
+            uni.showToast({
+              title: res.data.message,
+              duration: 1500
+            });
+            this.buttonloading = false
+          }
         },
         fail: (err) => {
           uni.hideLoading();
@@ -1079,6 +1130,24 @@ export default {
         }
       });
     },
+    getSafetyCheck(){
+      var _this = this;
+      uni.request({
+        method: 'POST',
+        dataType: 'json',
+        header: {
+          'Content-type': 'application/x-www-form-urlencoded'
+        },
+        url: basePath + '/app/hotwork/cfd/getSafetyCheckItem?tm=' + new Date().getTime(),
+        data: {
+          CORPINFO_ID: loginUser.CORPINFO_ID,
+          USER_ID: loginUser.USER_ID,
+        },
+        success: function (res) {
+          _this.measuresList = res.data.measuresList;
+        }
+      });
+    },
     levelChange(e) {
       this.levelindex = e.detail.value;
       this.pd.WORK_LEVEL = this.levelList[this.levelindex].name;
@@ -1160,6 +1229,34 @@ export default {
         }
       })
     },
+    getUserListForJiaoDiRen(dept, index) {
+      //发送 post 请求
+      var _this = this
+      uni.request({
+        method: 'POST',
+        dataType: 'json',
+        header: {
+          'Content-type': 'application/x-www-form-urlencoded'
+        },
+        url: basePath + '/app/sys/listUser',
+        data: {
+          DEPARTMENT_ID: dept,
+          tm: new Date().getTime(),
+          CORPINFO_ID: loginUser.CORPINFO_ID,
+          USER_ID: loginUser.USER_ID,
+        },
+        success: function (res) {
+          if ("success" === res.data.result) {
+            _this.confessList[index].confessUserList = res.data.userList;
+          } else {
+            uni.showToast({
+              title: res.data.message,
+              duration: 2000
+            });
+          }
+        }
+      })
+    },
     getWorkUserList() {
       //发送 post 请求
       var _this = this
@@ -1292,14 +1389,14 @@ export default {
       }
     },
     // 确定回调事件
-    confesstreeConfirm(e) {
+    confesstreeConfirm(e ,index) {
       this.isUps = false;
-      this.pd.CONFESS_DEPARTMENT_ID = e[0].id;
+      this.confessList[index].CONFESS_DEPARTMENT_ID = e[0].id;
-      this.pd.CONFESS_DEPARTMENT_NAME = e[0].name;
+      this.confessList[index].CONFESS_DEPARTMENT_NAME = e[0].name;
-      this.pd.CONFESS_USER_ID = ''
+      this.confessList[index].CONFESS_USER_ID = ''
-      this.pd.CONFESS_USER_NAME = ''
+      this.confessList[index].CONFESS_USER_NAME = ''
       this.$forceUpdate();//强制刷新
-      this.getUserList(e[0].id, 'confessUserList');
+      this.getUserListForJiaoDiRen(e[0].id, index);
     },
     // 确定回调事件
     confesstreeAcceptconfirm(e) {
@@ -1329,9 +1426,9 @@ export default {
       this.$refs.tkiTree_guardian._show();
     },
     // 显示树形选择器
-    showConfessTree() {
+    showConfessTree(index) {
       this.isUps = true
-      this.$refs.tkiTree_confess._show();
+      this.$refs.tkiTree_confess[index]._show();
     },
     // 显示树形选择器
     showAcceptconfessTree() {
@@ -1344,10 +1441,10 @@ export default {
       this.pd.GUARDIAN_USER_NAME = this.guardianUserList[this.guardianindex].NAME;
       this.$forceUpdate();//强制刷新
     },
-    PickerConfess(e) {
+    PickerConfess(e,index) {
-      this.confessindex = e.detail.value;
+      this.confessList[index].confessindex = e.detail.value;
-      this.pd.CONFESS_USER_ID = this.confessUserList[this.confessindex].USER_ID;
+      this.confessList[index].CONFESS_USER_ID = this.confessList[index].confessUserList[index].USER_ID;
-      this.pd.CONFESS_USER_NAME = this.confessUserList[this.confessindex].NAME;
+      this.confessList[index].CONFESS_USER_NAME = this.confessList[index].confessUserList[index].NAME;
       this.$forceUpdate();//强制刷新
     },
     PickerAcceptconfess(e) {
@@ -1625,7 +1722,7 @@ export default {
     goToEdit() {
       this.forbidEdit = false;
     },
-    //2024-01-25 created by liu jun
+    //2024-01-25 created by liu jun description: 上传动火人图片
     ChooseImage() {
       var _this = this;
       uni.chooseImage({
@@ -1660,7 +1757,23 @@ export default {
           }
         }
       })
-    }
+    },
+    // 2024-01-31 created by liu jun description: 安全交底人多选
+    addConfessUser(){
+      var _this = this;
+      let o =  {
+        CONFESS_DEPARTMENT_NAME:'',
+        CONFESS_DEPARTMENT_ID:'',
+        CONFESS_USER_NAME:'',
+        CONFESS_USER_ID:'',
+        confessUserList:[],
+        confessindex: -1
+      };
+      _this.confessList.push(o);
+    },
+    removeConfessUser(index){
+      this.confessList.splice(index,1);
+    },
   }
 }
 </script>