Merge branch 'dev-hesuan1013' into dev

package.json

@@ -45,7 +45,6 @@
     "portfinder": "^1.0.21",
     "qs": "^6.7.0",
     "quill": "^1.3.6",
-    "sass-loader": "^7.1.0",
     "screenfull": "^4.2.1",
     "sortablejs": "^1.12.0",
     "svg-sprite-loader": "^4.1.6",
@@ -70,6 +69,7 @@
     "element-theme-chalk": "^2.13.0",
     "natives": "^1.1.6",
     "ol": "^6.9.0",
+    "sass-loader": "^7.3.1",
     "script-loader": "^0.7.2",
     "tinymce": "^5.8.2",
     "vue-template-compiler": "^2.6.11"

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

@@ -121,7 +121,6 @@
                     v-model="formData.natAddress">
           </el-input>
         </el-form-item>
-
         <el-form-item label="检测结果"
                       prop="natResult"
                       label-width="150px"
@@ -134,6 +133,21 @@
           </el-radio-group>
         </el-form-item>
 
+        <el-form-item label="采样时间"
+                      style="display: block"
+                      prop="sampleTime"
+                      label-width="150px">
+          <el-date-picker class="item_width_2"
+                          v-model="formData.sampleTime"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          type="datetime"
+                          :picker-options="pickerOptions"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
         <el-form-item v-if=" formType!=='detail' || (formType=='detail'&&fileList.length>0)"
                       class="block"
                       label-width="150px"
@@ -141,7 +155,8 @@
                       label="添加图片"
                       prop="attach">
 
-          <el-upload :headers="$getElUploadHeaders()"  :action="uploadUlr"
+          <el-upload :headers="$getElUploadHeaders()"
+                     :action="uploadUlr"
                      list-type="picture-card"
                      :limit="limitNum"
                      :class="{hide:hideUploadEdit}"
