Merge branch 'master' into feature/smsCode

public/index.html

@@ -35,23 +35,23 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
   <script>
-    window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
+    // window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
-    // window.SITE_CONFIG['apiURL'] = 'https://epdc-api-test.elinkservice.cn/epdc-api'
+    window.SITE_CONFIG['apiURL'] = 'https://epmet-ext9.elinkservice.cn/epdc-api'
-    window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext1-py.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
+    window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext1.pingyin.gov.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
   <!-- 集成测试环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
   <script>
     window.SITE_CONFIG['apiURL'] = 'http://219.146.91.110:9094/epdc-api'
-    window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext1-py.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
+    window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext1.pingyin.gov.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
   <!-- 验收测试环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
   <script>
     window.SITE_CONFIG['apiURL'] = 'http://115.28.104.30:17020/epdc-api'
-    window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext1-py.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
+    window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext1.pingyin.gov.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
   <!-- 生产环境 -->

src/views/modules/epidemic/epidemicreportuserinfo.vue

@@ -339,16 +339,8 @@ export default {
         idCard: '',
         username: '',
         mobile: '',
-        outCode: '',
+        isInoculate: ''
-        outStreet: '',
-        returnState: '',
-        startTime: '',
-        endTime: '',
-        isInoculate: '',
-        age: '',
-        company: ''
       },
-      ageArr: [],
       companyArr: [],
       publicPath: process.env.BASE_URL,
       pickerBeginDateBefore: {
@@ -367,13 +359,7 @@ export default {
           }
         }
       },
-      ids: [],
       options: [],
-      outStreetArr: [],
-      returnStateArr: [
-        { dictValue: 1, dictName: '在本地' },
-        { dictValue: 2, dictName: '在外地' }
-      ],
       inoculateStateArr: [
         { dictValue: '0', dictName: '未接种' },
         { dictValue: '10', dictName: '接种中' },
@@ -382,17 +368,6 @@ export default {
         { dictValue: '1', dictName: '第一针' },
         { dictValue: '2', dictName: '第二针' }
       ],
-      ageStateArr: [
-        { dictValue: '0', dictName: '0-18岁' },
-        { dictValue: '1', dictName: '19-19岁' },
-        { dictValue: '2', dictName: '20-29岁' },
-        { dictValue: '3', dictName: '30-39岁' },
-        { dictValue: '4', dictName: '40-49岁' },
-        { dictValue: '5', dictName: '50-59岁' },
-        { dictValue: '6', dictName: '60-69岁' },
-        { dictValue: '7', dictName: '70-79岁' },
-        { dictValue: '8', dictName: '80岁以上' }
-      ],
       companyStateArr: [],
       exportTemplate: false,
       uploeadLoeading: false,
@@ -411,22 +386,8 @@ export default {
     AddOrUpdate,
     InfoDetail
   },
-  watch: {
-    ids: function (val) {
-      if (val.length === 0) {
-        this.dataForm.outCode = ''
-      } else {
-        this.dataForm.outCode = this.ids[val.length - 1]
-      }
-    }
-  },
   methods: {
     beforeGetDataListSearch () {
-      if (this.ageArr.length > 0) {
-        this.dataForm.age = this.ageArr.toString()
-      } else {
-        this.dataForm.age = ''
-      }
       if (this.companyArr.length > 0) {
         this.dataForm.company = this.companyArr.toString()
       } else {
@@ -442,12 +403,6 @@ export default {
         this.$refs.infoDetail.init()
       })
     },
-    // 获取乡镇下拉信息(传参：4代表查“街道”)
-    getDailyTypeArrInfo () {
-      this.$http.get(`/sys/epidemicreportuserinfo/selectStreet/4`).then(({ data: res }) => {
-        this.outStreetArr = res
-      }).catch(() => { })
-    },
     getcompantyOptions () {
       this.$http
         .get(`/sys/vaccinecompany/getCompantyList`)
@@ -486,14 +441,6 @@ export default {
         }
       }).catch(() => { })
     },
-    // 乡镇取值变化事件
-    selectModel (event) {
-      this.outStreetArr.find((item) => {
-        if (item.dictValue === event) {
-          this.dataForm.outStreet = item.dictValue
-        }
-      })
-    },
     getOptions () {
       this.$http
         .get(`/sys/select/getSysArea`)
@@ -565,15 +512,6 @@ export default {
         }
       })
     },
-    returnStateFormat (row, column) {
-      if (row.returnState === 1 || row.returnState === '1') {
-        return '在本地'
-      } else if (row.returnState === 2 || row.returnState === '2') {
-        return '在外地'
-      } else {
-        return ''
-      }
-    },
     showRegistFormat (row, column) {
       if (row.isInoculate === 0) {
         return '否'
@@ -581,18 +519,6 @@ export default {
         return '是'
       }
     },
-    returnriskGradeFormat (row, column) {
-      // 1:低风险，2：中风险，3：高风险
-      if (row.riskGrade === 1 || row.riskGrade === '1') {
-        return '低风险'
-      } else if (row.returnState === 2 || row.returnState === '2') {
-        return '中风险'
-      } else if (row.returnState === 3 || row.returnState === '3') {
-        return '高风险'
-      } else {
-        return ''
-      }
-    },
     // 打开导出弹框
     exports () {
       this.dialogVisibleExcel = true

src/views/modules/sys/user-add-or-update.vue

@@ -103,6 +103,25 @@
           <el-radio :label="1">{{ $t('user.status1') }}</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item prop="verifyFlag"
+                    label="短信验证登陆"
+                    size="mini">
+        <el-radio-group v-model="dataForm.verifyFlag" @change="verifyFlagChange">
+          <el-radio :label="'0'">停用</el-radio>
+          <el-radio :label="'1'">本人验证</el-radio>
+          <el-radio :label="'2'">领导验证</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="登录验证手机" v-if="dataForm.verifyFlag !== '0'"
+                    prop="verifyMobile">
+        <el-autocomplete
+            class="inline-input" :disabled="dataForm.verifyFlag === '1'"
+            v-model="dataForm.verifyMobile"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入内容"
+            @select="handleSelect"
+        ></el-autocomplete>
+      </el-form-item>
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -136,8 +155,11 @@ export default {
         mobile: '',
         roleIdList: [],
         status: 1,
+        verifyFlag: '0',
+        verifyMobile: '',
         userTagKey: ''
       },
+      verifyMobileList: [],
       userTagDictList: []
     }
   },
@@ -272,12 +294,36 @@ export default {
       this.dataForm.deptName = data.name
       this.deptListVisible = false
     },
+    handleSelect (item) {
+      console.log(item)
+    },
+    verifyFlagChange (e) {
+      if (e === '2') {
+        this.$http.get(`/sys/user/getLeaderPhone/${this.dataForm.deptId}`).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.verifyMobileList = res.data
+        }).catch(() => { })
+      } else {
+        this.verifyMobileList = []
+        this.dataForm.verifyMobile = this.dataForm.mobile
+      }
+    },
+    querySearch (queryString, cb) {
+      let results = this.verifyMobileList
+      // 调用 callback 返回建议列表的数据
+      cb(results)
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
         }
+        if (this.dataForm.verifyFlag === '0') {
+          this.dataForm.verifyMobile = ''
+        }
         this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', {
           ...this.dataForm,
           roleIdList: [

src/views/modules/vim/vaccinationrole-add-or-update.vue

@@ -4,13 +4,13 @@
           <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="dataForm.roleName" placeholder="角色名称"></el-input>
       </el-form-item>
-          <el-form-item label="街道/乡镇关键词" prop="streetKeywords">
+          <el-form-item label="乡镇/街道权限" prop="streetKeywords">
           <el-input v-model="dataForm.streetKeywords" type="textarea" placeholder="街道/乡镇关键词，关键词以逗号间隔"></el-input>
       </el-form-item>
-          <el-form-item label="社区/村关键词" prop="communityKeywords">
+          <el-form-item label="村/社区权限" prop="communityKeywords">
           <el-input v-model="dataForm.communityKeywords" type="textarea" placeholder="社区/村关键词，关键词以逗号间隔"></el-input>
       </el-form-item>
-          <el-form-item label="网格关键词" prop="gridKeywords">
+          <el-form-item label="网格权限" prop="gridKeywords">
           <el-input v-model="dataForm.gridKeywords" type="textarea" placeholder="网格关键词，关键词以逗号间隔"></el-input>
       </el-form-item>
           <el-form-item label="备注" prop="remark">

src/views/modules/vim/vaccinationrole.vue

@@ -20,6 +20,9 @@
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="roleName" label="角色名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="streetKeywords" label="乡镇/街道权限" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityKeywords" label="村/社区权限" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridKeywords" label="网格权限" header-align="center" align="center"></el-table-column>
         <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">

src/views/modules/vim/vaccinationuserrole-add-or-update.vue

@@ -71,7 +71,7 @@ export default {
     },
     getUserOptions () {
       this.$http
-          .get(`/sys/user/userList`)
+          .get(`/sys/user/vaccination/userList`)
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg)