-
+
-
+
+
+
重置
+
+
+ {{ showSercahStatus ? "收起" : "展开" }}
+
-
@@ -551,7 +570,7 @@ import { requestPost } from "@/js/dai/request";
import {
genderList,
binaryOptionList,
- healthyStatusList,
+ healthStatusList,
} from "@/js/columns/constants";
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
@@ -587,11 +606,11 @@ export default {
tableLoading: false,
user: {},
agencyId: "",
- searchH: 170,
+ searchH: 130,
tableData: [],
genderList,
binaryOptionList,
- healthyStatusList,
+ healthStatusList,
formData: {
name: "",
mobile: "",
@@ -600,7 +619,7 @@ export default {
birthdayEnd: "",
currentResidence: "",
cultureLevel: "",
- healthyStatus: null,
+ healthStatus: null,
unemploymentTimeStart: "",
unemploymentTimeEnd: "",
unemploymentNum: "",
@@ -635,6 +654,8 @@ export default {
multiSelection: [], // 多选结果
importLoading: false,
+ showSercahStatus:false,
+
dicts: {
educationList: [],
nationList: [],
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index b34b0a56d..e51869fe3 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -465,7 +465,7 @@ export default {
tableLoading: false,
user: {},
agencyId: "",
- searchH: 170,
+ searchH: 120,
tableData: [],
statusArray: [
diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue
index ea76456e5..e917360ca 100644
--- a/src/views/modules/communityService/gxxq/addForm.vue
+++ b/src/views/modules/communityService/gxxq/addForm.vue
@@ -101,7 +101,6 @@
{{ formData.resiSearchTagName }}
-
按标签查找
@@ -304,19 +303,18 @@ export default {
if (this.newFormData.serviceTimeStart) {
let serviceTimeStart = new Date(this.newFormData.serviceTimeStart);
return (
- time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
- time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
+ time.getTime() < serviceTimeStart - 24 * 60 * 60 * 1000 ||
+ time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
);
} else {
- return (time.getTime() > nowData || time.getTime() === nowData) ;
+ return time.getTime() > nowData || time.getTime() === nowData;
}
};
let startDisabledDate = (time) => {
//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now() - 24 * 60 * 60 * 1000;
- return (time.getTime() < nowData ||
- time.getTime() === nowData);
+ return time.getTime() < nowData || time.getTime() === nowData;
};
return {
@@ -349,13 +347,13 @@ export default {
content: "", //
},
endPickerOptions: {
- disabledDate: endDisabledDate
- },
- startPickerOptions: {
- disabledDate: startDisabledDate
- },
+ disabledDate: endDisabledDate,
+ },
+ startPickerOptions: {
+ disabledDate: startDisabledDate,
+ },
newFormData: {
- noticeApproches: [],//服务范围
+ noticeApproches: [], //服务范围
serviceScopeList: [], //通知服务方
serviceTimeStart: "", //服务起始时间yyyy-MM-dd
serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
@@ -374,6 +372,9 @@ export default {
{ required: true, message: "详细说明不能为空", trigger: "bulr" },
{ max: 1000, message: "不能超出1000个字符", trigger: "blur" },
],
+ resiSearchTagId: [
+ { required: false, message: "指派人员不能为空", trigger: "bulr" },
+ ],
},
newDataRule: {
serverOrgId: [
@@ -403,8 +404,14 @@ export default {
this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
}
},
+ "formData.assignFlag"(newValue) {
+ if (newValue === 1) {
+ this.dataRule.resiSearchTagId[0].required = true;
+ } else {
+ this.dataRule.resiSearchTagId[0].required = false;
+ }
+ },
},
-
components: { labelForm },
created() {},
async mounted() {
@@ -447,21 +454,21 @@ export default {
this.formData.commonServiceTypeId = data.commonServiceTypeId;
this.formData.title = data.title;
this.formData.content = data.content;
- this.formData.assignFlag = data.assignFlag
+ this.formData.assignFlag = data.assignFlag;
this.formData.resiSearchTagId = data.resiSearchTagId;
- if( data.assignInfo){
- this.newFormData.serviceTimeStart = data.assignInfo.serviceTimeStart;
- this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd;
- this.newFormData.serverOrgType = data.assignInfo.serverOrgType;
- this.newFormData.serverOrgId = data.assignInfo.serverOrgId;
- this.newFormData.noticeApproches = data.assignInfo.noticeApproches;
-
- for (let i in data.assignInfo.serviceScopeList) {
- this.newFormData.serviceScopeList.push(
- data.assignInfo.serviceScopeList[i].objectId
- );
- }
- await this.getServiceuserList(data.assignInfo.serverOrgType);
+ if (data.assignInfo) {
+ this.newFormData.serviceTimeStart = data.assignInfo.serviceTimeStart;
+ this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd;
+ this.newFormData.serverOrgType = data.assignInfo.serverOrgType;
+ this.newFormData.serverOrgId = data.assignInfo.serverOrgId;
+ this.newFormData.noticeApproches = data.assignInfo.noticeApproches;
+
+ for (let i in data.assignInfo.serviceScopeList) {
+ this.newFormData.serviceScopeList.push(
+ data.assignInfo.serviceScopeList[i].objectId
+ );
+ }
+ await this.getServiceuserList(data.assignInfo.serverOrgType);
}
await this.handleChangeServiceTypeLevel1();
await // this.formData = { ...data };
@@ -511,8 +518,8 @@ export default {
},
// 如果服务方有选择第一个的话让它更新
handleChangeServiceTypeLevel2() {
- if (this.formData.assignInfo.serviceOrgType) {
- this.getServiceuserList(this.formData.assignInfo.serviceOrgType);
+ if (this.newFormData.serverOrgType) {
+ this.getServiceuserList(this.newFormData.serverOrgType);
} else {
return;
}
@@ -590,11 +597,7 @@ export default {
},
async getServiceuserList(serverOrgType) {
- if (!serverOrgType) return false;
- if (this.formData.commonServiceTypeId == "") {
- this.$message.error("请先选择需求类别!");
- return;
- }
+ if (this.formData.commonServiceTypeId == "" || !serverOrgType) return;
const url = "/actual/base/serviceitem/listServerOrg";
let params = {
serviceTypeId: this.formData.commonServiceTypeId,
@@ -619,24 +622,24 @@ export default {
++this.iscascaderShow;
this.casOptions = [];
this.scopeIdArray = [];
- await this.handleData(data.children)
+ await this.handleData(data.children);
this.casOptions.push(data);
} else {
this.$message.error(rspMsg);
}
},
//子级为空数组的赋值为null解决有空白页的问题
- handleData(data){
- for(let i=0;i {
if (typeof item != "string") {
arr.push(item);
}
});
-
- this.newFormData.serviceScopeList = arr;
- var url = "";
- var params = {};
- if (this.formType == "edit") {
+
+ this.newFormData.serviceScopeList = arr;
+
+ let params = {
+ title: this.formData.title,
+ content: this.formData.content,
+ commonServiceTypeId: this.formData.commonServiceTypeId,
+ resiSearchTagId: this.formData.resiSearchTagId,
+ assignFlag: this.formData.assignFlag,
+ };
+
+ if (this.formData.assignFlag === 1) {
+ params.assignInfo = this.newFormData;
+ }
+
+ let url = "/governance/commonDemand/save";
+ if (this.formType === "edit") {
url = "/governance/commonDemand/update";
- params = {
- title: this.formData.title,
- content: this.formData.content,
- commonServiceTypeId: this.formData.commonServiceTypeId,
- resiSearchTagId: this.formData.resiSearchTagId,
- assignFlag: this.formData.assignFlag,
- assignInfo: this.newFormData,
- id: this.scopeId,
- };
- if(this.formData.assignFlag!=1){
- delete params.assignInfo
- }
- } else {
- url = "/governance/commonDemand/save";
- params = {
- title: this.formData.title,
- content: this.formData.content,
- commonServiceTypeId: this.formData.commonServiceTypeId,
- resiSearchTagId: this.formData.resiSearchTagId,
- assignFlag: this.formData.assignFlag,
- assignInfo: this.newFormData,
- };
- if(this.formData.assignFlag!=1){
- delete params.assignInfo
- }
+ params.id = this.scopeId;
}
- // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
+
console.log(params);
- const { data, code, msg } = await requestPost(url, params);
-
- if (code === 0) {
- this.$message.success("添加成功");
- this.resetData();
- this.$emit("handleComfirm");
- } else if(code>=8000){
- this.$message.error(msg);
- }
+ const { data, code, msg } = await requestPost(url, params);
+
+ if (code === 0) {
+ this.$message.success("添加成功");
+ this.resetData();
+ this.$emit("handleComfirm");
+ } else if (code >= 8000) {
+ this.$message.error(msg);
+ }
},
handleCancle() {
diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
index c99d69edf..9bf15fc88 100644
--- a/src/views/modules/communityService/gxxq/index.vue
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -24,7 +24,7 @@
>
- --
+
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 3ec485b08..2e11ec813 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -913,8 +913,8 @@ export default {
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight() {
- const h = this.clientHeight - this.searchH - 450 + this.iframeHeigh;
- const _h = this.clientHeight - 450 - this.searchH;
+ const h = this.clientHeight - this.searchH - 445 + this.iframeHeigh;
+ const _h = this.clientHeight - 445 - this.searchH;
return this.$store.state.inIframe ? h : _h;
},
},