Browse Source

统一修改服务方为服务组织

feature
mk 2 years ago
parent
commit
5170c663c6
  1. 2
      src/views/dataBoard/cpts/details/yxwxfw.vue
  2. 6
      src/views/dataBoard/renfang/resi/classNew.vue
  3. 4
      src/views/dataBoard/satisfactionEval/potentialPeople/details/xqwmz.vue
  4. 4
      src/views/dataBoard/satisfactionEval/potentialPeople/details/yxwxfw.vue
  5. 4
      src/views/dataBoard/sida/fuwu/need-detail.vue
  6. 4
      src/views/dataBoard/sida/xq/need-detail.vue
  7. 2
      src/views/dataBoard/sida/zy/gexingDetail.vue
  8. 6
      src/views/modules/communityService/commonDemand/addForm.vue
  9. 2
      src/views/modules/communityService/commonDemand/detailForm.vue
  10. 2
      src/views/modules/communityService/commonDemand/editForm.vue
  11. 2
      src/views/modules/communityService/commonDemand/index.vue
  12. 2
      src/views/modules/communityService/jinengzhaoren/index.vue
  13. 2
      src/views/modules/communityService/measure/detail.vue
  14. 6
      src/views/modules/communityService/measure/index.vue
  15. 2
      src/views/modules/communityService/measure/info.vue
  16. 6
      src/views/modules/communityService/policy/addPolicy.vue
  17. 2
      src/views/modules/communityService/wennuanzhaoren/index.vue
  18. 2
      src/views/modules/home/cpts/xuqiu-info.vue
  19. 2
      src/views/modules/home/index.vue
  20. 2
      src/views/modules/portrayal/jumin/cpts/details/fwdetail.vue
  21. 2
      src/views/modules/shequ/chaxun.vue
  22. 2
      src/views/modules/shequ/cpts/xuqiu-info.vue
  23. 4
      src/views/modules/shequ/index.vue
  24. 4
      src/views/modules/shequzhili/event/cpts/process-form-demand.vue
  25. 2
      src/views/modules/shequzhili/eventOld/cpts/event-info.vue
  26. 4
      src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue
  27. 2
      src/views/modules/shequzhili/welfare/addForm.vue
  28. 2
      src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue
  29. 2
      src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
  30. 2
      src/views/modules/visual/communityParty/memberInfo.vue
  31. 6
      src/views/modules/visual/measure/dialogInfo.vue
  32. 2
      src/views/modules/visual/measure/service.vue

2
src/views/dataBoard/cpts/details/yxwxfw.vue

@ -62,7 +62,7 @@
<span> {{ $sensitive(formData.principalContact, 3, 7) }}</span> <span> {{ $sensitive(formData.principalContact, 3, 7) }}</span>
</div> </div>
<div class="eventItem"> <div class="eventItem">
<span>服务</span> <span>服务组织</span>
<span>{{ formData.principalName }}</span> <span>{{ formData.principalName }}</span>
</div> </div>
<div class="eventItem"> <div class="eventItem">

6
src/views/dataBoard/renfang/resi/classNew.vue

@ -195,7 +195,7 @@
type="text" type="text"
v-model="searchParams.serviceOrgName" v-model="searchParams.serviceOrgName"
:clearable="true" :clearable="true"
placeholder="请输入服务名称" placeholder="请输入服务组织名称"
@blur="changeFwfmc" @blur="changeFwfmc"
/> />
</div> </div>
@ -641,7 +641,7 @@ export default {
) { ) {
setTimeout(() => { setTimeout(() => {
this.searchParams = { this.searchParams = {
serviceOrgName: null, // serviceOrgName: null, //
}; };
this.oldValsss = null; this.oldValsss = null;
}, 200); }, 200);
@ -691,7 +691,7 @@ export default {
"服务事项", "服务事项",
"来源", "来源",
"服务时间", "服务时间",
"服务", "服务组织",
"服务人数", "服务人数",
"操作", "操作",
]; ];

