修改服务包

This commit is contained in:
闫晓茹 2024-03-06 17:11:59 +08:00
parent fcd6ffbf88
commit 572d3d1ee3
2 changed files with 106 additions and 98 deletions

View File

@ -225,32 +225,10 @@
label="服务频次" label="服务频次"
align="center" align="center"
prop="serviceWayFrequencyList" prop="serviceWayFrequencyList"
:key="keyTable"
> >
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<!-- <div
v-for="(itemx, index) in scope.row.serviceWayFrequencyList"
:key="index"
> -->
<!-- <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'">
<el-select
size="mini"
@click="getSuppliers()"
@change="blurInputs()"
v-model="scope.row.valuePlusMax"
clearable
placeholder="请选择"
>
<el-option
v-for="item in scope.row.serviceWayFrequencyList"
:key="item.id"
:label="item.serviceFrequencyText"
:value="item.id"
>
</el-option>
</el-select>
</div> -->
<!-- <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'"> -->
<el-select <el-select
size="mini" size="mini"
@click="getSuppliers()" @click="getSuppliers()"
@ -259,16 +237,7 @@
clearable clearable
placeholder="请选择" placeholder="请选择"
> >
<!-- :label="item.serviceFrequencyType == 'TEXT'?item.serviceFrequencyText:JSON.parse(item.serviceFrequencyStart) +
'~' +
JSON.parse(item.serviceFrequencyEnd)"
-->
<!-- label里面就是展示的值 value是选中的 value是拼接的-->
<!-- :label="item.serviceFrequencyType == 'TEXT'?item.serviceFrequencyText:JSON.parse(item.serviceFrequencyStart) +
'~' +
JSON.parse(item.serviceFrequencyEnd) : item.serviceFrequencyType == 'DIGIT'?"
== text 不变 ==big 拼接的那个 -->
<el-option <el-option
v-for="item in scope.row.serviceWayFrequencyList" v-for="item in scope.row.serviceWayFrequencyList"
:key="item.id" :key="item.id"
@ -285,27 +254,34 @@
> >
</el-option> </el-option>
</el-select> </el-select>
<!-- </div> -->
<!-- </div> --> </template> -->
</template>
<!-- </div> --> <!-- </div> -->
<!-- </template> --> <!-- </template> -->
<!-- <template slot-scope="scope"> <template slot-scope="scope">
<div <!-- {{ scope.row.serviceFrequencyType }} -->
v-for="(item, index) in scope.row.serviceWayFrequencyList" <!-- <div
v-for="(item, index) in scope.row"
:key="index" :key="index"
> > -->
<div v-if="item.serviceFrequencyType == 'DIGIT'"> <div
{{ item.serviceFrequencyStart }}~{{
item.serviceFrequencyEnd v-if="scope.row.serviceFrequencyType == 'DIGIT'"
>
{{ scope.row.serviceFrequencyStart }}~{{
scope.row.serviceFrequencyEnd
}} }}
</div> </div>
<div v-if="item.serviceFrequencyType == 'TEXT'"> <div
{{ item.serviceFrequencyText }} v-if="scope.row.serviceFrequencyType == 'TEXT'"
>
{{ scope.row.serviceFrequencyText }}
</div> </div>
</div> <!-- </div> -->
</template> --> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -374,7 +350,7 @@
<el-form-item label="服务内容" prop="serviceContent" label-width="80"> <el-form-item label="服务内容" prop="serviceContent" label-width="80">
<el-input <el-input
type="textarea" type="textarea"
:disabled="disabledcontent"
style="width: 400px" style="width: 400px"
placeholder="请输入服务内容" placeholder="请输入服务内容"
v-model="form.serviceContent" v-model="form.serviceContent"
@ -473,12 +449,12 @@ export default {
data() { data() {
return { return {
list: [], list: [],
disableedit:false, disableedit: false,
serviceFrequencyStart: "", serviceFrequencyStart: "",
serviceFrequencyEnd: "", serviceFrequencyEnd: "",
serviceFrequencyType: "", serviceFrequencyType: "",
// disabled: "", // disabled: "",
disabledcontent:false, disabledcontent: false,
titles: "", titles: "",
DIGIT: true, DIGIT: true,
TEXT: false, TEXT: false,
@ -552,6 +528,7 @@ export default {
valuePlus: "", valuePlus: "",
serviceFrequencyText: "", serviceFrequencyText: "",
keyTable: "", keyTable: "",
// list:[],
}; };
}, },
watch: { watch: {
@ -666,13 +643,16 @@ export default {
/** 查询服务方式内容列表 */ /** 查询服务方式内容列表 */
getList() { getList() {
this.loading = true; this.loading = true;
this.servicewaycontentList=[]
listServicewaycontent(this.queryParams).then((response) => { listServicewaycontent(this.queryParams).then((response) => {
this.servicewaycontentList = response.rows; // this.servicewaycontentList = response.rows;
// this.serviceFrequencyText= this.servicewaycontentList[0].serviceFrequencyText response.rows.forEach((e) => {
console.log(this.servicewaycontentList, "****"); e.serviceWayFrequencyList.forEach((el) => {
// if(e.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'){ el.serviceContent = e.serviceContent;
this.servicewaycontentList.forEach((e) => { this.servicewaycontentList.push(el)
e.valuePlusMax = e.serviceWayFrequencyList[0].id; console.log(this.servicewaycontentList, "this.servicewaycontentList");
});
}); });
// } // }
@ -740,8 +720,8 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.disableedit=false this.disableedit = false;
this.disabledcontent=false this.disabledcontent = false;
console.log(this.itemname, "itemname"); console.log(this.itemname, "itemname");
if (this.itemname) { if (this.itemname) {
this.form.serviceWayName = this.serviceWayName; this.form.serviceWayName = this.serviceWayName;
@ -757,11 +737,11 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.disableedit=true this.disableedit = true;
this.disabledcontent=true this.disabledcontent = true;
console.log(row, "99999"); console.log(row, "99999");
this.reset(); this.reset();
getServicewaycontent(row.valuePlusMax).then((response) => { getServicewaycontent(row.id).then((response) => {
this.form = response.data; this.form = response.data;
// this.form.serviceWayId=row.serviceWayId // this.form.serviceWayId=row.serviceWayId
this.form.id = response.data.serviceFrequencyId; this.form.id = response.data.serviceFrequencyId;
@ -788,6 +768,10 @@ export default {
}); });
// ----------- // -----------
}, },
changeDIGIT(item) {
console.log(item, "changeTEXT");
},
changeTEXT(item) {},
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
@ -881,10 +865,10 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
console.log(row); console.log(row);
row.serviceWayFrequencyList.forEach((e) => { // row.serviceWayFrequencyList.forEach((e) => {
this.id = e.id; // this.id = e.id;
}); // });
const id = this.id; const id = row.id;
this.$modal this.$modal
.confirm("是否确认删除此该数据项?") .confirm("是否确认删除此该数据项?")
@ -945,6 +929,10 @@ export default {
} }
} }
} }
.changeTEXT :hover {
color: red;
border-bottom: solid 1px red;
}
.button { .button {
display: inline-block; display: inline-block;
position: relative; position: relative;

View File

@ -291,19 +291,23 @@
/> />
</el-form-item> --> </el-form-item> -->
<el-form-item label="机构名称" prop="agencyName"> <el-form-item label="机构名称" prop="agencyName">
<el-input v-model="form.agencyName" maxlength="100" placeholder="请输入机构名称" /> <el-input
v-model="form.agencyName"
maxlength="100"
placeholder="请输入机构名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="机构简称" prop="agencyAbbreviation"> <el-form-item label="机构简称" prop="agencyAbbreviation">
<el-input <el-input
maxlength="100" maxlength="100"
v-model="form.agencyAbbreviation" v-model="form.agencyAbbreviation"
placeholder="请输入机构简称" placeholder="请输入机构简称"
/> />
</el-form-item> </el-form-item>
<el-form-item label="机构代码" prop="agencyCode"> <el-form-item label="机构代码" prop="agencyCode">
<el-input <el-input
maxlength="20" maxlength="20"
v-model="form.agencyCode" v-model="form.agencyCode"
style="width: 205px" style="width: 205px"
placeholder="请输入机构代码" placeholder="请输入机构代码"
@ -314,7 +318,7 @@
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
:options="treeOptions" :options="treeOptions"
@change="change($event)" @change="change($event)"
style="width: 205px;" style="width: 205px"
v-model="form.parentId" v-model="form.parentId"
:show-all-levels="false" :show-all-levels="false"
:placeholder=" :placeholder="
@ -366,7 +370,7 @@
</el-form-item> </el-form-item>
<el-form-item label="组织机构编码" prop="orgAgencyCode"> <el-form-item label="组织机构编码" prop="orgAgencyCode">
<el-input <el-input
maxlength="30" maxlength="30"
v-model="form.orgAgencyCode" v-model="form.orgAgencyCode"
placeholder="请输入组织机构编码" placeholder="请输入组织机构编码"
style="width: 205px" style="width: 205px"
@ -394,38 +398,46 @@
</el-form-item> </el-form-item>
<el-form-item label="机构联系人" prop="agencyContacts"> <el-form-item label="机构联系人" prop="agencyContacts">
<el-input <el-input
maxlength="20" maxlength="20"
v-model="form.agencyContacts" v-model="form.agencyContacts"
placeholder="请输入机构联系人" placeholder="请输入机构联系人"
/> />
</el-form-item> </el-form-item>
<el-form-item label="机构联系电话" prop="agencyPhone"> <el-form-item label="机构联系电话" prop="agencyPhone">
<el-input <el-input
maxlength="12" maxlength="12"
v-model="form.agencyPhone" v-model="form.agencyPhone"
placeholder="请输入机构联系电话" placeholder="请输入机构联系电话"
/> />
</el-form-item> </el-form-item>
<el-form-item label="机构详细地址" prop="agencyAddress"> <el-form-item label="机构详细地址" prop="agencyAddress">
<el-input <el-input
maxlength="200" maxlength="200"
v-model="form.agencyAddress" v-model="form.agencyAddress"
placeholder="请输入机构详细地址" placeholder="请输入机构详细地址"
/> />
</el-form-item> </el-form-item>
<el-form-item label="机构概述" prop="agencyRemark"> <el-form-item label="机构概述" prop="agencyRemark">
<el-input v-model="form.agencyRemark" maxlength="100" placeholder="请输入机构概述" /> <el-input
v-model="form.agencyRemark"
maxlength="100"
placeholder="请输入机构概述"
/>
</el-form-item> </el-form-item>
<el-form-item label="机构排序" prop="agencySort"> <el-form-item label="机构排序" prop="agencySort">
<el-input v-model="form.agencySort" maxlength="8" placeholder="请输入机构排序" /> <el-input
v-model="form.agencySort"
maxlength="8"
placeholder="请输入机构排序"
/>
</el-form-item> </el-form-item>
<el-form-item label="机构状态" prop="agencyStatus"> <el-form-item label="机构状态" prop="agencyStatus">
<!-- <el-form-item label="是否并发" prop="concurrent"> --> <!-- <el-form-item label="是否并发" prop="concurrent"> -->
<el-radio-group v-model="form.agencyStatus" size="small"> <el-radio-group v-model="form.agencyStatus" size="small">
<el-radio label="ON">启用</el-radio> <el-radio label="ON">启用</el-radio>
<el-radio label="OFF">禁用</el-radio> <el-radio label="OFF">禁用</el-radio>
</el-radio-group> </el-radio-group>
<!-- </el-form-item> --> <!-- </el-form-item> -->
<!-- <el-radio v-model="form.agencyStatus" label="ON">启用</el-radio> <!-- <el-radio v-model="form.agencyStatus" label="ON">启用</el-radio>
<el-radio v-model="form.agencyStatus" label="OFF">禁用</el-radio> --> <el-radio v-model="form.agencyStatus" label="OFF">禁用</el-radio> -->
</el-form-item> </el-form-item>
@ -642,7 +654,8 @@ export default {
agencyName: [ agencyName: [
{ required: true, message: "机构名称能为空", trigger: "blur" }, { required: true, message: "机构名称能为空", trigger: "blur" },
], ],
areaCode:[{ required: true, message: "行政区划不能为空", trigger: "blur" }, areaCode: [
{ required: true, message: "行政区划不能为空", trigger: "blur" },
], ],
}, },
treeOptionsagencyCategoryId: [], treeOptionsagencyCategoryId: [],
@ -747,7 +760,9 @@ export default {
// //
clickstreet(item) { clickstreet(item) {
this.form.communityName ='' this.form.communityCode = "";
this.form.communityName = "";
getSecondaryLevelInfo(item.id).then((res) => { getSecondaryLevelInfo(item.id).then((res) => {
this.streetlists = res.data; this.streetlists = res.data;
}); });
@ -758,10 +773,13 @@ export default {
}, },
// //
clickarea(item) { clickarea(item) {
this.form.areaCode = ""; this.form.areaName = "";
this.form.streetCode = ""; this.form.streetCode = "";
// this.form.streetName='' this.form.streetName = "";
this.form.communityCode ='' this.form.streetCode = "";
this.form.communityCode = "";
this.form.communityName = "";
getSecondaryLevelInfo(item.id).then((res) => { getSecondaryLevelInfo(item.id).then((res) => {
this.streetlist = res.data; this.streetlist = res.data;
@ -770,12 +788,12 @@ export default {
// //
clickcity(item) { clickcity(item) {
this.form.regionName = ""; this.form.regionName = "";
this.form.areaCode = ""; this.form.areaName = "";
this.form.streetCode = ""; this.form.streetCode = "";
this.form.streetName = ""; this.form.streetName = "";
this.form.communityCode ='' this.form.communityCode = "";
this.form.communityName = "";
getSecondaryLevelInfo(item.id).then((res) => { getSecondaryLevelInfo(item.id).then((res) => {
this.arealist = res.data; this.arealist = res.data;
}); });
@ -791,14 +809,15 @@ export default {
this.form.cityName = ""; this.form.cityName = "";
// this.form.streeName = ""; // this.form.streeName = "";
// this.form.communityCode ='' // this.form.communityCode =''
this.form.streetCode = "";
this.form.streetName = "";
this.form.areaName = ""; this.form.areaName = "";
this.form.communityName = ""; this.form.communityName = "";
this.form.communityCode = "";
this.form.regionName = ""; this.form.regionName = "";
this.form.areaCode = ""; // this.form.areaCode = "";
this.form.streetCode = ""; // this.form.streetCode = "";
getSecondaryLevelInfo(item.id).then((res) => { getSecondaryLevelInfo(item.id).then((res) => {
this.citylist = res.data; this.citylist = res.data;
}); });
@ -843,11 +862,9 @@ export default {
console.log(e, "78"); console.log(e, "78");
// console.log(this.$refs.cascader) // console.log(this.$refs.cascader)
// this.form.parentId = e; // this.form.parentId = e;
if(e){ if (e) {
this.form.parentId = e[e.length - 1]; this.form.parentId = e[e.length - 1];
} }
}, },
changeagencyCategoryId(e) { changeagencyCategoryId(e) {
this.form.agencyCategoryId = e[e.length - 1]; this.form.agencyCategoryId = e[e.length - 1];
@ -987,6 +1004,9 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
if (this.form.provinceCode && !this.form.communityCode) {
this.$message("请选择到社区");
}
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {