Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/3.0.0/AppHealthReport/components/Detail.vue

@@ -184,7 +184,7 @@
         tableData: [],
         recordList: [],
         colConfigs: [
-          {prop: 'createTime', label: '上报日期', align: 'center', dateFormart: 'YYYY-MM-DD'},
+          {prop: 'createTime', label: '上报日期', align: 'center', dateFormat: 'YYYY-MM-DD'},
           {prop: 'status', label: '健康状态', align: 'center', formart: v => v === '0' ? '异常' : '正常' }
         ],
         tabList: ['基本信息', '每日上报', '异常处理']

packages/jianping/AppHelpedResident/hrAdd.vue

@@ -78,7 +78,7 @@
                   <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" />
                 </el-form-item>
                 <el-form-item label="务工时间(月)">
-                  <el-input v-model="form.workeMonths" placeholder="请输入" clearable/>
+                  <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable @input="numberInput('workeMonths')" />
                 </el-form-item>
                 <el-form-item label="就业渠道">
                   <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')" />
@@ -93,7 +93,7 @@
                   <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" />
                 </el-form-item>
                 <el-form-item label="公益性岗位(月数)">
-                  <el-input v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable/>
+                  <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable @input="numberInput('publicWelfarePostsMonths')" />
                 </el-form-item>
               </div>
               <el-form-item label="务工所在地">
@@ -224,49 +224,83 @@
             <template slot="content">
               <div flex class="half wrap">
                 <el-form-item label="纳入监测对象的收入参考范围">
-                  <el-input v-model="form.income1" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income1" placeholder="请输入" type="number" @input="decimalInput('income1')" clearable/>
                 </el-form-item>
                 <el-form-item label="纳入监测对象的人均收入参考范围">
-                  <el-input v-model="form.income2" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income2" placeholder="请输入" type="number" @input="decimalInput('income2')" clearable/>
                 </el-form-item>
                 <el-form-item label="工资性收入(元)">
-                  <el-input v-model="form.income3" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income3" placeholder="请输入" type="number" @input="decimalInput('income3')" clearable/>
                 </el-form-item>
                 <el-form-item label="生产经营性收入(元)">
-                  <el-input v-model="form.income4" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income4" placeholder="请输入" type="number" @input="decimalInput('income4')" clearable/>
                 </el-form-item>
                 <el-form-item label="计划生育金(元)">
-                  <el-input v-model="form.income5" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income5" placeholder="请输入" type="number" @input="decimalInput('income5')" clearable/>
                 </el-form-item>
                 <el-form-item label="资产收益扶贫分红收入">
-                  <el-input v-model="form.income6" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income6" placeholder="请输入" type="number" @input="decimalInput('income6')" clearable/>
                 </el-form-item>
                 <el-form-item label="低保金(元)">
-                  <el-input v-model="form.income7" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income7" placeholder="请输入" type="number" @input="decimalInput('income7')" clearable/>
                 </el-form-item>
                 <el-form-item label="特困供养金(元)">
-                  <el-input v-model="form.income8" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income8" placeholder="请输入" type="number" @input="decimalInput('income8')" clearable/>
                 </el-form-item>
                 <el-form-item label="养老保险金(元)">
-                  <el-input v-model="form.income9" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income9" placeholder="请输入" type="number" @input="decimalInput('income9')" clearable/>
                 </el-form-item>
                 <el-form-item label="生态补偿金(元)">
-                  <el-input v-model="form.income10" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income10" placeholder="请输入" type="number" @input="decimalInput('income10')" clearable/>
                 </el-form-item>
                 <el-form-item label="转移性收入(元)">
-                  <el-input v-model="form.income11" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income11" placeholder="请输入" type="number" @input="decimalInput('income11')" clearable/>
                 </el-form-item>
                 <el-form-item label="其它转移性收入(元)">
-                  <el-input v-model="form.income12" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income12" placeholder="请输入" type="number" @input="decimalInput('income12')" clearable/>
                 </el-form-item>
                 <el-form-item label="财产性收入(元)">
