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

Merge branch 'feature-7-31' into dev

dev
是小王呀\24601 1 year ago
parent
81921d05fb fc456a54df
commit
bc3af203cc
3 changed files with 115 additions and 96 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. 10
      src/js/columns/constants/index.js
  2. 14
      src/views/components/resiSearch.vue
  3. 61
      src/views/modules/shequzhili/eventOld/cpts/event-info.vue

10
src/js/columns/constants/index.js
View File

@ -165,21 +165,21 @@ export const satisfactionType = [
export const noSatisfactionType = [ export const noSatisfactionType = [
{ {
label: '未回复', label: '未回复',
value: 0 value: '0'
}, { }, {
label: '服务态度差', label: '服务态度差',
value: 1 value: '1'
}, },
{ {
label: '推诿扯皮', label: '推诿扯皮',
value: 2 value: '2'
}, },
{ {
label: '处理不及时', label: '处理不及时',
value: 3 value: '3'
}, },
{ {
label: '其他', label: '其他',
value: 4 value: '4'
} }
] ]

14
src/views/components/resiSearch.vue
View File

@ -393,6 +393,16 @@ export default {
},{ },{
label:'特扶人员', label:'特扶人员',
value:'SPECIAL_SUPPORT_FLAG', value:'SPECIAL_SUPPORT_FLAG',
children:[
{
label: "子女伤残",
value: "CHILDREN_DISABILITY_FLAG",
},
{
label: "子女死亡",
value: "CHILDREN_DEATH",
},
],
},{ },{
label: "留守儿童", label: "留守儿童",
value: "LBC_FLAG", value: "LBC_FLAG",
@ -892,6 +902,7 @@ export default {
}, },
categoryAll: { categoryAll: {
handler(val, val2) { handler(val, val2) {
console.log(val,val2,"dslkkldjsf");
this.handleCategoryChange(val, val2) this.handleCategoryChange(val, val2)
}, },
deep: true deep: true
@ -943,6 +954,7 @@ export default {
}, },
methods: { methods: {
handleCategoryChange(newVal, oldVal) { handleCategoryChange(newVal, oldVal) {
console.log(newVal, oldVal,"slkdfjlfj");
let formCopy = JSON.parse(JSON.stringify(this.form)); let formCopy = JSON.parse(JSON.stringify(this.form));
// 找出被取消选中的值 // 找出被取消选中的值
@ -969,7 +981,7 @@ export default {
newVal.forEach(val => { newVal.forEach(val => {
if (val === 'partyFlag0' || val === 'partyFlag1' || val === 'partyFlag2') { if (val === 'partyFlag0' || val === 'partyFlag1' || val === 'partyFlag2') {
formCopy.partyFlag = val === 'partyFlag0' ? 0 : val === 'partyFlag1' ? 1 : 2; formCopy.partyFlag = val === 'partyFlag0' ? 0 : val === 'partyFlag1' ? 1 : 2;
} else if (['FLOATING_FLAG', 'OLD_PEOPLE_FLAG','OLD_PEOPLE_FLAG', 'LIVE_ALONE_FLAG', 'DEMENTED_FLAG', 'EMPTY_NESTER_FLAG', 'DISABLED_FLAG' ,'SUBSISTENCE_ALLOWANCE_FLAG', 'ENSURE_HOUSE_FLAG', 'VETERAN_FLAG', 'FERTILE_WOMAN_FLAG', 'SPECIAL_SUPPORT_FLAG', 'NEW_STRATUM_FLAG','NEG_FLAG', 'LBC_FLAG', 'AIDS_FLAG'].includes(val)) { } else if (['FLOATING_FLAG', 'OLD_PEOPLE_FLAG','OLD_PEOPLE_FLAG', 'CHILDREN_DISABILITY_FLAG','CHILDREN_DEATH','LIVE_ALONE_FLAG', 'DEMENTED_FLAG', 'EMPTY_NESTER_FLAG', 'DISABLED_FLAG' ,'SUBSISTENCE_ALLOWANCE_FLAG', 'ENSURE_HOUSE_FLAG', 'VETERAN_FLAG', 'FERTILE_WOMAN_FLAG', 'SPECIAL_SUPPORT_FLAG', 'NEW_STRATUM_FLAG','NEG_FLAG', 'LBC_FLAG', 'AIDS_FLAG'].includes(val)) {
if (!formCopy.attentionCrowds.includes(val)) { if (!formCopy.attentionCrowds.includes(val)) {
formCopy.attentionCrowds.push(val); formCopy.attentionCrowds.push(val);
} }

61
src/views/modules/shequzhili/eventOld/cpts/event-info.vue
View File

@ -105,40 +105,41 @@
<div class="detail-field">办结时限：</div> <div class="detail-field">办结时限：</div>
<div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div> <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
</div> </div>
<div class="detail">
<div class="detail-field">附件/图片：</div>
<template v-if="item.internalFile && item.internalFile.length > 0" <template v-if="item.internalFile && item.internalFile.length > 0"
v-for="i in item.internalFile"> v-for="i in item.internalFile">
<template v-if="i.attachmentType === 'image'"> <template v-if="i.attachmentType === 'image'">
<div class="detail">
<div class="detail-field">图片：</div>
<div <div
:class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]"> :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
<img :src="i.attachmentUrl" :key="i.attachmentUrl" <img :src="i.attachmentUrl" :key="i.attachmentUrl"
style="width: 50px; height: 50px; padding-right: 10px" style="width: 50px; height: 50px; padding-right: 10px"
@click="watchImg(i.attachmentUrl)" /> @click="watchImg(i.attachmentUrl)" />
</div> </div>
</div>
</template> </template>
<template v-if="i.attachmentType === 'voice'"> <template v-if="i.attachmentType === 'voice'">
<div class="detail">
<div class="detail-field">语音：</div>
<div <div
:class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]"> :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
<audio controls> <audio controls>
<source :src="i.attachmentUrl" type="" :key="i.attachmentUrl" /> <source :src="i.attachmentUrl" type="" :key="i.attachmentUrl" />
</audio> </audio>
</div> </div>
</div>
</template> </template>
<template v-if="i.attachmentType === 'doc'"> <template v-if="i.attachmentType === 'doc'">
<div class="detail">
<div class="detail-field">附件：</div>
<div <div
:class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]"> :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
<a :href="i.attachmentUrl">{{ i.attachmentName }}</a> <a :href="i.attachmentUrl">{{ i.attachmentName }}</a>
</div> </div>
</div>
</template> </template>
</template> </template>
</div>
</template> </template>
<template v-else> <template v-else>
<div class="detail"> <div class="detail">
@ -153,33 +154,34 @@
<div class="detail-field">办结时限：</div> <div class="detail-field">办结时限：</div>
<div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div> <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
</div> </div>
<div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
<span class="u-info-title-2">附件/图片：</span>
<template v-if="item.internalFile && item.internalFile.length > 0" <template v-if="item.internalFile && item.internalFile.length > 0"
v-for="i in item.internalFile"> v-for="i in item.internalFile">
<template v-if="i.type === 'image'"> <template v-if="i.type === 'image'">
<div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
<span class="u-info-title-2">图片：</span>
<img :src="i.url" :key="i.url" <img :src="i.url" :key="i.url"
style="width: 150px; height: 150px; padding-right: 10px" style="width: 150px; height: 150px; padding-right: 10px"
@click="watchImg(i.url)" /> @click="watchImg(i.url)" />
</div>
</template> </template>
<template v-if="i.type === 'voice'"> <template v-if="i.type === 'voice'">
<div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
<span class="u-info-title-2">语音：</span>
<audio controls> <audio controls>
<source :src="i.url" type="" :key="i.url" /> <source :src="i.url" type="" :key="i.url" />
</audio> </audio>
</div>
</template> </template>
<template v-if="i.type === 'doc'"> <template v-if="i.type === 'doc'">
<div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
<span class="u-info-title-2">语音：</span>
<audio controls> <audio controls>
<source :src="i.url" type="" :key="i.url" /> <source :src="i.url" type="" :key="i.url" />
</audio> </audio>
</div>
</template> </template>
</template> </template>
</div>
</template> </template>
</div> </div>
<div v-else-if="item.type === 'demand'"> <div v-else-if="item.type === 'demand'">
@ -200,40 +202,41 @@
<div class="detail-field">办结时限：</div> <div class="detail-field">办结时限：</div>
<div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div> <div class="detail-value">{{ formTimeLimit(item.timeLimit) }}</div>
</div> </div>
<div class="detail">
<div class="detail-field">附件/图片：</div>
<template v-if="item.internalFile && item.internalFile.length > 0" <template v-if="item.internalFile && item.internalFile.length > 0"
v-for="i in item.internalFile"> v-for="i in item.internalFile">
<template v-if="i.type === 'image'"> <template v-if="i.type === 'image'">
<div class="detail">
<div class="detail-field">图片：</div>
<div <div
:class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]"> :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
<img :src="i.url" :key="i.url" <img :src="i.url" :key="i.url"
style="width: 50px; height: 50px; padding-right: 10px" style="width: 50px; height: 50px; padding-right: 10px"
@click="watchImg(i.url)" /> @click="watchImg(i.url)" />
</div> </div>
</div>
</template> </template>
<template v-if="i.type === 'voice'"> <template v-if="i.type === 'voice'">
<div class="detail">
<div class="detail-field">语音：</div>
<div <div
:class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]"> :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
<audio controls> <audio controls>
<source :src="i.url" type="" :key="i.url" /> <source :src="i.url" type="" :key="i.url" />
</audio> </audio>
</div> </div>
</div>
</template> </template>
<template v-if="i.type === 'doc'"> <template v-if="i.type === 'doc'">
<div class="detail">
<div class="detail-field">附件：</div>
<div <div
:class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]"> :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
<a :href="i.url">{{ i.name }}</a> <a :href="i.url">{{ i.name }}</a>
</div> </div>
</div>
</template> </template>
</template> </template>
</div>
</template> </template>
<div v-if="item.processName === '需求完成'"> <div v-if="item.processName === '需求完成'">
<div class="detail"> <div class="detail">
@ -648,6 +651,10 @@ export default {
"yyyy-MM-dd hh:mm" "yyyy-MM-dd hh:mm"
); );
}, },
watchImg (src) {
window.open(src);
},
}, },
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save