elink-star
/
epmet-work-pc
17
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复12345事件的若干问题

V1.0
luyan 2 years ago
parent
e52d120ba6
commit
4badee9c45
8 changed files with 643 additions and 769 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 251
      src/views/modules/base/huji/immigration/edit.vue
  2. 2
      src/views/modules/shequzhili/event/cpts/add.vue
  3. 2
      src/views/modules/shequzhili/event/cpts/event-detail.vue
  4. 4
      src/views/modules/shequzhili/event/cpts/myCascader.vue
  5. 11
      src/views/modules/shequzhili/event/cpts/process-form-designate.vue
  6. 17
      src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue
  7. 6
      src/views/modules/shequzhili/event/cpts/process-form-replay.vue
  8. 21
      src/views/modules/shequzhili/event/eventList.vue

251
src/views/modules/base/huji/immigration/edit.vue
View File

@ -1,107 +1,52 @@
<template> <template>
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<el-form ref="ref_form" <el-form ref="ref_form" :inline="true" :model="fmData" :rules="dataRule" label-width="150px"
:inline="true"
:model="fmData"
:rules="dataRule"
label-width="150px"
class="g-edit-form"> class="g-edit-form">
<el-form-item label="所属网格 " <el-form-item label="所属网格 " prop="gridId" style="display: block">
prop="gridId" <el-select v-model.trim="fmData.gridId" placeholder="请选择" size="small" clearable
style="display: block"> class="u-edit-width-normal" :disabled="formType === 'edit'" @change="handleChangeGrid">
<el-select v-model.trim="fmData.gridId" <el-option v-for="item in optionsG" :key="item.value" :label="item.label" :value="item.value">
placeholder="请选择"
size="small"
clearable
class="u-edit-width-normal"
:disabled="formType === 'edit'"
@change="handleChangeGrid">
<el-option v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属房屋 " <el-form-item label="所属房屋 " prop="homeId" style="display: block">
prop="homeId"
style="display: block">
<div> <div>
<el-select v-model.trim="fmData.villageId" <el-select v-model.trim="fmData.villageId" placeholder="请选择小区" size="small" clearable
placeholder="请选择小区" class="u-edit-width-normal" @clear="handleClearVillage" @change="handleChangeV"
size="small"
clearable
class="u-edit-width-normal"
@clear="handleClearVillage"
@change="handleChangeV"
:disabled="formType === 'edit'"> :disabled="formType === 'edit'">
<el-option v-for="item in optionsV" <el-option v-for="item in optionsV" :key="item.value" :label="item.label" :value="item.value">
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div> <div>
<el-select v-model.trim="fmData.buildId" <el-select v-model.trim="fmData.buildId" placeholder="楼号" size="small" clearable
placeholder="楼号" class="u-edit-width-build" :disabled="changeVDisabled || formType === 'edit'"
size="small" @clear="handleClearBuild" @change="handleChangeB">
clearable <el-option v-for="item in optionsB" :key="item.value" :label="item.label" :value="item.value">
class="u-edit-width-build"
:disabled="changeVDisabled || formType === 'edit'"
@clear="handleClearBuild"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model.trim="fmData.unitId" <el-select v-model.trim="fmData.unitId" :disabled="changeBDisabled || formType === 'edit'"
:disabled="changeBDisabled || formType === 'edit'" placeholder="单元" size="small" clearable style="margin-left: 10px;" class="u-edit-width-build"
placeholder="单元" @click="handleClearDan" @change="handleChangeD">
size="small" <el-option v-for="item in optionsD" :key="item.value" :label="item.label" :value="item.value">
clearable
style="margin-left: 10px;"
class="u-edit-width-build"
@click="handleClearDan"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-model.trim="fmData.homeId" <el-select v-model.trim="fmData.homeId" :disabled="changeDDisabled || formType === 'edit'"
:disabled="changeDDisabled || formType === 'edit'" placeholder="房号" size="small" clearable @change="handleChangeH" style="margin-left: 10px;"
placeholder="房号"
size="small"
clearable
@change="handleChangeH"
style="margin-left: 10px;"
class="u-edit-width-build"> class="u-edit-width-build">
<el-option v-for="item in optionsH" <el-option v-for="item in optionsH" :key="item.value" :label="item.label" :value="item.value">
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="姓名" <el-form-item label="姓名" prop="name" style="display: block">
prop="name" <el-input class="u-edit-width-normal" style="margin-right: 20px" placeholder="请输入姓名 "
style="display: block"> v-model="fmData.name" :disabled="formType === 'edit'" maxlength="30">
<el-input class="u-edit-width-normal"
style="margin-right: 20px"
placeholder="请输入姓名 "
v-model="fmData.name"
:disabled="formType === 'edit'"
maxlength="30">
</el-input> </el-input>
<div> <div>
<!-- <el-checkbox v-model="fmData.isWelfare" <!-- <el-checkbox v-model="fmData.isWelfare"
@ -109,143 +54,74 @@
false-label="0">享受福利</el-checkbox> --> false-label="0">享受福利</el-checkbox> -->
<template v-if="formType === 'edit'"> <template v-if="formType === 'edit'">
<el-checkbox v-model="fmData.isCheck" <el-checkbox v-model="fmData.isCheck" true-label="1" false-label="0" :disabled="initCheck == 1"
true-label="1"
false-label="0"
:disabled="initCheck == 1"
@change="checkResiAvailable">补充居民信息</el-checkbox> @change="checkResiAvailable">补充居民信息</el-checkbox>
</template> </template>
<el-checkbox v-else <el-checkbox v-else v-model="fmData.isCheck" true-label="1" false-label="0"
v-model="fmData.isCheck"
true-label="1"
false-label="0"
@change="checkResiAvailable">补充居民信息</el-checkbox> @change="checkResiAvailable">补充居民信息</el-checkbox>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="联系电话" <el-form-item label="联系电话" prop="mobile" style="display: block">
prop="mobile" <el-input class="u-edit-width-normal" type="number" maxlength="11" show-word-limit
style="display: block"> placeholder="请输入联系电话 " :disabled="formType === 'edit'" v-model="fmData.mobile">
<el-input class="u-edit-width-normal"
type="number"
maxlength="11"
show-word-limit
placeholder="请输入联系电话 "
:disabled="formType === 'edit'"
v-model="fmData.mobile">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="证件号" <el-form-item label="证件号" prop="idCard" style="display: block">
prop="idCard" <el-input class="u-edit-width-normal" placeholder="请输入证件号或护照号" v-model="fmData.idCard"
style="display: block"> :disabled="formType === 'edit'" @blur="handleBlurId"></el-input>
<el-input class="u-edit-width-normal"
placeholder="请输入证件号或护照号"
v-model="fmData.idCard"
:disabled="formType === 'edit'"
@blur="handleBlurId"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="性别" <el-form-item label="性别" prop="principalName" style="display: block">
prop="principalName" <el-select v-model.trim="fmData.gender" placeholder="性别" size="small" clearable
style="display: block"> class="u-edit-width-normal" :disabled="true">
<el-select v-model.trim="fmData.gender" <el-option v-for="item in optionsGender" :key="item.value" :label="item.label" :value="item.value">
placeholder="性别"
size="small"
clearable
class="u-edit-width-normal"
:disabled="true">
<el-option v-for="item in optionsGender"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="年龄" <el-form-item label="年龄" prop="age" style="display: block">
prop="age" <el-input class="u-edit-width-normal" type="number" show-word-limit placeholder="请输入"
style="display: block"> v-model="fmData.age" :disabled="true">
<el-input class="u-edit-width-normal"
type="number"
show-word-limit
placeholder="请输入"
v-model="fmData.age"
:disabled="true">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="迁入日期" <el-form-item label="迁入日期" prop="inTime" style="display: block">
prop="inTime" <el-date-picker v-model="fmData.inTime" type="date" placeholder="迁入时间" value-format="yyyy-MM-dd"
style="display: block"> class="u-edit-width-normal" :disabled="formType === 'edit'">
<el-date-picker v-model="fmData.inTime"
type="date"
placeholder="迁入时间"
value-format="yyyy-MM-dd"
class="u-edit-width-normal"
:disabled="formType === 'edit'">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="迁入原因" <el-form-item label="迁入原因" prop="inReason" style="display: block">
prop="inReason" <el-input type="textarea" class="u-edit-width-normal" placeholder="请输入迁入原因" v-model="fmData.inReason">
style="display: block">
<el-input type="textarea"
class="u-edit-width-normal"
placeholder="请输入迁入原因"
v-model="fmData.inReason">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="来源地" <el-form-item label="来源地" prop="sourceAddress" style="display: block">
prop="sourceAddress"
style="display: block">
<el-cascader ref="nowArea" <el-cascader ref="nowArea" class="u-edit-width-normal" :props="areaProps" v-model="nowAllCode" clearable
class="u-edit-width-normal"
:props="areaProps"
v-model="nowAllCode"
clearable
@change="handleNowArea"></el-cascader> @change="handleNowArea"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="详细地址" <el-form-item label="详细地址" prop="address" style="display: block">
prop="address" <el-input class="u-edit-width-normal" placeholder="请输入详细地址" v-model="fmData.address">
style="display: block">
<el-input class="u-edit-width-normal"
placeholder="请输入详细地址"
v-model="fmData.address">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="迁移证号码" <el-form-item label="迁移证号码" prop="moveNumber" style="display: block">
prop="moveNumber" <el-input class="u-edit-width-normal" placeholder="请输入迁移证号码" v-model="fmData.moveNumber">
style="display: block">
<el-input class="u-edit-width-normal"
placeholder="请输入迁移证号码"
v-model="fmData.moveNumber">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="户主姓名" <el-form-item label="户主姓名" prop="householderName" style="display: block">
prop="householderName" <el-input class="u-edit-width-normal" placeholder="请输入户主姓名" v-model="fmData.householderName">
style="display: block">
<el-input class="u-edit-width-normal"
placeholder="请输入户主姓名"
v-model="fmData.householderName">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="与户主关系" <el-form-item label="与户主关系" prop="householderRelation" style="display: block">
prop="householderRelation" <el-select v-model.trim="fmData.householderRelation" placeholder="与户主关系" size="small" clearable
style="display: block">
<el-select v-model.trim="fmData.householderRelation"
placeholder="与户主关系"
size="small"
clearable
class="u-edit-width-normal"> class="u-edit-width-normal">
<el-option v-for="item in optionsRelation" <el-option v-for="item in optionsRelation" :key="item.value" :label="item.label"
:key="item.value"
:label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
@ -253,13 +129,9 @@
</el-form> </el-form>
</div> </div>
<div class="m-edit-btn"> <div class="m-edit-btn">
<el-button size="small" <el-button size="small" @click="handleCancle">取 消</el-button>
@click="handleCancle">取 消</el-button> <el-button type="primary" size="small" class="diy-button--blue" :disabled="btnDisable" @click="handleComfirm">保
<el-button type="primary" 存</el-button>
size="small"
class="diy-button--blue"
:disabled="btnDisable"
@click="handleComfirm">保 存</el-button>
</div> </div>
</div> </div>
</template> </template>
@ -407,9 +279,9 @@ export default {
} = this } = this
if (isCard(idCard)) { if (isCard(idCard)) {
const { data, code, msg } = await requestPost( const { data, code, msg } = await requestPost(
'/epmetuser/icresiuser/checkuser', '/actual/base/residentBaseInfo/getresicount',
{ {
idCard, idNum: idCard,
agencyId: this.$store.state.user.agencyId agencyId: this.$store.state.user.agencyId
} }
) )
@ -636,12 +508,13 @@ export default {
}) })
}, },
//咨询了文蕾，这个位置好像不需要查询居民
getHouseMaster() { getHouseMaster() {
const { homeId } = this.fmData const { homeId } = this.fmData
if (!homeId) return (this.alreadyHaveMaster = false) if (!homeId) return (this.alreadyHaveMaster = false)
const params = this.fmData
this.$http this.$http
.post('/epmetuser/icresiuser/queryhousehold/' + homeId, {}) .post('/actual/base/residentBaseInfo/getResiUserInfoListByHouseInfo' , params)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)

2
src/views/modules/shequzhili/event/cpts/add.vue
View File

@ -18,7 +18,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工单号" prop="workOrderNum" label-width="150px" style="display: block"> <el-form-item label="工单号" prop="workOrderNum" label-width="150px" style="display: block">
<el-input class="cell-width-1" maxlength="10" placeholder="请输入工单号" v-model="formData.workOrderNum" /> <el-input class="cell-width-1" maxlength="30" placeholder="请输入工单号" v-model="formData.workOrderNum" />
</el-form-item> </el-form-item>
<el-form-item label="接收时间" prop="happenTime" label-width="150px" style="display: block"> <el-form-item label="接收时间" prop="happenTime" label-width="150px" style="display: block">
<el-date-picker v-model="formData.happenTime" class="cell-width-1" type="datetime" <el-date-picker v-model="formData.happenTime" class="cell-width-1" type="datetime"

2
src/views/modules/shequzhili/event/cpts/event-detail.vue
View File

@ -85,7 +85,7 @@
<el-radio-group :class="{ 'form-item': source === 'visiual' }" v-model="satisfyLevel" <el-radio-group :class="{ 'form-item': source === 'visiual' }" v-model="satisfyLevel"
@change="clickSatisfy"> @change="clickSatisfy">
<el-radio label="good">满意</el-radio> <el-radio label="good">满意</el-radio>
<el-radio label="perfect">基本满意</el-radio> <el-radio label="perfect">非常满意</el-radio>
<el-radio label="bad">不满意</el-radio> <el-radio label="bad">不满意</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>

4
src/views/modules/shequzhili/event/cpts/myCascader.vue
View File

@ -18,8 +18,9 @@ export default {
selCategoryArray: {} selCategoryArray: {}
}, },
selCateObj: {}, selCateObj: {},
iscascaderShow: 0 iscascaderShow: 0,
}; };
}, },
props: { props: {
casOptions: { casOptions: {
@ -39,7 +40,6 @@ export default {
} else { } else {
this.selCateObj = {} this.selCateObj = {}
} }
this.$emit('handleChangeCate', this.selCateObj) this.$emit('handleChangeCate', this.selCateObj)
} }
}, },