4
src/views/dataBoard/satisfactionEval/potentialPeople/details/xqwmz.vue

@ -132,7 +132,7 @@
</div> </div>
</div> </div>
<div class="detail"> <div class="detail">
<div class="detail-field">指派给服务</div> <div class="detail-field">指派给服务组织</div>
<div class="detail-value"> <div class="detail-value">
{{ item.serverName }} {{ {{ item.serverName }} {{
item.serviceType === 'volunteer' ? '志愿者' : item.serviceType === 'volunteer' ? '志愿者' :
@ -147,7 +147,7 @@
<template v-if="item.actionCode === 'finish'"> <template v-if="item.actionCode === 'finish'">
<div class="detail"> <div class="detail">
<div class="detail-field">服务</div> <div class="detail-field">服务组织</div>
<div class="detail-value"> <div class="detail-value">
{{ item.serverName }} {{ {{ item.serverName }} {{
item.serviceType === 'volunteer' ? '志愿者' : item.serviceType === 'volunteer' ? '志愿者' :

4
src/views/dataBoard/satisfactionEval/potentialPeople/details/yxwxfw.vue

@ -37,7 +37,7 @@
<span> {{ $sensitive(item.principalContact, 3, 7) }}</span> <span> {{ $sensitive(item.principalContact, 3, 7) }}</span>
</div> </div>
<div class="eventItem"> <div class="eventItem">
<span>服务</span> <span>服务组织</span>
<span>{{ item.serviceOrgName }}</span> <span>{{ item.serviceOrgName }}</span>
</div> </div>
<div class="eventItem"> <div class="eventItem">
@ -68,7 +68,7 @@
</template> </template>
<template v-else> <template v-else>
<div class="detail"> <div class="detail">
<div class="detail-field">服务</div> <div class="detail-field">服务组织</div>
<div class="detail-value"> <div class="detail-value">
{{ item.serviceOrgName }} {{ item.serviceOrgName }}
</div> </div>

4
src/views/dataBoard/sida/fuwu/need-detail.vue

@ -123,7 +123,7 @@
<div class="row"> <div class="row">
<div class="item"> <div class="item">
<div class="field">服务</div> <div class="field">服务组织</div>
<div class="value">{{ info.server_name }}</div> <div class="value">{{ info.server_name }}</div>
</div> </div>
<div class="item"> <div class="item">
@ -159,7 +159,7 @@
<div class="value">{{ info.resi_search_tag_name }}</div> <div class="value">{{ info.resi_search_tag_name }}</div>
</div> </div>
<div class="item"> <div class="item">
<div class="field">服务 </div> <div class="field">服务组织 </div>
<div class="value">{{ info.service_name }}</div> <div class="value">{{ info.service_name }}</div>
</div> </div>
<div class="item"> <div class="item">

4
src/views/dataBoard/sida/xq/need-detail.vue

@ -123,7 +123,7 @@
<div class="row"> <div class="row">
<div class="item"> <div class="item">
<div class="field">服务</div> <div class="field">服务组织</div>
<div class="value">{{ info.server_name }}</div> <div class="value">{{ info.server_name }}</div>
</div> </div>
<div class="item"> <div class="item">
@ -159,7 +159,7 @@
<div class="value">{{ info.resi_search_tag_name }}</div> <div class="value">{{ info.resi_search_tag_name }}</div>
</div> </div>
<div class="item"> <div class="item">
<div class="field">服务 </div> <div class="field">服务组织 </div>
<div class="value">{{ info.service_name }}</div> <div class="value">{{ info.service_name }}</div>
</div> </div>
<div class="item"> <div class="item">

2
src/views/dataBoard/sida/zy/gexingDetail.vue

@ -52,7 +52,7 @@
<div class="value">{{ info.score }}</div> <div class="value">{{ info.score }}</div>
</div> </div>
<div class="item"> <div class="item">
<div class="field">服务</div> <div class="field">服务组织</div>
<div class="value">{{ info.server_name }}</div> <div class="value">{{ info.server_name }}</div>
</div> </div>
<div class="item"> <div class="item">

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

@ -94,7 +94,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item label="服务" prop="serviceOrgId" label-width="150px" :class="{ 'form-item': source === 'visiual' }" <el-form-item label="服务组织" prop="serviceOrgId" label-width="150px" :class="{ 'form-item': source === 'visiual' }"
style="display: block"> style="display: block">
<el-select v-model="formData.serviceOrgType" class="input-width-small" placeholder="请选择" clearable <el-select v-model="formData.serviceOrgType" class="input-width-small" placeholder="请选择" clearable
@change="handleServiceChange('add', $event)"> @change="handleServiceChange('add', $event)">
@ -359,7 +359,7 @@ export default {
{ required: true, message: "服务事项不能为空", trigger: "change" }, { required: true, message: "服务事项不能为空", trigger: "change" },
], ],
serviceOrgId: [ serviceOrgId: [
{ required: true, message: "服务不能为空", trigger: "change" }, { required: true, message: "服务组织不能为空", trigger: "change" },
], ],
serviceTimeStart: [ serviceTimeStart: [
@ -464,7 +464,7 @@ export default {
return this.$message.error("网络错误"); return this.$message.error("网络错误");
}); });
}, },
// //
handleChangeServiceTypeLevel2() { handleChangeServiceTypeLevel2() {
console.log(this.formData.serviceOrgType); console.log(this.formData.serviceOrgType);
if (this.formData.serviceOrgType) { if (this.formData.serviceOrgType) {

2
src/views/modules/communityService/commonDemand/detailForm.vue

@ -9,7 +9,7 @@
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">服务</span> <span class="info-title-2">服务组织</span>
<span>{{ serviceOrgName || "--" }}</span> <span>{{ serviceOrgName || "--" }}</span>
</div> </div>

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

@ -17,7 +17,7 @@
</el-option> </el-option>
</el-select> --> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="服务" prop="serviceOrgId" label-width="150px" style="display: block"> <el-form-item label="服务组织" prop="serviceOrgId" label-width="150px" style="display: block">
<span>{{ serviceOrgName }}</span> <span>{{ serviceOrgName }}</span>
<!-- <el-select class="item_width_1" <!-- <el-select class="item_width_1"
v-model="formData.serviceOrgId" v-model="formData.serviceOrgId"

2
src/views/modules/communityService/commonDemand/index.vue

@ -237,7 +237,7 @@
prop="serviceOrgName" prop="serviceOrgName"
align="center" align="center"
min-width="150" min-width="150"
label="服务" label="服务组织"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>

2
src/views/modules/communityService/jinengzhaoren/index.vue

@ -203,7 +203,7 @@
<el-table-column prop="serviceOrgName" <el-table-column prop="serviceOrgName"
align="center" align="center"
min-width="150" min-width="150"
label="服务" label="服务组织"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>

2
src/views/modules/communityService/measure/detail.vue

@ -50,7 +50,7 @@
<span>{{ dataForm.content?dataForm.content:'--' }}</span> <span>{{ dataForm.content?dataForm.content:'--' }}</span>
</div> </div>
<div class="m-info-prop"> <div class="m-info-prop">
<span class="u-info-title-3">服务</span> <span class="u-info-title-3">服务组织</span>
<span>{{ dataForm.serviceShowName?dataForm.serviceShowName:'--' }}</span> <span>{{ dataForm.serviceShowName?dataForm.serviceShowName:'--' }}</span>
</div> </div>
<div v-if="dataForm.status == 'canceled'" <div v-if="dataForm.status == 'canceled'"

6
src/views/modules/communityService/measure/index.vue

@ -482,7 +482,7 @@
addType == 'finish' || addType == 'finish' ||
(addType == 'look' && form.serviceShowFlag) (addType == 'look' && form.serviceShowFlag)
" "
label="服务" label="服务组织"
prop="serviceType" prop="serviceType"
> >
<template v-if="disabled && addType !== 'appoint'"> <template v-if="disabled && addType !== 'appoint'">
@ -801,7 +801,7 @@ export default {
options: [], options: [],
}, },
{ {
label: "服务", label: "服务组织",
columnName: "serviceShowName", columnName: "serviceShowName",
align: "center", align: "center",
width: "120", width: "120",
@ -880,7 +880,7 @@ export default {
{ required: true, message: "服务时间不能为空", trigger: "blur" }, { required: true, message: "服务时间不能为空", trigger: "blur" },
], ],
serviceType: [ serviceType: [
{ required: true, message: "服务不能为空", trigger: "blur" }, { required: true, message: "服务组织不能为空", trigger: "blur" },
], ],
serviceStartTime: [ serviceStartTime: [
{ required: true, message: "实际服务时间不能为空", trigger: "blur" }, { required: true, message: "实际服务时间不能为空", trigger: "blur" },

2
src/views/modules/communityService/measure/info.vue

@ -267,7 +267,7 @@
(addType == 'look' && form.serviceShowFlag) (addType == 'look' && form.serviceShowFlag)
" "
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
label="服务" label="服务组织"
prop="serviceType" prop="serviceType"
> >
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">

6
src/views/modules/communityService/policy/addPolicy.vue

@ -169,7 +169,7 @@
<!-- 使用v-if后动态显示隐藏方法失效 --> <!-- 使用v-if后动态显示隐藏方法失效 -->
<el-form-item <el-form-item
v-if="formData.assignFlag" v-if="formData.assignFlag"
label="服务" label="服务组织"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
prop="serverOrgId" prop="serverOrgId"
@ -209,7 +209,7 @@
<el-form-item <el-form-item
v-if="formData.assignFlag" v-if="formData.assignFlag"
prop="noticeApproches" prop="noticeApproches"
label="自动通知服务" label="自动通知服务组织"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
@ -395,7 +395,7 @@ export default {
}, },
newDataRule: { newDataRule: {
serverOrgId: [ serverOrgId: [
{ required: true, message: "服务不能为空", trigger: "bulr" }, { required: true, message: "服务组织不能为空", trigger: "bulr" },
], ],
serviceScopeList: [ serviceScopeList: [
{ required: true, message: "服务范围不能为空", trigger: "bulr" }, { required: true, message: "服务范围不能为空", trigger: "bulr" },

2
src/views/modules/communityService/wennuanzhaoren/index.vue

@ -203,7 +203,7 @@
<el-table-column prop="serviceOrgName" <el-table-column prop="serviceOrgName"
align="center" align="center"
min-width="150" min-width="150"
label="服务" label="服务组织"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>

2
src/views/modules/home/cpts/xuqiu-info.vue

@ -62,7 +62,7 @@
<el-form-item <el-form-item
v-if="dataForm.serviceShowName" v-if="dataForm.serviceShowName"
label="服务:" label="服务组织:"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >

2
src/views/modules/home/index.vue

@ -187,7 +187,7 @@ export default {
typePlaceholder: { typePlaceholder: {
jumin: "请输入姓名或联系电话或证件号", jumin: "请输入姓名或联系电话或证件号",
fangwu: "请输入小区名称或楼栋名称", fangwu: "请输入小区名称或楼栋名称",
xuqiu: "请输入需求人或需求内容或服务", xuqiu: "请输入需求人或需求内容或服务组织",
}, },
resiCategory: { resiCategory: {

2
src/views/modules/portrayal/jumin/cpts/details/fwdetail.vue

@ -37,7 +37,7 @@
<span> {{ $sensitive(formData.principalContact, 3, 7) }}</span> <span> {{ $sensitive(formData.principalContact, 3, 7) }}</span>
</div> </div>
<div class="eventItem"> <div class="eventItem">
<span>服务</span> <span>服务组织</span>
<span>{{ formData.principalName || '--' }}</span> <span>{{ formData.principalName || '--' }}</span>
</div> </div>
<div class="eventItem"> <div class="eventItem">

2
src/views/modules/shequ/chaxun.vue

@ -370,7 +370,7 @@ export default {
typePlaceholder: { typePlaceholder: {
jumin: "请输入姓名或联系电话或证件号", jumin: "请输入姓名或联系电话或证件号",
fangwu: "请输入小区名称或楼栋名称", fangwu: "请输入小区名称或楼栋名称",
xuqiu: "请输入需求人或需求内容或服务", xuqiu: "请输入需求人或需求内容或服务组织",
}, },
searchJumin: { searchJumin: {

2
src/views/modules/shequ/cpts/xuqiu-info.vue

@ -62,7 +62,7 @@
<el-form-item <el-form-item
v-if="dataForm.serviceShowName" v-if="dataForm.serviceShowName"
label="服务:" label="服务组织:"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >

4
src/views/modules/shequ/index.vue

@ -607,7 +607,7 @@ export default {
typePlaceholder: { typePlaceholder: {
jumin: "请输入姓名或联系电话或证件号", jumin: "请输入姓名或联系电话或证件号",
fangwu: "请输入小区名称或楼栋名称", fangwu: "请输入小区名称或楼栋名称",
xuqiu: "请输入需求人或需求内容或服务", xuqiu: "请输入需求人或需求内容或服务组织",
}, },
selectedFuncIdList: [], selectedFuncIdList: [],
@ -748,7 +748,7 @@ export default {
options: [], options: [],
}, },
{ {
label: "服务", label: "服务组织",
columnName: "serviceShowName", columnName: "serviceShowName",
align: "center", align: "center",
width: "120", width: "120",

4
src/views/modules/shequzhili/event/cpts/process-form-demand.vue

@ -147,7 +147,7 @@
</el-form-item> </el-form-item>
<el-form-item label="服务" <el-form-item label="服务组织"
:class="{'form-item':source==='visiual'}" :class="{'form-item':source==='visiual'}"
label-width="150px" label-width="150px"
prop="serverId"> prop="serverId">
@ -283,7 +283,7 @@ export default {
{ required: true, message: "服务地点不能为空", trigger: "blur" }, { required: true, message: "服务地点不能为空", trigger: "blur" },
], ],
serverId: [ serverId: [
{ required: true, message: "服务不能为空", trigger: "blur" }, { required: true, message: "服务组织不能为空", trigger: "blur" },
], ],
}; };

2
src/views/modules/shequzhili/eventOld/cpts/event-info.vue

@ -243,7 +243,7 @@
</template> </template>
<div v-if="item.processName === '需求完成'"> <div v-if="item.processName === '需求完成'">
<div class="detail"> <div class="detail">
<div class="detail-field">服务</div> <div class="detail-field">服务组织</div>
<div class="detail-value">{{ item.serviceParty }}</div> <div class="detail-value">{{ item.serviceParty }}</div>
</div> </div>
<div class="detail"> <div class="detail">

4
src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue

@ -104,7 +104,7 @@
</el-form-item> </el-form-item>
<el-form-item label="服务" :class="{ 'form-item': source === 'visiual' }" label-width="150px" prop="serverId"> <el-form-item label="服务组织" :class="{ 'form-item': source === 'visiual' }" label-width="150px" prop="serverId">
<template> <template>
<div :class="[{ 'single-select': source === 'visiual' }, 'sel-service']"> <div :class="[{ 'single-select': source === 'visiual' }, 'sel-service']">
@ -216,7 +216,7 @@ export default {
{ required: true, message: "服务地点不能为空", trigger: "blur" }, { required: true, message: "服务地点不能为空", trigger: "blur" },
], ],
serverId: [ serverId: [
{ required: true, message: "服务不能为空", trigger: "blur" }, { required: true, message: "服务组织不能为空", trigger: "blur" },
], ],
}; };
}, },

2
src/views/modules/shequzhili/welfare/addForm.vue

@ -225,7 +225,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务" label="服务组织"
prop="serviceOrgId" prop="serviceOrgId"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"

2
src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue

@ -45,7 +45,7 @@
</div> </div>
<div class="m-info-prop" <div class="m-info-prop"
v-if="info.serviceShowName"> v-if="info.serviceShowName">
<span class="u-info-title-2">服务</span> <span class="u-info-title-2">服务组织</span>
<span>{{ info.serviceShowName }}</span> <span>{{ info.serviceShowName }}</span>
</div> </div>
<div class="m-info-prop" <div class="m-info-prop"

2
src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue

@ -66,7 +66,7 @@
<div>{{ info.content }}</div> <div>{{ info.content }}</div>
</div> </div>
<div class="item"> <div class="item">
<span class="item-field">服务 </span> <span class="item-field">服务组织 </span>
<span>{{ info.serviceShowName }}</span> <span>{{ info.serviceShowName }}</span>
</div> </div>
<div class="item"> <div class="item">

2
src/views/modules/visual/communityParty/memberInfo.vue

@ -58,7 +58,7 @@
<span v-if="info.content">{{ info.content }}</span> <span v-if="info.content">{{ info.content }}</span>
</div> </div>
<div class="item"> <div class="item">
<span class="item-field">服务</span> <span class="item-field">服务组织</span>
<span v-if="info.serviceShowName">{{ info.serviceShowName }}</span> <span v-if="info.serviceShowName">{{ info.serviceShowName }}</span>
</div> </div>
<div class="item"> <div class="item">

6
src/views/modules/visual/measure/dialogInfo.vue

@ -55,7 +55,7 @@
class="list"> class="list">
<div class="item" <div class="item"
v-if="info.serviceShowFlag"> v-if="info.serviceShowFlag">
<span class="item-field ">服务</span> <span class="item-field ">服务组织</span>
<span>{{ info.serviceShowName }}</span> <span>{{ info.serviceShowName }}</span>
</div> </div>
<template v-if="info.status == 'finished'"> <template v-if="info.status == 'finished'">
@ -84,7 +84,7 @@
<div v-if="info.status==='pending'" <div v-if="info.status==='pending'"
class="list"> class="list">
<div class="item"> <div class="item">
<span class="item-field item-filed-height ">服务</span> <span class="item-field item-filed-height ">服务组织</span>
<div class="single-select sel-service"> <div class="single-select sel-service">
<el-select v-model="form.serviceType" <el-select v-model="form.serviceType"
class="input-width-small" class="input-width-small"
@ -303,7 +303,7 @@ export default {
async handleSubmit () { async handleSubmit () {
if (!this.form.serviceType || !this.form.serverId) { if (!this.form.serviceType || !this.form.serverId) {
this.$message.info("请选择服务"); this.$message.info("请选择服务组织");
return false return false
} }
const _form = { const _form = {

2
src/views/modules/visual/measure/service.vue

@ -181,7 +181,7 @@ export default {
{ title: "上报人", coulmn: 'reportUserName' }, { title: "上报人", coulmn: 'reportUserName' },
{ title: "上报时间", coulmn: 'reportTime' }, { title: "上报时间", coulmn: 'reportTime' },
{ title: "需求人", coulmn: 'demandUserName' }, { title: "需求人", coulmn: 'demandUserName' },
{ title: "服务", coulmn: 'serviceShowName' }, { title: "服务组织", coulmn: 'serviceShowName' },
{ title: "服务时间", coulmn: 'wantServiceTime' }, { title: "服务时间", coulmn: 'wantServiceTime' },
], ],
categoryList: [], categoryList: [],

Loading…
Cancel
Save