Merge branch 'dev-fangyi' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-fangyi

src/views/modules/base/epidemic/natFocus/natFocusList.vue

@@ -505,7 +505,7 @@ export default {
       }
       this.sendNoticeFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_sendnotice.initForm(this.selectionAll)
+        this.$refs.ref_sendnotice.initForm(this.selectionAll, '2')
       })
 
     },
@@ -513,7 +513,7 @@ export default {
     handleNoticeList (row) {
       this.noticeListFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_noticelist.initTable(row.idCard)
+        this.$refs.ref_noticelist.initTable(row.idCard, '2')
       })
 
     },

src/views/modules/base/epidemic/natFocus/nfNoticeList.vue

@@ -70,7 +70,7 @@ export default {
       tableData: [],
       pageSize: 20,
       pageNo: 1,
-
+      origin: ''
     }
   },
   components: {},
@@ -80,8 +80,9 @@ export default {
 
   methods: {
 
-    async initTable (idCard) {
+    async initTable (idCard, origin) {
       this.idCard = idCard
+      this.origin = origin
       await this.loadTable()
 
     },
@@ -95,7 +96,7 @@ export default {
         idCard: this.idCard,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-        origin: '2'
+        origin: this.origin
       }
 
       const { data, code, msg } = await requestPost(url, params)

src/views/modules/base/epidemic/natFocus/nfSendNotice.vue

@@ -8,7 +8,7 @@
                :rules="dataRule"
                class="form">
 
-        <el-form-item v-if="false"
+        <el-form-item
                       label="通知渠道"
                       prop="channel"
                       label-width="150px"
@@ -25,7 +25,7 @@
           </el-checkbox-group> -->
         </el-form-item>
 
-        <el-form-item v-if="false"
+        <el-form-item
                       label="通知内容"
                       prop="content"
                       label-width="150px"
@@ -75,7 +75,7 @@ export default {
       btnDisable: false,
 
       formData: {
-        origin: '1',
+        origin: '',
         isSelChannel: false,
         channel: [],
         content: '',
@@ -94,10 +94,11 @@ export default {
 
   methods: {
 
-    async initForm (selectionAll) {
+    async initForm (selectionAll, origin) {
 
       this.$refs['ref_form1'].resetFields();
       this.formData.userList = selectionAll
+      this.formData.origin = origin
 
     },
 
@@ -121,7 +122,7 @@ export default {
       }
 
       console.log(this.formData)
-      return false
+      // return false
 
       this.btnDisable = true
       setTimeout(() => {
@@ -130,8 +131,7 @@ export default {
 
       let url = ''
 
-      url = '/epmetuser/icNotice/batchnotice'
+      url = '/epmetuser/icNotice/sendNotice'
-      // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/batchnotice"
 
 
       const { data, code, msg } = await requestPost(url, this.formData)

src/views/modules/base/epidemic/natFocus/nfVisiteList.vue

@@ -55,7 +55,7 @@
                title="新增"
                append-to-body
                @closed="handleCancle">
-      <div class="epidemic-form">
+      <div v-if="dialogVisible" class="epidemic-form">
         <el-form ref="ref_form"
                  :inline="true"
                  :model="formData"
@@ -133,7 +133,7 @@ export default {
         idCard: '',
         name: '',
         mobile: '',
-        origin: '2'
+        origin: ''
       },
 
       dialogVisible: false,
@@ -169,7 +169,7 @@ export default {
         idCard: this.formData.idCard,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-        origin: '2'
+        origin: this.formData.origin
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -208,6 +208,8 @@ export default {
     },
 
     handleCancle () {
+      this.formData.visitTime = ''
+      this.formData.content = ''
       this.dialogVisible = false
 
     },

src/views/modules/base/epidemic/travel.vue

@@ -23,7 +23,7 @@
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入姓名">
+                      placeholder="请输入手机号">
             </el-input>
 
           </el-form-item>
@@ -44,13 +44,14 @@
           
           <el-form-item label="来自地区"
                         prop="sourceAddressCode">
-            <el-input v-model="formData.sourceAddressCode"
+            <!-- <el-input v-model="formData.sourceAddressCode"
                       size="small"
                       class="list_item_width_1"
                       clearable
                       placeholder="请输入姓名">
-            </el-input>
+            </el-input> -->
-
+            <el-cascader ref="nowArea" size="small" class="list_item_width_1" :props="areaProps" 
+              v-model="searchAreacode" clearable @change="handleAreaChange"></el-cascader>
           </el-form-item>
 
           <el-form-item label="来到本地时间"
@@ -112,6 +113,10 @@
                    class="diy-button--more"
                    size="small"
                    @click="handleSendNotice">发送通知</el-button>
+        <el-button style="margin-left:15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleAttention">加入关注</el-button>
         <el-button style="margin-left:15px"
                    class="diy-button--more"
                    size="small"
@@ -127,18 +132,18 @@
                 style="width: 100%"
                  @selection-change="handleSelectionChange">
         <el-table-column type="selection"
-                         width="55"></el-table-column>
+                         width="55" fixed="left"></el-table-column>
         <el-table-column label="序号"
                          header-align="center"
                          align="center"
                          type="index"
-                         width="50"></el-table-column>
+                         width="50" fixed="left"></el-table-column>
 
         <el-table-column prop="name"
                          header-align="center"
                          align="center"
                          label="姓名"
-                         width="100">
+                         width="100" fixed="left">
         </el-table-column>
         <el-table-column prop="mobile"
                          header-align="center"
@@ -340,7 +345,7 @@ export default {
       pageNo: 0,
       tableLoading: false,
       sHeight: 0,
-
+      searchAreacode: [],
       agencyId: '',
       selectionAll: [],
       timeRange: [],
@@ -358,6 +363,11 @@ export default {
       //form相关
       formShow: false,
       formTitle: '新增',
+      areaProps: {
+        lazy: true,
+        checkStrictly: true,
+        lazyLoad: this.lzayLoadArea
+      }
 
     }
   },
@@ -383,6 +393,12 @@ export default {
   },
 
   methods: {
+    lzayLoadArea(node, resolve) {
+      this.getArea(node, resolve)
+      // setTimeout(() => {
+        
+      // }, 1000)
+    },
     handleSearch () {
       this.loadTable()
     },
@@ -391,7 +407,31 @@ export default {
       console.log('val----', val)
       this.selectionAll = val
     },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
 
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, // 
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
     async loadTable () {
       this.tableLoading = true
 
@@ -421,7 +461,13 @@ export default {
       }
       this.tableLoading = false
     },
-
+    handleAreaChange(val) {
+      
+      if (val.length > 0) {
+        const len = val.length - 1
+        this.formData.sourceAddressCode = val[len]
+      } else this.formData.sourceAddressCode = ''
+    },
     handleScheduledTimeChange (time) {
       if (time) {
         this.formData.startDate = time[0]
@@ -445,7 +491,7 @@ export default {
     handleNoticeList (row) {
       this.noticeListFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_noticelist.initTable(row.idCard)
+        this.$refs.ref_noticelist.initTable(row.idCard, '0')
       })
 
     },
@@ -465,10 +511,36 @@ export default {
       }
       this.sendNoticeFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_sendnotice.initForm(this.selectionAll)
+        const arr = this.selectionAll.map(item => {
+          return {
+            userId: item.userId,
+            idCard: item.idCard,
+            mobile: item.mobile
+          }
+        })
+        this.$refs.ref_sendnotice.initForm(arr, '0')
       })
 
     },
+    handleAttention(row) {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要加入关注的名单')
+        return false
+      }
+      this.$confirm("确认选择的名单加入关注?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.saveFocus(row)
+        })
+        .catch(err => {
+          console.log('err-----', err)
+
+        });
+    },
+    
     async handleDeletes (row) {
       if (this.selectionAll.length === 0) {
         this.$message.info('请选择要取消关注的名单')
@@ -489,6 +561,37 @@ export default {
 
         });
     },
+    async saveFocus (row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-add"
+      // let idCards = []
+
+      // this.selectionAll.forEach(element => {
+      //   idCards.push(element.idCard)
+      // });
+      let params = {
+        list: this.selectionAll.map(item => {
+          return {
+            name: item.name,
+            mobile: item.mobile,
+            idCard: item.idCard,
+            attentionType: 2
+          }
+        })
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
     async deleteFocus (row) {
       const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
@@ -498,7 +601,7 @@ export default {
         idCards.push(element.idCard)
       });
       let params = {
-        attentionType: 0,
+        attentionType: 2,
         idCards: idCards
       }
 
@@ -592,6 +695,7 @@ export default {
       this.$refs.ref_searchform.resetFields()
       this.formData.startDate = ''
       this.formData.endDate = ''
+      this.searchAreacode = []
       this.timeRange = []
       this.pageSize = 20
       this.pageNo = 1

src/views/modules/base/epidemic/travelForm.vue

@@ -155,7 +155,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="1000"
+                    maxlength="500"
                     show-word-limit
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
@@ -182,7 +182,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="1000"
+                    maxlength="500"
                     show-word-limit
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
@@ -320,19 +320,18 @@ export default {
     },
     async initForm (type, row) {
       console.log('row----', row)
+      this.formType = type
+      this.formData.agencyId = this.agencyId
       if (type != 'add') {
         this.formData = { ...row, channel: [], content: '' }
         this.sourceAllCode = row.sourceAddressPathCode && row.sourceAddressPathCode.split(',')
         
         if (row.userType == 'icresi') this.isFromResi = true
-        else this.nowAllCode = row.presentAddressPathCode.split(',')
+        else this.nowAllCode = row.presentAddressPathCode && row.presentAddressPathCode.split(',')
       }
-      this.formData.agencyId = this.agencyId
-
       // this.$refs['ref_form'].resetFields();
 
-      this.formType = type
+      console.log('formtype', type)
-
 
     },