Browse Source

bug#368

feature
mk 2 years ago
parent
commit
d78cbb2d6f
  1. 89
      src/views/modules/communityService/commonDemand/addForm.vue
  2. 1366
      src/views/modules/communityService/commonDemand/editForm.vue

89
src/views/modules/communityService/commonDemand/addForm.vue

@ -197,22 +197,30 @@
</el-form-item>
<el-form-item label="指派服务" label-width="150px">
<el-switch v-model="formData.assignSwitch" @change="handelDisabledRules"> </el-switch>
<el-switch
v-model="formData.assignSwitch"
@change="handelDisabledRules"
>
</el-switch>
</el-form-item>
<el-form-item
label="查找享受服务人员"
prop="resiSearchTagId"
:class="{ 'form-item': source === 'visiual' }"
label-width="150px"
label-width="150px"
style="display: block"
v-if="formData.assignSwitch"
>
<input type="text" v-model="formData.resiSearchTagId" v-show="false">
<template v-if="formData.resiSearchTagName">
<el-tag @close="handleCloseTag" closable style="margin-right:10px;">
{{ formData.resiSearchTagName }}
</el-tag>
<input
type="text"
v-model="formData.resiSearchTagId"
v-show="false"
/>
<template v-if="formData.resiSearchTagName">
<el-tag @close="handleCloseTag" closable style="margin-right: 10px">
{{ formData.resiSearchTagName }}
</el-tag>
</template>
<el-button type="primary" @click="handleClickLabel" size="mini">
@ -344,7 +352,7 @@
prop="serviceStatus"
>
<span>已完成</span> -->
<!-- <el-select class="item_width_1"
<!-- <el-select class="item_width_1"
v-model="feedbackFormData.serviceStatus"
placeholder="全部"
clearable>
@ -384,7 +392,7 @@
label-width="150px"
style="display: block"
>
<el-input
<el-input
class="item_width_1"
type="textarea"
maxlength="1000"
@ -392,7 +400,6 @@
:rows="3"
v-model="feedbackFormData.serviceGoal"
></el-input>
</el-form-item>
<!-- <el-form-item label="详细位置" label-width="150px">
<el-input
@ -574,11 +581,11 @@ export default {
if (this.formData.serviceTimeStart) {
let serviceTimeStart = new Date(this.formData.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) => {
@ -587,7 +594,6 @@ export default {
return time.getTime() < nowData;
};
return {
//
serviceTypesLevel1: [],
@ -613,8 +619,8 @@ export default {
serviceTypeLevel2Id: "", // id
serviceCategoryKey: "",
assignSwitch: false,
resiSearchTagId:"",//
resiSearchTagName:"",//
resiSearchTagId: "", //
resiSearchTagName: "", //
serviceName: "", //
serviceOrgType: "", // community_org ic_user_volunteer party_unit
serviceOrgId: "", //Id
@ -689,7 +695,6 @@ export default {
},
computed: {
feedbackDataRule() {
return {
// serviceGoal: [
@ -711,9 +716,9 @@ export default {
address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
};
},
dataRule(){
return {
serviceTypeLevel2Id: [
dataRule() {
return {
serviceTypeLevel2Id: [
{ required: true, message: "政策类型不能为空", trigger: "change" },
],
serviceName: [
@ -729,11 +734,14 @@ export default {
objList: [
{ required: true, message: "服务范围不能为空", trigger: "change" },
],
resiSearchTagId:[
{ required: true, message: "享受服务人员不能为空", trigger: "change" }
]
}
resiSearchTagId: [
{
required: true,
message: "享受服务人员不能为空",
trigger: "change",
},
],
};
},
},
@ -787,12 +795,18 @@ export default {
},
methods: {
handelDisabledRules(v){
if(!v){
delete this.dataRule.resiSearchTagId
}else{
var arr = [{ required: true, message: "享受服务人员不能为空", trigger: "change" }]
this.dataRule.resiSearchTagId = arr
handelDisabledRules(v) {
if (!v) {
delete this.dataRule.resiSearchTagId;
} else {
var arr = [
{
required: true,
message: "享受服务人员不能为空",
trigger: "change",
},
];
this.dataRule.resiSearchTagId = arr;
}
console.log(this.dataRule);
},
@ -840,9 +854,9 @@ export default {
addFormCancle() {
this.showLabelForm = false;
},
handleCloseTag(){
this.formData.resiSearchTagId ='';
this.formData.resiSearchTagName = '';
handleCloseTag() {
this.formData.resiSearchTagId = "";
this.formData.resiSearchTagName = "";
},
async iniDefaultData() {
const { defaultData } = this;
@ -1062,7 +1076,12 @@ export default {
} else {
this.formData.feedback = null;
}
this.formData.resiSearchTagId = this.assignSwitch
? this.formData.resiSearchTagId
: "";
this.formData.resiSearchTagName = this.assignSwitch
? this.formData.resiSearchTagName
: "";
console.log(this.formData);
// return false
const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //

1366
src/views/modules/communityService/commonDemand/editForm.vue

File diff suppressed because it is too large
Loading…
Cancel
Save