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

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

@@ -71,12 +71,12 @@
                         v-model="formData1.remark"></el-input>
             </el-form-item>
 
-            <el-form-item v-if="false"
+            <el-form-item label="通知渠道"
-                          label="通知渠道"
                           prop="channel"
                           label-width="150px"
                           style="display: block">
               <el-checkbox v-model="formData1.isSelChannel"
+                           @change="handleChannelChange2"
                            key="0"
                            label="0">小程序通知</el-checkbox>
               <!-- <el-checkbox-group v-model="formData1.channel">
@@ -88,7 +88,7 @@
               </el-checkbox-group> -->
             </el-form-item>
 
-            <el-form-item v-if="false"
+            <el-form-item v-if="formData1.isSelChannel"
                           label="通知内容"
                           prop="content"
                           label-width="150px"
@@ -269,12 +269,12 @@
                           v-model="formData2.remark"></el-input>
               </el-form-item>
 
-              <el-form-item v-if="false"
+              <el-form-item label="通知渠道"
-                            label="通知渠道"
                             prop="channel"
                             label-width="100px"
                             style="display: block">
                 <el-checkbox v-model="formData2.isSelChannel"
+                             @change="handleChannelChange2"
                              key="0"
                              label="0">小程序通知</el-checkbox>
                 <!-- <el-checkbox-group v-model="formData2.channel">
@@ -286,7 +286,7 @@
                 </el-checkbox-group> -->
               </el-form-item>
 
-              <el-form-item v-if="false"
+              <el-form-item v-if="formData2.isSelChannel"
                             label="通知内容"
                             prop="content"
                             label-width="100px"
