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

src/assets/scss/modules/management/epidemic.scss

@@ -102,7 +102,14 @@
   }
 }
 .div-mult-table {
+  position: relative;
   padding: 0 20px;
+
+  .div_selcount{
+    position: absolute;
+    bottom:10px;
+    left:30px;
+  }
 }
 
 .div_dialog_table {

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

@@ -201,7 +201,7 @@
               <el-table-column prop="natCount"
                                header-align="center"
                                align="center"
-                               label="疫苗接种次数"
+                               label="核酸检测次数"
                                min-width="100">
               </el-table-column>
 
@@ -216,7 +216,11 @@
                              :total="total">
               </el-pagination>
             </div>
+            <div class="div_selcount">
+              <span> 已选择人数：</span>
+              <span style="color:red"> {{selectionAll.length}}</span>
 
+            </div>
           </div>
           <div class="div-mult-form">
 
@@ -239,11 +243,7 @@
                      :model="formData2"
                      ref="ref_form2"
                      :label-width="'90px'">
-              <el-form-item label="已选择人数"
-                            label-width="100px"
-                            style="display: block">
-                <span> {{selectionAll.length}}</span>
-              </el-form-item>
+
               <el-form-item label="关注原因"
                             prop="reason"
                             label-width="100px"
@@ -696,6 +696,10 @@ export default {
       this.formDataSearch = {
         gridId: '',
         natCount: undefined,
+        startDate: '',
+        endDate: '',
+        attentionType: 2
+
       }
       this.timeRange = []
     },

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

@@ -74,7 +74,7 @@ export default {
       btnDisable: false,
 
       formData: {
-        origin: '',
+        origin: '2',
         isSelChannel: false,
         channel: [],
         content: '',
@@ -93,11 +93,11 @@ export default {
 
   methods: {
 
-    async initForm (selectionAll, origin) {
+    async initForm (selectionAll) {
 
       this.$refs['ref_form1'].resetFields();
       this.formData.userList = selectionAll
-      this.formData.origin = origin
+
 
     },
 
@@ -160,13 +160,11 @@ export default {
 
 
       this.formData = {
-        name: '',
-        idCard: '',
-        phone: '',
-        remark: '',
+        origin: '2',
         isSelChannel: false,
         channel: [],
         content: '',
+        userList: [],
 
       }
     },

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

@@ -160,40 +160,40 @@
           </el-upload>
 
         </el-form-item>
-
-        <el-form-item label="通知渠道"
-                      prop="isSelChannel"
-                      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">
+        <div v-if=" formType!=='detail'">
+          <el-form-item label="通知渠道"
+                        prop="isSelChannel"
+                        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 key="0"
                          label="0">小程序通知</el-checkbox>
             <el-checkbox key="1"
                          label="1">短信通知</el-checkbox>
 
           </el-checkbox-group> -->
-        </el-form-item>
-
-        <el-form-item v-if="formData.isSelChannel"
-                      label="通知内容"
-                      prop="content"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="500"
-                    show-word-limit
-                    :autosize="{ minRows: 5, maxRows: 10 }"
-                    clearable
-                    placeholder="请输入通知内容"
-                    v-model="formData.content"></el-input>
-        </el-form-item>
-
+          </el-form-item>
+
+          <el-form-item v-if="formData.isSelChannel"
+                        label="通知内容"
+                        prop="content"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :autosize="{ minRows: 5, maxRows: 10 }"
+                      clearable
+                      placeholder="请输入通知内容"
+                      v-model="formData.content"></el-input>
+          </el-form-item>
+        </div>
       </el-form>
     </div>
 
@@ -378,15 +378,17 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.formData = data
-        if (data.channel && data.channel.length > 0) {
-          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 = ''
-        }
+        this.formData.channel = []
+        this.formData.content = ''
+        // if (data.channel && data.channel.length > 0) {
+        //   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

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

@@ -84,7 +84,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
@@ -191,6 +191,12 @@
               </el-pagination>
             </div>
 
+            <div class="div_selcount">
+              <span> 已选择人数：</span>
+              <span style="color:red"> {{selectionAll.length}}</span>
+
+            </div>
+
           </div>
           <div class="div-mult-form">
 
@@ -213,11 +219,7 @@
                      :model="formData2"
                      ref="ref_form2"
                      :label-width="'90px'">
-              <el-form-item label="已选择人数"
-                            label-width="100px"
-                            style="display: block">
-                <span> {{selectionAll.length}}</span>
-              </el-form-item>
+
               <el-form-item label="备注"
                             prop="remark"
                             label-width="100px"
@@ -256,7 +258,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

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

@@ -74,7 +74,7 @@ export default {
       btnDisable: false,
 
       formData: {
-        origin: '2',
+        origin: '1',
         isSelChannel: false,
         channel: [],
         content: '',
@@ -120,8 +120,7 @@ export default {
 
       let url = ''
 
-      url = '/epmetuser/icNotice/batchnotice'
-      // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/batchnotice"
+      url = '/epmetuser/icNotice/sendNotice'
 
 
       const { data, code, msg } = await requestPost(url, this.formData)
@@ -155,13 +154,11 @@ export default {
 
 
       this.formData = {
-        name: '',
-        idCard: '',
-        phone: '',
-        remark: '',
+        origin: '1',
         isSelChannel: false,
         channel: [],
         content: '',
+        userList: [],
 
       }
     },