11
src/views/modules/shequzhili/event/cpts/process-form-designate.vue
View File

@ -102,6 +102,9 @@ export default {
], ],
timeLimit: [ timeLimit: [
{ required: true, message: "办结时限不能为空", trigger: "blur" }, { required: true, message: "办结时限不能为空", trigger: "blur" },
],
categoryList: [
{ required: true, message: '事件分类不能为空', trigger: 'blur' },
] ]
}, },
selCateObj: { selCateObj: {
@ -140,9 +143,9 @@ export default {
this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
// 这一步接收到eventDetailCopy在这里回填 // 这一步接收到eventDetailCopy在这里回填
if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) { if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
this.selCateObj.id = this.eventDetailCopy.categoryId this.selCategoryArray = this.eventDetailCopy.parentCategoryId.split(",");
this.formData.categoryId = this.eventDetailCopy.categoryId this.selCategoryArray.push(this.eventDetailCopy.categoryId);
this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId) this.handleChangeCate(this.selCategoryArray)
} }
} }
}, },
@ -189,8 +192,8 @@ export default {
handleChangeCate() { handleChangeCate() {
if (this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]) { if (this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]) {
this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
this.formData.categoryList = this.selCateObj
this.formData.categoryId = this.selCateObj.id this.formData.categoryId = this.selCateObj.id
console.log(this.formData.categoryId, 'this.formData.categoryId');
} else { } else {
this.selCateObj = {} this.selCateObj = {}
} }

17
src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue
View File

@ -73,7 +73,7 @@ export default {
{ required: true, message: '回复内容不能为空', trigger: 'blur' }, { required: true, message: '回复内容不能为空', trigger: 'blur' },
], ],
categoryList: [ categoryList: [
// { required: true, message: '事件分类不能为空', trigger: 'blur' }, { required: true, message: '事件分类不能为空', trigger: 'blur' },
] ]
} }
}; };
@ -107,8 +107,9 @@ export default {
this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
// 这一步接收到eventDetailCopy在这里回填 // 这一步接收到eventDetailCopy在这里回填
if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) { if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
this.formData.categoryId = this.eventDetailCopy.categoryId this.selCategoryArray = this.eventDetailCopy.parentCategoryId.split(",");
this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId) this.selCategoryArray.push(this.eventDetailCopy.categoryId);
this.handleChangeCate(this.selCategoryArray)
} }
} }
}, },
@ -128,9 +129,19 @@ export default {
this.$message.error(msg); this.$message.error(msg);
} }
}, },
buildTree(nodes, treeId) {
nodes.forEach(item => {
if (treeId === item.id) {
return item;
} else {
this.buildTree(item.children, treeId)
}
})
},
handleChangeCate() { handleChangeCate() {
if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) { if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) {
this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data
this.formData.categoryList = this.selCateObj
} else { } else {
this.selCateObj = {} this.selCateObj = {}
} }

