Merge remote-tracking branch 'origin/dev' into dev

packages/jianping/AppRiskWarning/AppRiskWarning.vue

@@ -13,7 +13,7 @@
 
   export default {
     name: 'AppRiskWarning',
-    label: '风险预警',
+    label: '风险告知',
 
     props: {
       instance: Function,

packages/jianping/AppRiskWarning/components/Add.vue

@@ -16,10 +16,10 @@
             </el-form-item>
             <el-form-item label="风险类型" prop="idNumber" :rules="[{ required: true, message: '请选择风险类型', trigger: 'blur' }]">
               <ai-select
-                v-model="form.checkResult"
+                v-model="form.riskType"
                 clearable
                 placeholder="请选择风险类型"
-                :selectList="dict.getDict('epidemicRecentTestResult')">
+                :selectList="dict.getDict('fpRiskType')">
               </ai-select>
             </el-form-item>
             <el-form-item label="身份证号" prop="idNumber" :rules="[{ required: true, validator: validatorId, trigger: 'blur' }]">
@@ -29,17 +29,16 @@
               <ai-area-select
                 v-model="form.areaId"
                 always-show
-                :disabled="form.applyType === '1'"
+                :instance="instance"
-                :instance="$http"
                 clearable
                 @fullname="v=>form.areaName = v"
-                :disabledLevel="3"/>
+                :disabledLevel="disabledLevel"/>
             </el-form-item>
-            <el-form-item label="联系地址" prop="idNumber" style="width: 100%;">
+            <el-form-item label="联系地址" prop="address" style="width: 100%;">
-              <el-input v-model="form.idNumber" :maxlength="30" size="small" placeholder="请输入联系地址"></el-input>
+              <el-input v-model="form.address" :maxlength="30" size="small" placeholder="请输入联系地址"></el-input>
             </el-form-item>
-            <el-form-item label="备注说明" prop="idNumber" style="width: 100%;">
+            <el-form-item label="备注说明" prop="remarks" style="width: 100%;">
-              <el-input v-model="form.idNumber" :rows="5" style="width: 100%;" type="textarea" :maxlength="500" size="small" placeholder="请输入..."></el-input>
+              <el-input v-model="form.remarks" :rows="5" style="width: 100%;" type="textarea" :maxlength="500" size="small" placeholder="请输入..."></el-input>
             </el-form-item>
           </el-form>
         </template>
@@ -53,6 +52,7 @@
 </template>
 
 <script>
+  import { mapState } from 'vuex'
   export default {
     name: 'Add',
 
@@ -87,16 +87,28 @@
         validatorId,
         validatorPhone,
         form: {
-          title: '',
+          name: '',
-          content: '',
+          idNumber: '',
-          publishUnitName: '',
+          address: '',
-          images: []
+          areaId: '',
+          areaName: '',
+          remarks: '',
+          phone: '',
+          riskType: ''
         },
-        id: ''
+        id: '',
+        disabledLevel: 3
       }
     },
 
+    computed: {
+      ...mapState(['user'])
+    },
+
     created () {
+      this.form.areaName = this.user.info.areaName
+      this.form.areaId = this.user.info.areaId
+      this.disabledLevel = this.user.info.areaList.length
       if (this.params && this.params.id) {
         this.id = this.params.id
         this.getInfo(this.params.id)
@@ -105,7 +117,7 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appmininotice/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/apppreventionreturntopovertyriskperson/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.form = {
               ...res.data,
@@ -122,13 +134,8 @@
       confirm () {
         this.$refs.form.validate((valid) => {
           if (valid) {
-            if (!this.form.content && !this.form.images.length) {
+            this.instance.post(`/app/apppreventionreturntopovertyriskperson/addOrUpdate`, {
-              return this.$message.error('请输入正文或上传图片')
+              ...this.form
-            }
-
-            this.instance.post(`/app/appmininotice/addOrUpdate`, {
-              ...this.form,
-              images: this.form.images ? JSON.stringify(this.form.images) : []
             }).then(res => {
               if (res.code == 0) {
                 this.$message.success('提交成功')

packages/jianping/AppRiskWarning/components/List.vue

@@ -1,19 +1,19 @@
 <template>
   <ai-list class="notice">
     <template slot="title">
-      <ai-title title="风险预警" isShowBottomBorder></ai-title>
+      <ai-title title="风险告知" isShowBottomBorder></ai-title>
     </template>
     <template slot="content">
       <ai-search-bar bottomBorder>
         <template #left>
           <ai-select
-            v-model="search.checkResult"
+            v-model="search.riskType"
             clearable
             placeholder="请选择风险类型"
-            :selectList="dict.getDict('epidemicRecentTestResult')"
+            :selectList="dict.getDict('fpRiskType')"
             @change="search.current = 1, getList()">
           </ai-select>
-          <el-button icon="iconfont iconAdd" type="primary" size="small" @click="toAdd">添加 </el-button>
+          <el-button icon="iconfont iconAdd" type="primary" size="small" @click="toAdd('')">添加 </el-button>
         </template>
         <template #right>
           <el-input
@@ -32,10 +32,10 @@
           <el-button icon="iconfont iconDelete" size="small" @click="removeAll" :disabled="ids.length == 0">删除 </el-button>
         </template>
         <template #right>
-          <ai-download :instance="instance" url="/app/appepidemicreportmember/export" :params="search" fileName="健康上报" :disabled="tableData.length == 0">
+          <ai-download :instance="instance" url="/app/apppreventionreturntopovertyriskperson/export" :params="search" fileName="风险预警人员" :disabled="tableData.length == 0">
             <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
           </ai-download>
-          <ai-import :instance="instance" :dict="dict" type="appcommunitybuildinginfo" :importParams="search" name="风险预警" @success="getList()">
+          <ai-import :instance="instance" :dict="dict" type="apppreventionreturntopovertyriskperson" :importParams="search" name="风险预警人员" @success="getList()">
             <el-button icon="iconfont iconImport">导入</el-button>
           </ai-import>
         </template>
@@ -82,19 +82,20 @@
         search: {
           current: 1,
           size: 10,
-          title: ''
+          title: '',
+          riskType: ''
         },
         ids: [],
         total: 10,
         colConfigs: [
           { type: 'selection' },
-          {prop: 'title', label: '姓名', align: 'left'},
+          {prop: 'name', label: '姓名', align: 'left'},
-          {prop: 'createUserName', label: '联系方式', align: 'center' },
+          {prop: 'phone', label: '联系方式', align: 'center' },
-          {prop: 'publishUnitName', label: '风险类型', align: 'center'},
+          {prop: 'riskType', label: '风险类型', align: 'center', formart: v => this.dict.getLabel('fpRiskType', v) },
-          {prop: 'createTime', label: '所属区域', align: 'center' },
+          {prop: 'areaName', label: '所属区域', align: 'center' },
-          {prop: 'createUserName', label: '备注说明', align: 'center' },
+          {prop: 'remarks', label: '备注说明', align: 'center' },
-          {prop: 'publishUnitName', label: '操作时间', align: 'center'},
+          {prop: 'createTime', label: '操作时间', align: 'center'},
-          {prop: 'createTime', label: '操作人', align: 'center' },
+          {prop: 'visitUserName', label: '操作人', align: 'center' },
           {prop: 'createTime', label: '归口部门', align: 'center' },
           {slot: 'options', label: '操作'}
         ],
@@ -107,14 +108,14 @@
     },
 
     created () {
-      this.dict.load('epidemicRecentTestResult').then(() => {
+      this.dict.load('fpRiskType').then(() => {
         this.getList()
       })
     },
 
     methods: {
       getList() {
-        this.instance.post(`/app/appmininotice/list`, null, {
+        this.instance.post(`/app/apppreventionreturntopovertyriskperson/list`, null, {
           params: {
             ...this.search
           }
@@ -133,7 +134,7 @@
 
       remove(id) {
         this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appmininotice/delete?ids=${id}`).then(res => {
+          this.instance.post(`/app/apppreventionreturntopovertyriskperson/delete?ids=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getList()