Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-vue

shanXiPlatform/src/views/systemManagement/earlyWarningManagement/addEarlyWarningManagement.vue

@@ -52,7 +52,7 @@
         <el-form-item label="检查人员:"  prop="warnTargetArr">
             <div style="border:1px solid #ccc;padding:15px;width:800px ">
               <el-checkbox :indeterminate="isIndeterminate" :disabled="isDetail" v-model="checkAll" v-if="personList && personList.length>0" @change="handleCheckAllChange">全选</el-checkbox>
-              <el-checkbox-group v-model="formData.warnTargetArr"  :disabled="isDetail" v-if="personList && personList.length>0"  @change="handleCheckedCitiesChange">
+              <el-checkbox-group v-model="warnTargetArr"  :disabled="isDetail" v-if="personList && personList.length>0"  @change="handleCheckedCitiesChange">
                 <el-checkbox v-for="item in personList" :key="item.uId" :label="item.uId">{{item.personnelName}}</el-checkbox>
               </el-checkbox-group>
               <span v-if="!personList || personList.length == 0" style="color:#cccccc">暂无数据</span>
@@ -235,7 +235,8 @@ export default {
       loading:false,
       checkAll: false,
       isIndeterminate: true,
-      personListIds: []
+      personListIds: [],
+      warnTargetArr:[]
     }
   },
   mounted() {
@@ -304,16 +305,23 @@ export default {
     detailInfo() {
       detailFun(this.$route.query.id).then(res => {
         if (res.code == 200) {
+          gerPersonByRole(res.data.warnTargetType).then(response => {
+            this.personList = []
+            this.personList = response.data
+            this.personList.forEach(item => {
+              this.personListIds.push(item.uId)
+            })
+          })
           this.formData = res.data
-          this.warnTargetTypeSelect()
+          // this.warnTargetTypeSelect()
           let warnTargetArr = this.formData.warnTarget.split(',')
           let warnTargetIdArr = []
           warnTargetArr.forEach(item => {
             warnTargetIdArr.push(Number(item.substring(0, item.indexOf("|"))))
           })
-          this.formData.warnTargetArr = JSON.parse(JSON.stringify(warnTargetIdArr))
-          this.checkAll = this.formData.warnTargetArr.length === this.personList.length;
-          this.isIndeterminate = this.formData.warnTargetArr.length > 0 && this.formData.warnTargetArr.length < this.personList.length;
+          this.warnTargetArr = JSON.parse(JSON.stringify(warnTargetIdArr))
+          // this.checkAll = this.warnTargetArr.length === this.personList.length;
+          // this.isIndeterminate = this.warnTargetArr.length > 0 && this.warnTargetArr.length < this.personList.length;
         }
       }).catch((err) => {
         console.log(err)
@@ -330,7 +338,7 @@ export default {
           })
           let warnTargetNames = []
           let warnTargetUserNames = []
-          this.formData.warnTargetArr.forEach(item => {
+          this.warnTargetArr.forEach(item => {
             this.personList.forEach(itemPer => {
               if(item == itemPer.uId){
                   warnTargetNames.push(itemPer.personnelName)
@@ -341,8 +349,8 @@ export default {
           this.formData.warnTargetNames =  warnTargetNames.join(',')
 
           let warnTarget = []
-          for(var i = 0;i< this.formData.warnTargetArr.length;i++){
-            warnTarget.push(`${this.formData.warnTargetArr[i]}|${warnTargetUserNames[i]}`)
+          for(var i = 0;i< this.warnTargetArr.length;i++){
+            warnTarget.push(`${this.warnTargetArr[i]}|${warnTargetUserNames[i]}`)
           }
           this.formData.warnTarget = warnTarget.join(',')
           if (this.$route.query.state == 'add') {
@@ -378,13 +386,16 @@ export default {
         this.personList.forEach(item => {
           this.personListIds.push(item.uId)
         })
+        this.warnTargetArr = []
+        this.checkAll = false
+        this.isIndeterminate = true
       })
     },
     handleCheckAllChange(val) {
       if(val){
-        this.formData.warnTargetArr = this.personListIds
+        this.warnTargetArr = this.personListIds
       }else{
-        this.formData.warnTargetArr = []
+        this.warnTargetArr = []
       }
       this.isIndeterminate = false;
     },