6
src/views/modules/shequzhili/event/cpts/process-form-replay.vue
View File

@ -62,7 +62,7 @@ export default {
{ required: true, message: '回复内容不能为空', trigger: 'blur' }, { required: true, message: '回复内容不能为空', trigger: 'blur' },
], ],
categoryList: [ categoryList: [
// { required: true, message: '事件分类不能为空', trigger: 'blur' }, { required: true, message: '事件分类不能为空', trigger: 'blur' },
], ],
timeLimit: [ timeLimit: [
{ required: true, message: "办结时限不能为空", trigger: "blur" }, { required: true, message: "办结时限不能为空", trigger: "blur" },
@ -101,7 +101,6 @@ export default {
this.getCategoryList(); this.getCategoryList();
if (this.eventId) { if (this.eventId) {
this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
console.log('this.eventDetailCopy', this.eventDetailCopy);
let value = this.eventDetailCopy.parentCategoryId.split(","); let value = this.eventDetailCopy.parentCategoryId.split(",");
value.push(this.eventDetailCopy.categoryId); value.push(this.eventDetailCopy.categoryId);
this.handleChangeCate(value) this.handleChangeCate(value)
@ -131,7 +130,6 @@ export default {
}); });
let node = this.buildTree(this.casOptions, this.eventDetailCopy.categoryId); let node = this.buildTree(this.casOptions, this.eventDetailCopy.categoryId);
this.selCategoryArray.push(node); this.selCategoryArray.push(node);
console.log(this.selCategoryArray);
} }
}, },
buildTree(nodes, treeId) { buildTree(nodes, treeId) {
@ -146,6 +144,7 @@ export default {
handleChangeCate(value) { handleChangeCate(value) {
if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) { if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) {
this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data
this.formData.categoryList = this.selCateObj
} else { } else {
this.selCateObj = {} this.selCateObj = {}
} }
@ -181,6 +180,7 @@ export default {
} }
this.formData.categoryList = []; this.formData.categoryList = [];
this.formData.categoryList.push(this.selCateObj); this.formData.categoryList.push(this.selCateObj);
this.formData.categoryId = this.selCateObj.id
this.okflag = true; this.okflag = true;
} }
}); });

21
src/views/modules/shequzhili/event/eventList.vue
View File

@ -270,26 +270,10 @@ export default {
}, },
], ],
qudaoArray: [ qudaoArray: [
// {
// value: "0",
// label: "随手拍/随时讲",
// },
// {
// value: "1",
// label: "多媒体反应",
// },
// {
// value: "2",
// label: "社区电话",
// },
{ {
value: "3", value: "3",
label: "12345", label: "12345",
}, }
// {
// value: "4",
// label: "网络员手持终端",
// },
], ],
formData: { formData: {
@ -654,6 +638,9 @@ export default {
}, },
async getTableData() { async getTableData() {
const url = "/governance/icEvent/list"; const url = "/governance/icEvent/list";
if (this.eventTypeCheck) {
this.formData.secondIdList = this.eventTypeCheck
}
const { pageSize, pageNo, formData } = this; const { pageSize, pageNo, formData } = this;
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
pageSize, pageSize,

Write Preview
Loading…
Cancel
Save