-                  <el-input v-model="form.income13" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income13" placeholder="请输入" type="number" @input="decimalInput('income13')" clearable/>
                 </el-form-item>
                 <el-form-item label="其它财产收入(元)">
-                  <el-input v-model="form.income14" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income14" placeholder="请输入" type="number" @input="decimalInput('income14')" clearable/>
                 </el-form-item>
                 <el-form-item label="生产经营性支出(元)">
-                  <el-input v-model="form.income15" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income15" placeholder="请输入" type="number" @input="decimalInput('income15')" clearable/>
+                </el-form-item>
+              </div>
+            </template>
+          </ai-card>
+
+          <ai-card title="风险消除情况" v-if="form.status == 3">
+            <template slot="content">
+              <div flex class="half wrap">
+                <el-form-item label="工资性收入情况">
+                  <el-input v-model="form.fxxcIncome1" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome1')" clearable/>
+                </el-form-item>
+                <el-form-item label="生产经营性收入情况">
+                  <el-input v-model="form.fxxcIncome2" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome2')" clearable/>
+                </el-form-item>
+                <el-form-item label="财产性收入情况">
+                  <el-input v-model="form.fxxcIncome3" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome3')" clearable/>
+                </el-form-item>
+                <el-form-item label="转移性收入情况">
+                  <el-input v-model="form.fxxcIncome4" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome4')" clearable/>
+                </el-form-item>
+                <el-form-item label="理赔收入情况">
+                  <el-input v-model="form.fxxcIncome5" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome5')" clearable/>
+                </el-form-item>
+                <el-form-item label="生产经营性支出情况">
+                  <el-input v-model="form.fxxcIncome6" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome6')" clearable/>
+                </el-form-item>
+                <el-form-item label="合规自然收支情况">
+                  <el-input v-model="form.fxxcIncome7" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome7')" clearable/>
+                </el-form-item>
+                <el-form-item label="家庭纯收入情况">
+                  <el-input v-model="form.fxxcIncome8" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome8')" clearable/>
+                </el-form-item>
+                <el-form-item label="家庭人均纯收入情况">
+                  <el-input v-model="form.fxxcIncome9" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome9')" clearable/>
                 </el-form-item>
               </div>
             </template>
@@ -457,7 +491,19 @@ export default {
       }else {
         this.form[formName] = '02'
       }
-    }
+    },
+    decimalInput(name) {
+      if(!/^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/g.test(this.form[name])){
+        this.form[name] = ''
+        return this.$message.error('最多只保留两位小数点')
+      }
+    },
+    numberInput(name) {
+      if(!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])){
+        this.form[name] = ''
+        return this.$message.error('请输入正整数')
+      }
+    },
   },
   created() {
     this.getDetail()

packages/jianping/AppHelpedResident/hrDetail.vue

@@ -150,6 +150,21 @@
                   </div>
                 </template>
               </ai-card>
+              <ai-card title="风险消除情况" v-if="detail.status == 3">
+                <template slot="content">
+                  <div flex class="half wrap">
+                    <el-form-item label="工资性收入情况">{{detail.fxxcIncome1}}</el-form-item>
+                    <el-form-item label="生产经营性收入情况">{{detail.fxxcIncome2}}</el-form-item>
+                    <el-form-item label="财产性收入情况">{{detail.fxxcIncome3}}</el-form-item>
+                    <el-form-item label="转移性收入情况">{{detail.fxxcIncome4}}</el-form-item>
+                    <el-form-item label="理赔收入情况">{{detail.fxxcIncome5}}</el-form-item>
+                    <el-form-item label="生产经营性支出情况">{{detail.fxxcIncome6}}</el-form-item>
+                    <el-form-item label="合规自然收支情况">{{detail.fxxcIncome7}}</el-form-item>
+                    <el-form-item label="家庭纯收入情况">{{detail.fxxcIncome8}}</el-form-item>
+                    <el-form-item label="家庭人均纯收入情况">{{detail.fxxcIncome9}}</el-form-item>
+                  </div>
+                </template>
+              </ai-card>
               <ai-card title="家庭成员">
                 <template #right>
                   <span style=" color: #2266ff; margin-left: 16px;cursor: pointer;font-size: 12px;" @click="addFamily({})">添加</span>
@@ -252,7 +267,7 @@
                 <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
               </el-form-item>
               <el-form-item label="务工时间(月)">
-                <el-input v-model="form.workeMonths" placeholder="请输入" clearable />
+                <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable @input="numberInput('workeMonths')" />
               </el-form-item>
               <el-form-item label="就业渠道">
                 <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')" />
@@ -267,7 +282,7 @@
                 <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
               </el-form-item>
               <el-form-item label="公益性岗位(月数)">
-                <el-input v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable />
+                <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable @input="numberInput('publicWelfarePostsMonths')" />
               </el-form-item>
             </div>
             <el-form-item label="务工所在地">
@@ -710,7 +725,11 @@ export default {
             })
             this.applyInfo.files = ids.join(',')
           }