@@ -386,6 +386,12 @@ export default {
   },
 
   methods: {
+    handleChannelChange1 (val) {
+      this.formData1.content = ''
+    },
+    handleChannelChange2 (val) {
+      this.formData2.content = ''
+    },
 
     async initForm () {
 

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

@@ -70,12 +70,12 @@
                     v-model="formData.remark"></el-input>
         </el-form-item>
         <div v-if=" formType!=='detail'">
-          <el-form-item v-if="false"
+          <el-form-item label="通知渠道"
-                        label="通知渠道"
                         prop="channel"
                         label-width="150px"
                         style="display: block">
             <el-checkbox v-model="formData.isSelChannel"
+                         @change="handleChannelChange"
                          key="0"
                          label="0">小程序通知</el-checkbox>
             <!-- <el-checkbox-group v-model="formData.channel">
@@ -87,7 +87,7 @@
             </el-checkbox-group> -->
           </el-form-item>
 
-          <el-form-item v-if="false"
+          <el-form-item v-if="formData.isSelChannel"
                         label="通知内容"
                         prop="content"
                         label-width="150px"
@@ -161,6 +161,9 @@ export default {
   },
 
   methods: {
+    handleChannelChange (val) {
+      this.formData.content = ''
+    },
 
     async initForm (formType, row) {
       this.formType = formType

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

@@ -99,8 +99,7 @@
                    size="small"
                    @click="handleExport">导出</el-button>
 
-        <el-button v-if="false"
+        <el-button style="margin-left:15px"
-                   style="margin-left:15px"
                    class="diy-button--more"
                    size="small"
                    @click="handleSendNotice">发送通知</el-button>
@@ -188,7 +187,7 @@
                         placement="bottom"
                         style="margin-left:10px"
                         width="20"
-                        trigger="click">
+                        trigger="hover">
               <div class="table-more-btn">
                 <el-button type="text"
                            class="div-table-button--detail--noline"
@@ -230,7 +229,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :destroy-on-close="true"
-               title="新增"
+               title="新增核酸检测关注名单"
                width="1050px"
                top="5vh"
                class="dialog-h"
@@ -243,7 +242,7 @@
     <el-dialog :visible.sync="editFormShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               title="修改"
+               title="修改核酸检测关注名单"
                width="1050px"
                top="5vh"
                class="dialog-h"
@@ -610,7 +609,7 @@ export default {
 
     //导出表格
     async handleExport () {
-      let title = '疫苗接种关注名单'
+      let title = '核酸检测关注名单'
 
       const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-export"
 
@@ -655,10 +654,12 @@ export default {
     },
 
     handleExportModule () {
-      let title = '疫苗接种关注名单模板'
+      let title = '核酸检测关注名单模板'
 
-      const url = "/gov/org/house/exporttemplate"
+      const url = "/epmetuser/icEpidemicSpecialAttention/export-template"
-      let params = {}
+      let params = {
+        attentionType: '2'
+      }
 
       app.ajax.exportFilePost(
         url,
@@ -714,7 +715,7 @@ export default {
 
       let fileFormData = new FormData();
       fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('attentionType', '1');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('attentionType', '2');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 
       window.app.ajax.post2(url, fileFormData,
         (data, rspMsg) => {

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

@@ -8,14 +8,14 @@
                :rules="dataRule"
                class="form">
 
-        <el-form-item
+        <el-form-item label="通知渠道"
-                      label="通知渠道"
+                      prop="isSelChannel"
-                      prop="channel"
                       label-width="150px"
                       style="display: block">
-          <el-checkbox v-model="formData.isSelChannel"
+          <span>小程序通知</span>
+          <!-- <el-checkbox v-model="formData.isSelChannel"
                        key="0"
-                       label="0">小程序通知</el-checkbox>
+                       label="0">小程序通知</el-checkbox> -->
           <!-- <el-checkbox-group v-model="formData.channel">
             <el-checkbox key="1"
                          label="1">小程序通知</el-checkbox>
@@ -25,8 +25,7 @@
           </el-checkbox-group> -->
         </el-form-item>
 
-        <el-form-item
+        <el-form-item label="通知内容"
-                      label="通知内容"
                       prop="content"
                       label-width="150px"
                       style="display: block">
@@ -104,23 +103,19 @@ export default {
 
 
     async handleComfirm () {
+      this.formData.channel = ['0']
 
 
-      if (this.formData.isSelChannel) {
+      if (!this.formData.content) {
-        if (!this.formData.content) {
+        this.$message({
-          this.$message({
+          type: 'warning',
-            type: 'warning',
+          message: '请填写通知内容'
-            message: '请填写通知内容'
+        })
-          })
+        return false;
-          return false;
-        } else {
-          this.formData.channel = ['0']
-        }
-
-      } else {
-        this.formData.channel = []
       }
 
+
+
       console.log(this.formData)
       // return false
 

src/views/modules/base/epidemic/natInfo/natForm.vue

@@ -161,25 +161,25 @@
 
         </el-form-item>
 
-        <el-form-item v-if="false"
+        <el-form-item label="通知渠道"
-                      label="通知渠道"
+                      prop="isSelChannel"
-                      prop="channel"
                       label-width="150px"
                       style="display: block">
 
           <el-checkbox v-model="formData.isSelChannel"
+                       @change="handleChannelChange"
                        key="0"
                        label="0">小程序通知</el-checkbox>
-          <el-checkbox-group v-model="formData.channel">
+          <!-- <el-checkbox-group v-model="formData.channel">
             <el-checkbox key="0"
                          label="0">小程序通知</el-checkbox>
             <el-checkbox key="1"
                          label="1">短信通知</el-checkbox>
 
-          </el-checkbox-group>
+          </el-checkbox-group> -->
         </el-form-item>
 
-        <el-form-item v-if="false"
+        <el-form-item v-if="formData.isSelChannel"
                       label="通知内容"
                       prop="content"
                       label-width="150px"
@@ -230,9 +230,6 @@ let loading // 加载动画
 export default {
   data () {
     return {
-
-
-
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
       hideUploadEdit: false, // 隐藏'上传按钮'
       limitNum: 1,
@@ -287,6 +284,9 @@ export default {
   },
 
   methods: {
+    handleChannelChange (val) {
+      this.formData.content = ''
+    },
 
     async initForm (type, icNatId) {
       this.startLoading()
@@ -378,8 +378,17 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.formData = data
-        this.formData.channel = []
+        if (data.channel && data.channel.length > 0) {
-        this.formData.content = ''
+          this.$set(this.formData, 'isSelChannel', true)
+          // this.formData.isSelChannel = true
+        } else {
+          this.$set(this.formData, 'isSelChannel', false)
+          // this.formData.isSelChannel = false
+          this.formData.channel = []
+          this.formData.content = ''
+        }
+        console.log(this.formData.isSelChannel)
+
         this.formData.icNatId = this.icNatId
         if (this.formData.userId) {
           this.isFromResi = true
@@ -461,6 +470,7 @@ export default {
 
       } else {
         this.formData.channel = []
+        this.formData.content = ''
       }
 
       this.btnDisable = true
@@ -627,6 +637,9 @@ export default {
           { required: true, message: '检测结果不能为空', trigger: 'blur' },
         ],
 
+        isSelChannel: [
+          { required: false },
+        ],
         channel: [
           { required: false },
         ],

src/views/modules/base/epidemic/natInfo/natList.vue

@@ -34,6 +34,7 @@
           </el-form-item>
 
           <el-form-item label="核酸检测时间"
+                        label-width="110px"
                         prop="startTime">
             <el-date-picker v-model="timeRange"
                             size="small"

src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue

@@ -60,12 +60,12 @@
                         v-model="formData1.remark"></el-input>
             </el-form-item>
 
-            <el-form-item v-if="false"
+            <el-form-item label="通知渠道"
-                          label="通知渠道"
                           prop="channel"
                           label-width="150px"
                           style="display: block">
               <el-checkbox v-model="formData1.isSelChannel"
+                           @change="handleChannelChange1"
                            key="0"
                            label="0">小程序通知</el-checkbox>
               <!-- <el-checkbox-group v-model="formData1.channel">
@@ -77,7 +77,7 @@
               </el-checkbox-group> -->
             </el-form-item>
 
-            <el-form-item v-if="false"
+            <el-form-item v-if="formData1.isSelChannel"
                           label="通知内容"
                           prop="content"
                           label-width="150px"
@@ -232,12 +232,12 @@
                           v-model="formData2.remark"></el-input>
               </el-form-item>
 
-              <el-form-item v-if="false"
+              <el-form-item label="通知渠道"
-                            label="通知渠道"
                             prop="channel"
                             label-width="100px"
                             style="display: block">
                 <el-checkbox v-model="formData2.isSelChannel"
+                             @change="handleChannelChange2"
                              key="0"
                              label="0">小程序通知</el-checkbox>
                 <!-- <el-checkbox-group v-model="formData2.channel">
@@ -249,7 +249,7 @@
                 </el-checkbox-group> -->
               </el-form-item>
 
-              <el-form-item v-if="false"
+              <el-form-item v-if="formData2.isSelChannel"
                             label="通知内容"
                             prop="content"
                             label-width="100px"
@@ -344,7 +344,12 @@ export default {
   },
 
   methods: {
-
+    handleChannelChange1 (val) {
+      this.formData1.content = ''
+    },
+    handleChannelChange2 (val) {
+      this.formData2.content = ''
+    },
     async initForm () {
 
       this.$refs['ref_form1'].resetFields();

src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue

@@ -59,12 +59,12 @@
                     v-model="formData.remark"></el-input>
         </el-form-item>
         <div v-if=" formType!=='detail'">
-          <el-form-item v-if="false"
+          <el-form-item label="通知渠道"
-                        label="通知渠道"
                         prop="channel"
                         label-width="150px"
                         style="display: block">
             <el-checkbox v-model="formData.isSelChannel"
+                         @change="handleChannelChange"
                          key="0"
                          label="0">小程序通知</el-checkbox>
             <!-- <el-checkbox-group v-model="formData.channel">
@@ -76,7 +76,8 @@
             </el-checkbox-group> -->
           </el-form-item>
 
-          <el-form-item label="通知内容"
+          <el-form-item v-if="formData.isSelChannel"
+                        label="通知内容"
                         prop="content"
                         label-width="150px"
                         style="display: block">
@@ -144,6 +145,9 @@ export default {
   },
 
   methods: {
+    handleChannelChange (val) {
+      this.formData.content = ''
+    },
 
     async initForm (formType, row) {
       this.formType = formType

src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

@@ -94,8 +94,7 @@
                    size="small"
                    @click="handleExport">导出</el-button>
 
-        <el-button v-if="false"
+        <el-button style="margin-left:15px"
-                   style="margin-left:15px"
                    class="diy-button--more"
                    size="small"
                    @click="handleSendNotice">发送通知</el-button>
@@ -183,7 +182,7 @@
                         placement="bottom"
                         style="margin-left:10px"
                         width="20"
-                        trigger="click">
+                        trigger="hover">
               <div class="table-more-btn">
                 <el-button type="text"
                            class="div-table-button--detail--noline"
@@ -225,7 +224,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :destroy-on-close="true"
-               title="新增"
+               title="新增疫苗接种关注名单"
                width="1050px"
                top="5vh"
                class="dialog-h"
@@ -238,7 +237,7 @@
     <el-dialog :visible.sync="editFormShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               title="修改"
+               title="修改疫苗接种关注名单"
                width="1050px"
                top="5vh"
                class="dialog-h"

src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue

@@ -8,14 +8,14 @@
                :rules="dataRule"
                class="form">
 
-        <el-form-item v-if="false"
+        <el-form-item label="通知渠道"
-                      label="通知渠道"
+                      prop="isSelChannel"
-                      prop="channel"
                       label-width="150px"
                       style="display: block">
-          <el-checkbox v-model="formData.isSelChannel"
+          <span>小程序通知</span>
+          <!-- <el-checkbox v-model="formData.isSelChannel"
                        key="0"
-                       label="0">小程序通知</el-checkbox>
+                       label="0">小程序通知</el-checkbox> -->
           <!-- <el-checkbox-group v-model="formData.channel">
             <el-checkbox key="1"
                          label="1">小程序通知</el-checkbox>
@@ -25,8 +25,7 @@
           </el-checkbox-group> -->
         </el-form-item>
 
-        <el-form-item v-if="false"
+        <el-form-item label="通知内容"
-                      label="通知内容"
                       prop="content"
                       label-width="150px"
                       style="display: block">
@@ -103,22 +102,17 @@ export default {
 
 
     async handleComfirm () {
+      this.formData.channel = ['0']
 
-      if (this.formData.isSelChannel) {
+      if (!this.formData.content) {
-        if (!this.formData.content) {
+        this.$message({
-          this.$message({
+          type: 'warning',
-            type: 'warning',
+          message: '请填写通知内容'
-            message: '请填写通知内容'
+        })
-          })
+        return false;
-          return false;
-        } else {
-          this.formData.channel = ['0']
-        }
 
-      } else {
-        this.formData.channel = []
-      }
 
+      }
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false

src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue

@@ -210,6 +210,7 @@ export default {
     },
 
     handleCancle () {
+      this.$refs.ref_form.resetFields()
       this.dialogVisible = false
 
     },