Browse Source

bug#416迁入居民查询不限制时间,bug#405居民信息新增中单选框默认选中,智能导入点击分类按钮bug

feature
mk 2 years ago
parent
commit
b1d088aef4
  1. 24
      src/views/components/resiForm.vue
  2. 8
      src/views/modules/base/huji/immigration/index.vue
  3. 78
      src/views/modules/base/smartImport.vue

24
src/views/components/resiForm.vue

@ -1052,7 +1052,7 @@ export default {
name:'', //
nation:'', //
remark:'', //
localResidenceFlag:'', //
localResidenceFlag:'1', //
birthday:'', //
idNum:'', //
gender:'', //
@ -1097,10 +1097,10 @@ export default {
disabilityLevel:'',//
disabilityNum:'',//
disabilityDesc:'',//
guardianFlag:null,//
specialSkillFlag:null,//:1 :0
workCapacityFlag:null,//:1 :0
voluntaryEducationFlag:null,//:1 :0
guardianFlag:1,//
specialSkillFlag:1,//:1 :0
workCapacityFlag:1,//:1 :0
voluntaryEducationFlag:1,//:1 :0
illnessCode:'',//code
illnessTime:'',//yyyy-MM-dd
chronicDiseaseCode:'',//code
@ -1134,7 +1134,7 @@ export default {
resideSituation:'',//
marriage:'',//
spouseSituation:'',//
elderlyFlag:null,//:1 :0
elderlyFlag:1,//:1 :0
elderlyRelation:'',//
dependantMobile:'',//
familyInfoRemark:'',//
@ -1143,14 +1143,14 @@ export default {
joinTime:'',//yyyy-MM-dd
positiveTime:'',//yyyy-MM-dd
partyOrgId:'',//
flowFlag:null,//10
flowFlag:1,//10
flowActNum:'',//
partyJob:'',//code
retiredFlag:null,//退10
centerFlag:null,//10
retiredFlag:1,//退10
centerFlag:1,//10
joinBranchName:'',//
joinCommunityTime:'',//yyyy-MM-dd
longHolidayFlag:null,//10
longHolidayFlag:1,//10
},
ensureHouseDto:{//
housingNature:'',//code
@ -1166,7 +1166,7 @@ export default {
employmentNum:'',//
specialSkill:'',//
unemploymentReason:'',//code
employmentHardFlag:null,//10
employmentHardFlag:1,//10
employmentWish:'',//
},
veteranDto:{//退
@ -1179,7 +1179,7 @@ export default {
employmentSituation:'',//
joinWarStartTime:'',//yyyy-MM-dd
joinWarEndTime:'',//yyyy-MM-dd
pubWelfareJobFlag:null,//;10
pubWelfareJobFlag:1,//;10
},
unitedFrontDto:{//
duty:'',//

8
src/views/modules/base/huji/immigration/index.vue

@ -551,10 +551,10 @@ export default {
searchH: 0,
changeRecordShow: false,
pickerOptions: {
disabledDate: time => {
//
return time.getTime() > Date.now() - 8.64e6;
}
// disabledDate: time => {
// //
// return time.getTime() > Date.now() - 8.64e6;
// }
},
};
},

78
src/views/modules/base/smartImport.vue

@ -2,7 +2,25 @@
<div class="g-main">
<div class="m-table">
<div class="u-table-btn1">
<el-dropdown
size="small"
type="primary"
style="margin: 0 10px; height: 30px"
trigger="hover"
>
<el-button type="primary" size="small">
表格导入<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
v-for="(item, index) in resiClass"
:key="index"
@click.native="handleImportType(item.value)"
>
{{ item.label }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-upload
:headers="$getElUploadHeaders()"
ref="upload"
@ -17,24 +35,7 @@
:on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest"
>
<el-dropdown
size="small"
type="primary"
style="margin: 0 10px; height: 30px"
@command="(command) => handleImportType(command)"
trigger="hover"
>
<el-button type="primary">
表格导入<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="(item,index) in resiClass" :key="index" :command="item.value" >{{item.label}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-upload>
></el-upload>
<el-button
class="diy-button--white"
size="small"
@ -151,30 +152,29 @@ export default {
dataList: [
// {
// index: "key1",
// srcField: "value1_from_exist",
// srcField: "",
// exist: true,
// field: "value1_from_exist"
// field: "",
// },
// {
// index: "key2",
// srcField: "value2_from_exist",
// srcField: "",
// exist: true,
// field: "value2_from_exist"
// field: "",
// },
// {
// index: "key3",
// srcField: "value3_from_notExist",
// srcField: "",
// exist: false,
// field: ""
// field: "",
// },
// {
// index: "key4",
// srcField: "value4_from_notExist",
// srcField: "",
// exist: false,
// field: ""
// field: "",
// },
],
dataListLoading: false,
total: 0,
pageSize: 20,
@ -196,7 +196,7 @@ export default {
fileData: null,
resiClass: [],
importType :''
importType: "",
};
},
@ -214,7 +214,7 @@ export default {
async mounted() {
// await this.loadData();
await this.loadPersonGroup();
this.getResident()
this.getResident();
this.sHeight = this.$refs.divEditBtn.offsetHeight + 300;
},
@ -222,7 +222,9 @@ export default {
diaClose() {
this.formShow = false;
},
handleDropdownClick(event) {
event.stopPropagation();
},
async loadPersonGroup() {
const url = "/oper/customize/icformitemgroup/list";
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
@ -284,17 +286,13 @@ export default {
}
},
handleImportType(command) {
this.importType = command
// this.$refs.upload.click();
this.$refs['upload'].$children[0].$refs.input.click()
this.importType = command;
this.$refs["upload"].$children[0].$refs.input.click();
},
handleChangeScope(value) {
// console.log('value', value)
this.orgIdArray = value;
this.scopeList = [];
let selArray = this.$refs["myCascader"].getCheckedNodes();
// console.log('selArray', selArray)
selArray.forEach((element, index) => {
@ -367,6 +365,8 @@ export default {
},
//
handleExcelSuccess(res, file) {
console.log(res, file);
if (!res) return;
if (res.code === 0 && res.msg === "success") {
console.log("resss---ppp", res);
} else {
@ -396,12 +396,12 @@ export default {
}
if (!this.importType) {
this.$message.error('请选择导入的类别')
this.$message.error("请选择导入的类别");
}
return fileType && isLt1M;
},
async uploadHttpRequest(file) {
if(!this.importType) return
if (!this.importType) return;
this.importLoading = true;
this.importBtnTitle = "正在上传中...";
const formData = new FormData(); //FormDataappend('key', value)

Loading…
Cancel
Save