-          this.instance.post(url, null, { params: this.applyInfo }).then(res => {
+          let fromData = new FormData()
+          for (let key in this.applyInfo) {
+            fromData.append(key, this.applyInfo[key])
+          }
+          this.instance.post(url, fromData).then(res => {
             if (res.code == 0) {
               this.getDetail()
               this.$message.success('提交成功!');
@@ -744,7 +763,11 @@ export default {
         if (this.changeStatus == 5) { //5 解除风险
           url = `/app/apppreventionreturntopoverty/relieve`
         }
-        this.instance.post(url, null, { params: this.examineFrom }).then(res => {
+        let fromData = new FormData()
+        for (let key in this.examineFrom) {
+          fromData.append(key, this.examineFrom[key])
+        }
+        this.instance.post(url, fromData ).then(res => {
           if (res.code == 0) {
             this.getDetail()
             this.$message.success('提交成功!');
@@ -774,6 +797,12 @@ export default {
         });
       })
     },
+    numberInput(name) {
+      if(!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])){
+        this.form[name] = ''
+        return this.$message.error('请输入正整数')
+      }
+    },
   },
   created() {
     this.getDetail();
@@ -783,7 +812,6 @@ export default {
 
 <style lang="scss" scoped>
 .hrDetail {
-  height: 100%;
 
   .flex-start {
     align-items: flex-start;

packages/meta/AppResident/residentDetail.vue

@@ -117,7 +117,7 @@
                       <ai-info-item label="政治面貌" :value="dict.getLabel('politicsStatus', baseInfo.politicsStatus)"/>
                       <ai-info-item label="兵役状况" :value="dict.getLabel('militaryStatus', baseInfo.militaryStatus)"/>
                       <ai-info-item label="宗教信仰" :value="dict.getLabel('faithType', baseInfo.faithType)"/>
-                      <ai-info-item label="职业" :value="dict.getLabel('faithType', baseInfo.job)"/>
+                      <ai-info-item label="职业" :value="dict.getLabel('job', baseInfo.job)"/>
                     </ai-wrapper>
                     <ai-avatar v-model="baseInfo.photo" :editable="false"/>
                   </el-row>
@@ -707,7 +707,7 @@ export default {
   font-size: 14px;
 
   ::v-deep.el-tabs__content {
-    max-height: calc(100vh - 136px);
+    max-height: calc(100vh - 176px);
     overflow-y: auto;
 
   }

packages/wechat/AppVillageInfo/components/Event.vue

@@ -84,7 +84,7 @@
           { prop: 'type', label: '类型', formart: v => this.dict.getLabel('villInfoType', v) },
           { prop: 'title', label: '标题', align: 'left' },
           { prop: 'status', label: '发布状态', align: 'center', formart: v => this.dict.getLabel('villInfoStatus', v) },
-          { prop: 'createDate', label: '发布时间', dateFormart: 'YYYY-MM-DD', align: 'center' },
+          { prop: 'createDate', label: '发布时间', dateFormat: 'YYYY-MM-DD', align: 'center' },
           { prop: 'createUser', label: '发布人', align: 'center' },
           { prop: 'areaName', label: '来源地区', align: 'center' },
           { slot: 'options', label: '操作' }

project/oms/apps/AppArticles/components/Event.vue

@@ -108,7 +108,7 @@ export default {
       return [
         {prop: 'type', label: '类型', formart: v => this.dict.getLabel('villInfoType', v)},
         {prop: 'title', label: '标题', align: 'left'},
-        {prop: 'createDate', label: '创建时间', dateFormart: 'YYYY-MM-DD', align: 'center'},
+        {prop: 'createDate', label: '创建时间', dateFormat: 'YYYY-MM-DD', align: 'center'},
         {prop: 'createUser', label: '发布人', align: 'center'},
         {slot: 'options', label: '操作'}
       ]

project/sass/apps/AppGridBlock/components/list.vue

@@ -102,6 +102,7 @@
             :size.sync="page.size"
             @selection-change="(v) => (ids = v.map((e) => e.id))"
             @getList="getList()"
+            :dict="dict"
         >
           <el-table-column
               slot="selectId"
@@ -200,10 +201,8 @@
 
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
-import Template from '../../../../../packages/wechat/AppAskForm/components/Template.vue';
 
 export default {
-  components: {Template},
   name: "List",
   label: "网格区块",
   props: {
@@ -260,63 +259,13 @@ export default {
       let _ = this;
       return [
         {type: 'selection'},
-        {
+        {prop: "girdName", align: "left", label: "网格名称",},
-          prop: "girdName",
+        {prop: "girdCode", align: "center", label: "网格编码",},
-          align: "left",
+        {prop: "girdType", align: "center", label: "网格类型", dict: "girdType"},
-          label: "网格名称",
+        {prop: "girdLevel", align: "center", label: "网格层级", dict: "girdLevel"},
-        },
+        {prop: "plottingStatus", align: "center", label: "标绘状态", dict: "plottingStatus"},
-        {
+        {prop: "createTime", align: "center", label: "创建时间", dateFormat: "YYYY-MM-DD"},
-          prop: "girdCode",
+        {prop: "girdMemberNames", align: "center", slot: 'user', width: 200, label: "网格员"},
-          align: "center",
-          label: "网格编码",
-        },
-        {
-          prop: "girdType",
-          align: "center",
-          label: "网格类型",
-          render(h, {row}) {
-            return h("span", {}, _.dict.getLabel("girdType", row.girdType) || '-');
-          },
-        },
-        {
-          prop: "girdLevel",
-          align: "center",
-          label: "网格层级",
-          render(h, {row}) {
-            return h("span", {}, _.dict.getLabel("girdLevel", row.girdLevel) || '-');
-          },
-        },
-        {
-          prop: "plottingStatus",
-          align: "center",
-          label: "标绘状态",
-          render(h, {row}) {
-            return h(
-                "span",
-                {
-                  style: {
-                    color: _.dict.getColor("plottingStatus", row.plottingStatus),
-                  },
-                },
-                _.dict.getLabel("plottingStatus", row.plottingStatus)
-            );
-          },
-        },
-        {
-          prop: "createTime",
-          align: "center",
-          label: "创建时间",
-          render(h, {row}) {
-            return h("span", {}, row.createTime.substring(0, 11));
-          },
-        },
-        {
-          prop: "girdMemberNames",
-          align: "center",
-          slot: 'user',
-          width: 200,
-          label: "网格员",
-        },
       ];
     },
   },

project/sass/apps/AppHealthReport/components/Detail.vue

@@ -74,7 +74,7 @@
         currIndex: 0,
         tableData: [],
         colConfigs: [
-          {prop: 'createTime', label: '上报日期', align: 'center', dateFormart: 'YYYY-MM-DD'},
+          {prop: 'createTime', label: '上报日期', align: 'center', dateFormat: 'YYYY-MM-DD'},
           {
             prop: 'status',
             label: '健康状态',