@@ -258,6 +273,7 @@ export default {
         natTime: '',
         natAddress: '',
         natResult: '',
+        sampleTime: '',
         isSelChannel: false,
         channel: [],
         content: '',
@@ -433,13 +449,7 @@ export default {
     },
 
     async addNat () {
-      // if (this.imgLoading) {
-      //   this.$message({
-      //     type: 'warning',
-      //     message: '正在上传图片，请稍候重试'
-      //   })
-      //   return false;
-      // }
+
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
       if (regPhone.test(this.formData.mobile) === false) {
         this.btnDisable = false
@@ -458,6 +468,32 @@ export default {
         })
         return false;
       }
+      // debugger
+      let tempResult = false
+      if (this.formData.sampleTime) {
+        tempResult = true
+      } else {
+        if (!this.formData.natTime || !this.formData.natResult) {
+          this.$message({
+            type: 'warning',
+            message: '采样结果为空时，核酸检测时间和检测结果不能为空'
+          })
+          return false;
+        } if (!this.formData.natTime && !this.formData.natResult) {
+          this.$message({
+            type: 'warning',
+            message: '采样结果和核酸检测时间、结果不能同时为空'
+          })
+          return false;
+        }
+      }
+      // if (!tempResult) {
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '核酸检测时间、结果和采样时间不能同时为空'
+      //   })
+      //   return false;
+      // }
 
       if (this.formData.isSelChannel) {
         if (!this.formData.content) {
@@ -590,6 +626,7 @@ export default {
         natTime: '',
         natAddress: '',
         natResult: '',
+        sampleTime: '',
         isSelChannel: false,
         channel: [],
         content: '',
@@ -620,24 +657,24 @@ export default {
     dataRule () {
       return {
         name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
+          { required: true, message: '姓名不能为空', trigger: 'change' }
         ],
         idCard: [
-          { required: true, message: '证件号不能为空', trigger: 'blur' }
+          { required: true, message: '证件号不能为空', trigger: 'change' }
         ],
         mobile: [
-          { required: true, message: '手机号不能为空', trigger: 'blur' },
-        ],
-        natTime: [
-          { required: true, message: '检测时间不能为空', trigger: 'blur' },
+          { required: true, message: '手机号不能为空', trigger: 'change' },
         ],
+        // natTime: [
+        //   { required: true, message: '检测时间不能为空', trigger: 'change' },
+        // ],
 
         natAddress: [
           { required: false },
         ],
-        natResult: [
-          { required: true, message: '检测结果不能为空', trigger: 'blur' },
-        ],
+        // natResult: [
+        //   { required: true, message: '检测结果不能为空', trigger: 'change' },
+        // ],
 
         isSelChannel: [
           { required: false },

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

@@ -47,6 +47,21 @@
                             end-placeholder="结束时间">
             </el-date-picker>
 
+          </el-form-item>
+          <el-form-item label="采样时间"
+                        label-width="110px"
+                        prop="sampleStartTime">
+            <el-date-picker v-model="sampleTimeRange"
+                            size="small"
+                            type="datetimerange"
+                            @change="handleSampleTimeChange"
+                            format="yyyy-MM-dd HH:mm"
+                            value-format="yyyy-MM-dd HH:mm"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
           </el-form-item>
 
           <div>
@@ -161,7 +176,7 @@
                          header-align="center"
                          align="center"
                          label="检测时间"
-                         min-width="150">
+                         width="150">
         </el-table-column>
         <el-table-column prop="natAddress"
                          header-align="center"
@@ -170,6 +185,7 @@
                          label="检测地点"
                          min-width="230">
         </el-table-column>
+
         <el-table-column prop="natResultShow"
                          header-align="center"
                          align="center"
@@ -177,6 +193,12 @@
                          label="检测结果"
                          width="100">
         </el-table-column>
+        <el-table-column prop="sampleTime"
+                         header-align="center"
+                         align="center"
+                         label="采样时间"
+                         width="150">
+        </el-table-column>
         <el-table-column v-if="isResiUser"
                          prop="isResiUserShow"
                          header-align="center"
@@ -188,7 +210,7 @@
 
         <el-table-column label="操作"
                          fixed="right"
-                         width="140"
+                         width="160"
                          header-align="center"
                          align="center"
                          class="operate">
@@ -198,6 +220,10 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleTiming(scope.row)">定时</el-button>
 
             <el-button v-if="!isResiUser"
                        type="text"
@@ -310,6 +336,7 @@ export default {
       ],
 
       timeRange: [],
+      sampleTimeRange: [],
       formData: {
         orgType: 'current',//当前组织:current 根组织：all
         name: '',//姓名
@@ -317,6 +344,8 @@ export default {
         idCard: '',//身份证号码
         startTime: '',//检测开始时间yyyy-MM-dd HH:mm
         endTime: '',//检测结束时间yyyy-MM-dd HH:mm
+        sampleStartTime: '',//采样开始时间yyyy-MM-dd HH:mm
+        sampleEndTime: '',//采样结束时间yyyy-MM-dd HH:mm
         isResiUser: ''//0:否  1:是
 
       },
@@ -414,6 +443,18 @@ export default {
 
       }
 
+    },
+    handleSampleTimeChange (time) {
+      if (time) {
+        this.formData.sampleStartTime = time[0]
+        this.formData.sampleEndTime = time[1]
+
+      } else {
+        this.formData.sampleStartTime = ''
+        this.formData.sampleEndTime = ''
+
+      }
+
     },
 
     diaClose () {
@@ -532,6 +573,47 @@ export default {
       }
     },
 
+    async handleTiming (row) {
+
+      this.$confirm("确认执行定时任务?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.timingNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async timingNat (row) {
+      const url = "/epmetuser/dataSyncConfig/natInfoScanTask"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
+
+      let params = {
+        isSync: '1',
+        dataCode: 'hesuan',
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        // this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
     async handleAttention (row) {
 
       this.$confirm("确认将信息同步到本辖区核酸检测信息中心?", "提示", {
@@ -582,8 +664,11 @@ export default {
         idCard: '',//身份证号码
         startTime: '',//检测开始时间yyyy-MM-dd HH:mm
         endTime: '',//检测结束时间yyyy-MM-dd HH:mm
+        sampleStartTime: '',//采样开始时间yyyy-MM-dd HH:mm
+        sampleEndTime: '',//采样结束时间yyyy-MM-dd HH:mm
       }
       this.timeRange = []
+      this.sampleTimeRange = []
 
       this.pageNo = 0
       // this.loadTable()