Browse Source

bug生产机

xiaowang-jumin
mk 2 years ago
parent
commit
f90be7a2c9
  1. 6
      src/views/components/editResi.vue
  2. 13
      src/views/components/resiExpand/index.vue
  3. 10
      src/views/modules/portrayal/jumin/index.vue

6
src/views/components/editResi.vue

@ -1129,7 +1129,7 @@ export default {
label: "高龄补助", label: "高龄补助",
itemType: "inputNum", itemType: "inputNum",
formName: "oldSubsidy", formName: "oldSubsidy",
check:'fourFont', // check:'fourFont',
pformName: "oldPeopleDto", pformName: "oldPeopleDto",
}, },
], ],
@ -1406,7 +1406,6 @@ export default {
//2 //2
label: "子女性别", label: "子女性别",
itemType: "select1", itemType: "select1",
check:'fourFont',
formName: "childGender", formName: "childGender",
pformName: "specialSupportDto", pformName: "specialSupportDto",
opction: [ opction: [
@ -1423,7 +1422,6 @@ export default {
{ {
label: "子女死亡日期", label: "子女死亡日期",
itemType: "datepicker1", itemType: "datepicker1",
check:'sixFont',
formName: "childDeathDate", formName: "childDeathDate",
pformName: "specialSupportDto", pformName: "specialSupportDto",
opction: [], opction: [],
@ -1431,7 +1429,6 @@ export default {
{ {
label: "子女伤残类别", label: "子女伤残类别",
itemType: "select1", itemType: "select1",
check:'sixFont',
formName: "childDisabilityCategoryCode", formName: "childDisabilityCategoryCode",
opctionUrl: "sys/dict/data/dictlist", opctionUrl: "sys/dict/data/dictlist",
pformName: "specialSupportDto", pformName: "specialSupportDto",
@ -1441,7 +1438,6 @@ export default {
{ {
label: "子女伤残等级", label: "子女伤残等级",
itemType: "select1", itemType: "select1",
check:'sixFont',
pformName: "specialSupportDto", pformName: "specialSupportDto",
formName: "childDisabilityLevel", formName: "childDisabilityLevel",
opctionUrl: "sys/dict/data/dictlist", opctionUrl: "sys/dict/data/dictlist",

13
src/views/components/resiExpand/index.vue

@ -17,7 +17,7 @@
<el-select v-model.trim="form[itemj.id][itemk.formName]" :placeholder="`请选择${itemk.label}`" <el-select v-model.trim="form[itemj.id][itemk.formName]" :placeholder="`请选择${itemk.label}`"
size="small" :multiple="itemk.multiple" :collapse-tags="itemk.collapseTags" clearable size="small" :multiple="itemk.multiple" :collapse-tags="itemk.collapseTags" clearable
:style="{ 'width': itemk.formName == 'specialCategoryCode' ? '183px' : '' }" :style="{ 'width': itemk.formName == 'specialCategoryCode' ? '183px' : '' }"
class="list_item_width_1"> class="list_item_width_1" @change="handelChangeSelsect(itemj.id,itemk.formName)">
<el-option v-for="items in itemk.opction" :key="items.value" :label="items.label" <el-option v-for="items in itemk.opction" :key="items.value" :label="items.label"
:value="items.value"> :value="items.value">
</el-option> </el-option>
@ -206,6 +206,15 @@ export default {
mounted() { mounted() {
}, },
methods: { methods: {
handelChangeSelsect(pname,cname){
if(pname === 'specialSupportDto' && cname === 'specialSupportType'){
if(this.form.specialSupportDto.specialSupportType === '2'){
this.formList[0].children[4].check = 'sixFont'
}else{
this.formList[0].children[4].check = null;
}
}
},
checkNumberInput(itemj, itemk) { checkNumberInput(itemj, itemk) {
if (this.form[itemj][itemk]) { if (this.form[itemj][itemk]) {
if (isNaN(this.form[itemj][itemk])) { if (isNaN(this.form[itemj][itemk])) {
@ -260,7 +269,7 @@ export default {
console.log(this.form); console.log(this.form);
this.formList.forEach((group) => { this.formList.forEach((group) => {
group.children.forEach((item) => { group.children.forEach((item) => {
if (item.check && !this.form[group.id][item.formName] ||this.form[group.id][item.formName].length === 0) { if (item.check && !this.form[group.id][item.formName]) {
this.$message.error(`${item.label}不能为空`); this.$message.error(`${item.label}不能为空`);
throw new Error(`${item.label}不能为空`); throw new Error(`${item.label}不能为空`);
} }

10
src/views/modules/portrayal/jumin/index.vue

@ -250,8 +250,8 @@
</div> </div>
<div class="flex_box"> <div class="flex_box">
<div class="f-flex"> <div class="f-flex">
<div class="f-label"><b>人房关系</b></div> <div class="f-label">人房关系</div>
<span class="f-left8 f-font-color"> <span class="f-left8 ">
{{ {{
item.resiHouseRel != null item.resiHouseRel != null
? item.resiHouseRel === 0 ? item.resiHouseRel === 0
@ -264,7 +264,7 @@
</span> </span>
</div> </div>
<div class="f-flex"> <div class="f-flex">
<div class="f-label"><b>人户状况</b></div> <div class="f-label">人户状况</div>
<span class="f-left8 f-font-color">{{ <span class="f-left8 f-font-color">{{
householdSituationText(indexK) householdSituationText(indexK)
}}</span> }}</span>
@ -276,7 +276,7 @@
</div> </div>
</div> </div>
<div class="f-flex"> <div class="f-flex">
<div class="f-label"><b>与户主关系</b></div> <div class="f-label">与户主关系</div>
<span class="f-left8 f-font-color">{{ <span class="f-left8 f-font-color">{{
houseHolderRelText(indexK) houseHolderRelText(indexK)
}}</span> }}</span>
@ -296,7 +296,7 @@
</div> </div>
<div class="f-flex"> <div class="f-flex">
<div class="f-label"><b>就业状态</b></div> <div class="f-label">就业状态</div>
<span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto"> <span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto">
{{ careerStatusText() }} {{ careerStatusText() }}
</span> </span>

Loading…
Cancel
Save