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

统一字段

V1.0
mk 2 years ago
parent
02edd1b788
commit
a06cdf8d06
4 changed files with 45 additions and 40 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. 18
      src/views/modules/communityService/fuwuzhaoren/addForm.vue
  2. 18
      src/views/modules/communityService/gangweizhaoren/addForm.vue
  3. 18
      src/views/modules/communityService/jinengzhaoren/addForm.vue
  4. 31
      src/views/modules/communityService/wennuanzhaoren/addForm.vue

18
src/views/modules/communityService/fuwuzhaoren/addForm.vue
View File

@ -175,7 +175,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务范围" label="服务范围"
prop="objList" prop="gridIdList"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
style="display: block" style="display: block"
@ -449,7 +449,7 @@ export default {
policyId: "", //政策依据 policyId: "", //政策依据
serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
serviceOrgId: "", //服务方Id serviceOrgId: "", //服务方Id
objList: [], // gridIdList: [], //
principalName: "", //经办人(责任人)姓名 principalName: "", //经办人(责任人)姓名
principalContact: "", //经办人联系方式 principalContact: "", //经办人联系方式
serviceTimeStart: "", //服务起始时间yyyy-MM-dd serviceTimeStart: "", //服务起始时间yyyy-MM-dd
@ -482,7 +482,7 @@ export default {
serviceTimeStart: [ serviceTimeStart: [
{ required: true, message: "服务时间不能为空", trigger: "change" }, { required: true, message: "服务时间不能为空", trigger: "change" },
], ],
objList: [ gridIdList: [
{ required: true, message: "服务范围不能为空", trigger: "change" }, { required: true, message: "服务范围不能为空", trigger: "change" },
], ],
resiSearchTagId: [ resiSearchTagId: [
@ -634,7 +634,9 @@ export default {
if (code === 0) { if (code === 0) {
this.formData = { ...data }; this.formData = { ...data };
console.log(this.formData); if(!data.noticeApproches){
this.formData.noticeApproches = [];
}
this.scopeIdArray = data.gridIdList.map(i => i.objectId); this.scopeIdArray = data.gridIdList.map(i => i.objectId);
this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id; this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id;
this.handleChangeServiceTypeLevel1(); this.handleChangeServiceTypeLevel1();
@ -891,7 +893,7 @@ export default {
}, },
handleChangeScope(value) { handleChangeScope(value) {
this.formData.objList = []; this.formData.gridIdList = [];
let selArray = this.$refs["myCascader"].getCheckedNodes(); let selArray = this.$refs["myCascader"].getCheckedNodes();
console.log("handleChangeScope", selArray); console.log("handleChangeScope", selArray);
selArray.forEach((element) => { selArray.forEach((element) => {
@ -900,7 +902,7 @@ export default {
objectId: element.data.objectId, objectId: element.data.objectId,
objectName: element.data.objectName, objectName: element.data.objectName,
}; };
this.formData.objList.push(obj); this.formData.gridIdList.push(obj);
}); });
}, },
@ -919,7 +921,7 @@ export default {
setTimeout(() => { setTimeout(() => {
this.btnDisable = false; this.btnDisable = false;
}, 10000); }, 10000);
this.formData.objList = await this.handleTreeList(); this.formData.gridIdList = await this.handleTreeList();
this.$refs["ref_form"].validate((valid, messageObj) => { this.$refs["ref_form"].validate((valid, messageObj) => {
if (!valid) { if (!valid) {
app.util.validateRule(messageObj); app.util.validateRule(messageObj);
@ -1008,7 +1010,7 @@ export default {
this.formData = { this.formData = {
serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
objList: [], // gridIdList: [], //
principalName: "", //经办人(责任人)姓名 principalName: "", //经办人(责任人)姓名
principalContact: "", //经办人联系方式 principalContact: "", //经办人联系方式
serviceTimeStart: "", //服务起始时间yyyy-MM-dd serviceTimeStart: "", //服务起始时间yyyy-MM-dd

18
src/views/modules/communityService/gangweizhaoren/addForm.vue
View File

@ -175,7 +175,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务范围" label="服务范围"
prop="objList" prop="gridIdList"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
style="display: block" style="display: block"
@ -449,7 +449,7 @@ export default {
policyId: "", //政策依据 policyId: "", //政策依据
serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
serviceOrgId: "", //服务方Id serviceOrgId: "", //服务方Id
objList: [], // gridIdList: [], //
principalName: "", //经办人(责任人)姓名 principalName: "", //经办人(责任人)姓名
principalContact: "", //经办人联系方式 principalContact: "", //经办人联系方式
serviceTimeStart: "", //服务起始时间yyyy-MM-dd serviceTimeStart: "", //服务起始时间yyyy-MM-dd
@ -482,7 +482,7 @@ export default {
serviceTimeStart: [ serviceTimeStart: [
{ required: true, message: "服务时间不能为空", trigger: "change" }, { required: true, message: "服务时间不能为空", trigger: "change" },
], ],
objList: [ gridIdList: [
{ required: true, message: "服务范围不能为空", trigger: "change" }, { required: true, message: "服务范围不能为空", trigger: "change" },
], ],
resiSearchTagId: [ resiSearchTagId: [
@ -634,7 +634,9 @@ export default {
if (code === 0) { if (code === 0) {
this.formData = { ...data }; this.formData = { ...data };
console.log(this.formData); if(!data.noticeApproches){
this.formData.noticeApproches = [];
}
this.scopeIdArray = data.gridIdList.map(i => i.objectId); this.scopeIdArray = data.gridIdList.map(i => i.objectId);
this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id; this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id;
this.handleChangeServiceTypeLevel1(); this.handleChangeServiceTypeLevel1();
@ -891,7 +893,7 @@ export default {
}, },
handleChangeScope(value) { handleChangeScope(value) {
this.formData.objList = []; this.formData.gridIdList = [];
let selArray = this.$refs["myCascader"].getCheckedNodes(); let selArray = this.$refs["myCascader"].getCheckedNodes();
console.log("handleChangeScope", selArray); console.log("handleChangeScope", selArray);
selArray.forEach((element) => { selArray.forEach((element) => {
@ -900,7 +902,7 @@ export default {
objectId: element.data.objectId, objectId: element.data.objectId,
objectName: element.data.objectName, objectName: element.data.objectName,
}; };
this.formData.objList.push(obj); this.formData.gridIdList.push(obj);
}); });
}, },
@ -919,7 +921,7 @@ export default {
setTimeout(() => { setTimeout(() => {
this.btnDisable = false; this.btnDisable = false;
}, 10000); }, 10000);
this.formData.objList = await this.handleTreeList(); this.formData.gridIdList = await this.handleTreeList();
this.$refs["ref_form"].validate((valid, messageObj) => { this.$refs["ref_form"].validate((valid, messageObj) => {
if (!valid) { if (!valid) {
app.util.validateRule(messageObj); app.util.validateRule(messageObj);
@ -1008,7 +1010,7 @@ export default {
this.formData = { this.formData = {
serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
objList: [], // gridIdList: [], //
principalName: "", //经办人(责任人)姓名 principalName: "", //经办人(责任人)姓名
principalContact: "", //经办人联系方式 principalContact: "", //经办人联系方式
serviceTimeStart: "", //服务起始时间yyyy-MM-dd serviceTimeStart: "", //服务起始时间yyyy-MM-dd

18
src/views/modules/communityService/jinengzhaoren/addForm.vue
View File

@ -175,7 +175,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务范围" label="服务范围"
prop="objList" prop="gridIdList"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
style="display: block" style="display: block"
@ -449,7 +449,7 @@ export default {
policyId: "", //政策依据 policyId: "", //政策依据
serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
serviceOrgId: "", //服务方Id serviceOrgId: "", //服务方Id
objList: [], // gridIdList: [], //
principalName: "", //经办人(责任人)姓名 principalName: "", //经办人(责任人)姓名
principalContact: "", //经办人联系方式 principalContact: "", //经办人联系方式
serviceTimeStart: "", //服务起始时间yyyy-MM-dd serviceTimeStart: "", //服务起始时间yyyy-MM-dd
@ -483,7 +483,7 @@ export default {
serviceTimeStart: [ serviceTimeStart: [
{ required: true, message: "服务时间不能为空", trigger: "change" }, { required: true, message: "服务时间不能为空", trigger: "change" },
], ],
objList: [ gridIdList: [
{ required: true, message: "服务范围不能为空", trigger: "change" }, { required: true, message: "服务范围不能为空", trigger: "change" },
], ],
resiSearchTagId: [ resiSearchTagId: [
@ -635,7 +635,9 @@ export default {
if (code === 0) { if (code === 0) {
this.formData = { ...data }; this.formData = { ...data };
console.log(this.formData); if(!data.noticeApproches){
this.formData.noticeApproches = [];
}
this.scopeIdArray = data.gridIdList.map(i => i.objectId); this.scopeIdArray = data.gridIdList.map(i => i.objectId);
this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id; this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id;
this.handleChangeServiceTypeLevel1(); this.handleChangeServiceTypeLevel1();
@ -891,7 +893,7 @@ export default {
}, },
handleChangeScope(value) { handleChangeScope(value) {
this.formData.objList = []; this.formData.gridIdList = [];
let selArray = this.$refs["myCascader"].getCheckedNodes(); let selArray = this.$refs["myCascader"].getCheckedNodes();
console.log("handleChangeScope", selArray); console.log("handleChangeScope", selArray);
selArray.forEach((element) => { selArray.forEach((element) => {
@ -900,7 +902,7 @@ export default {
objectId: element.data.objectId, objectId: element.data.objectId,
objectName: element.data.objectName, objectName: element.data.objectName,
}; };
this.formData.objList.push(obj); this.formData.gridIdList.push(obj);
}); });
}, },
@ -919,7 +921,7 @@ export default {
setTimeout(() => { setTimeout(() => {
this.btnDisable = false; this.btnDisable = false;
}, 10000); }, 10000);
this.formData.objList = await this.handleTreeList(); this.formData.gridIdList = await this.handleTreeList();
this.$refs["ref_form"].validate((valid, messageObj) => { this.$refs["ref_form"].validate((valid, messageObj) => {
if (!valid) { if (!valid) {
app.util.validateRule(messageObj); app.util.validateRule(messageObj);
@ -1008,7 +1010,7 @@ export default {
this.formData = { this.formData = {
serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
objList: [], // gridIdList: [], //
principalName: "", //经办人(责任人)姓名 principalName: "", //经办人(责任人)姓名
principalContact: "", //经办人联系方式 principalContact: "", //经办人联系方式
serviceTimeStart: "", //服务起始时间yyyy-MM-dd serviceTimeStart: "", //服务起始时间yyyy-MM-dd

31
src/views/modules/communityService/wennuanzhaoren/addForm.vue
View File

@ -169,13 +169,13 @@
style="display: block" style="display: block"
> >
<el-checkbox-group v-model="formData.noticeApproches"> <el-checkbox-group v-model="formData.noticeApproches">
<el-checkbox label="sms" value="sms">短信通知</el-checkbox> <el-checkbox label="sms" >短信通知</el-checkbox>
<el-checkbox label="wx_official_account" value="wx_official_account">微信公众号消息通知</el-checkbox> <el-checkbox label="wx_official_account" >微信公众号消息通知</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务范围" label="服务范围"
prop="objList" prop="gridIdList"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
style="display: block" style="display: block"
@ -449,7 +449,7 @@ export default {
policyId: "", //政策依据 policyId: "", //政策依据
serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit serviceOrgType: "", //服务方类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
serviceOrgId: "", //服务方Id serviceOrgId: "", //服务方Id
objList: [], // gridIdList: [], //
principalName: "", //经办人(责任人)姓名 principalName: "", //经办人(责任人)姓名
principalContact: "", //经办人联系方式 principalContact: "", //经办人联系方式
serviceTimeStart: "", //服务起始时间yyyy-MM-dd serviceTimeStart: "", //服务起始时间yyyy-MM-dd
@ -483,7 +483,7 @@ export default {
serviceTimeStart: [ serviceTimeStart: [
{ required: true, message: "服务时间不能为空", trigger: "change" }, { required: true, message: "服务时间不能为空", trigger: "change" },
], ],
objList: [ gridIdList: [
{ required: true, message: "服务范围不能为空", trigger: "change" }, { required: true, message: "服务范围不能为空", trigger: "change" },
], ],
resiSearchTagId: [ resiSearchTagId: [
@ -586,7 +586,7 @@ export default {
if (this.formType === "add") { if (this.formType === "add") {
this.$refs.ref_form.resetFields(); this.$refs.ref_form.resetFields();
} else if (this.formType == "edit") { } else if (this.formType == "edit") {
this.loadInfo(); await this.loadInfo();
} }
await this.iniDefaultData(); await this.iniDefaultData();
@ -635,14 +635,15 @@ export default {
if (code === 0) { if (code === 0) {
this.formData = { ...data }; this.formData = { ...data };
console.log(this.formData); if(!data.noticeApproches){
this.formData.noticeApproches = [];
}
this.scopeIdArray = data.gridIdList.map(i => i.objectId); this.scopeIdArray = data.gridIdList.map(i => i.objectId);
this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id; this.formData.serviceTypeLevel1Id = data.serviceTypeLevel1Id;
this.handleChangeServiceTypeLevel1(); this.handleChangeServiceTypeLevel1();
this.formData.serviceTypeLevel2Id = data.serviceTypeLevel2Id; this.formData.serviceTypeLevel2Id = data.serviceTypeLevel2Id;
this.feedbackFormData = { ...data.feedback }; this.feedbackFormData = { ...data.feedback };
await this.getServiceuserList(data.serviceOrgType); await this.getServiceuserList(data.serviceOrgType);
await this.getTagName(); await this.getTagName();
// this.fileList = [] // this.fileList = []
// if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) { // if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
@ -772,7 +773,6 @@ export default {
}, },
async iniDefaultData() { async iniDefaultData() {
const { defaultData } = this; const { defaultData } = this;
console.log("iniDefaultData3", defaultData);
if (defaultData) { if (defaultData) {
const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData; const { serviceOrgType, serviceOrgId, scopeIdArray } = defaultData;
if (serviceOrgType) { if (serviceOrgType) {
@ -784,8 +784,8 @@ export default {
} }
if (scopeIdArray) { if (scopeIdArray) {
this.scopeIdArray = scopeIdArray; this.scopeIdArray = scopeIdArray;
await nextTick(); // await nextTick();
this.handleChangeScope(); // this.handleChangeScope();
} }
} }
}, },
@ -891,16 +891,15 @@ export default {
}, },
handleChangeScope(value) { handleChangeScope(value) {
this.formData.objList = []; this.formData.gridIdList = [];
let selArray = this.$refs["myCascader"].getCheckedNodes(); let selArray = this.$refs["myCascader"].getCheckedNodes();
console.log("handleChangeScope", selArray);
selArray.forEach((element) => { selArray.forEach((element) => {
let obj = { let obj = {
objectType: element.data.objectType, objectType: element.data.objectType,
objectId: element.data.objectId, objectId: element.data.objectId,
objectName: element.data.objectName, objectName: element.data.objectName,
}; };
this.formData.objList.push(obj); this.formData.gridIdList.push(obj);
}); });
}, },
@ -919,7 +918,7 @@ export default {
setTimeout(() => { setTimeout(() => {
this.btnDisable = false; this.btnDisable = false;
}, 10000); }, 10000);
this.formData.objList = await this.handleTreeList(); this.formData.gridIdList = await this.handleTreeList();
this.$refs["ref_form"].validate((valid, messageObj) => { this.$refs["ref_form"].validate((valid, messageObj) => {
if (!valid) { if (!valid) {
app.util.validateRule(messageObj); app.util.validateRule(messageObj);
@ -1008,7 +1007,7 @@ export default {
this.formData = { this.formData = {
serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id serviceTypeLevel2Id: "", // 公共服务（政策级别）二级分类id
objList: [], // gridIdList: [], //
principalName: "", //经办人(责任人)姓名 principalName: "", //经办人(责任人)姓名
principalContact: "", //经办人联系方式 principalContact: "", //经办人联系方式
serviceTimeStart: "", //服务起始时间yyyy-MM-dd serviceTimeStart: "", //服务起始时间yyyy-MM-dd

Write Preview
Loading…
Cancel
Save