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

Merge branch 'feture-12345' into feature

feature-bug
是小王呀\24601 8 months ago
parent
a9ec89818d a165d602d4
commit
6e53708fd6
6 changed files with 131 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 81
      src/views/modules/shequzhili/Delivery/index.vue
  2. 4
      src/views/modules/shequzhili/analysis/formList.vue
  3. 32
      src/views/modules/shequzhili/event/cpts/process-form-complete.vue
  4. 3
      src/views/modules/shequzhili/event/cpts/process-form-contact.vue
  5. 3
      src/views/modules/shequzhili/event/cpts/process-form-process.vue
  6. 23
      src/views/modules/workSys/sysConfigure/index.vue

81
src/views/modules/shequzhili/Delivery/index.vue
View File

@ -61,6 +61,20 @@
value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="信息来源" prop="messageSource">
<el-select v-model.trim="formData.messageSource" clearable class="u-item-width-normal">
<el-option v-for="item in sourceList" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="填报不合规诉求" prop="nonCompliance " :label-width="'120px'">
<el-select v-model.trim="formData.nonCompliance " clearable class="u-item-width-normal" >
<el-option v-for="item in nonComplianceList" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-row>
<el-col :span="24" align="right">
<el-button style="margin-left: 30px" size="small" type="primary "
@ -160,6 +174,9 @@
<el-table-column prop="deptName" align="center" width="110" label="指派部门"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="deptName" align="center" width="110" label="指派部门"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="limitTime" align="center" width="110" label="办结时限（部门）"
:show-overflow-tooltip="true">
</el-table-column>
@ -237,6 +254,20 @@ export default {
label: "未指派",
},
],
nonComplianceList:[
{
value: 0,
label: "否",
},
{
value: 1,
label: "是",
},
{
value: 2,
label: "不限",
},
],
handleList: [
{
value: "8",
@ -258,6 +289,10 @@ export default {
value: "12",
label: "已审核归档",
},
{
value: "13",
label: "退件 ",
},
],
tableData: [],
statusArray: [
@ -288,6 +323,52 @@ export default {
label: "超出服务范围",
},
],
sourceList: [
{
value: "来电",
label: "来电",
},
{
value: "信箱",
label: "信箱",
},
{
value: "青岛来电",
label: "青岛来电",
},
{
value: "青岛短信",
label: "青岛短信",
},
{
value: "青岛信箱",
label: "青岛信箱",
},
{
value: "青岛网站",
label: "青岛网站",
},
{
value: "青岛微信",
label: "青岛微信",
},
{
value: "青岛手机APP",
label: "青岛手机APP",
},
{
value: "青岛网络舆情",
label: "青岛网络舆情",
},
{
value: "青岛人民网",
label: "青岛人民网",
},
{
value: "青岛人民来信",
label: "青岛人民来信",
},
],
qudaoArray: [
{
value: "3",

4
src/views/modules/shequzhili/analysis/formList.vue
View File

@ -125,7 +125,7 @@ export default {
try {
const url = "/governance/dwdEvent/list";
if(this.recId){
this.formData.secondIdList = [this.recId];
this.formData.firstIdList = [this.recId];
}
if(this.departId){
this.formData.departId = this.departId;
@ -134,7 +134,7 @@ export default {
this.formData.agencyId = this.communityId;
}
if(this.address){
this.formData.content = this.address;
this.formData.eventContent = this.address;
}
if(this.mobile){
this.formData.mobile = this.mobile;

32
src/views/modules/shequzhili/event/cpts/process-form-complete.vue
View File

@ -56,7 +56,8 @@
</section>
</el-form-item>
<el-divider></el-divider>
<div class="flex">
<!-- 答复人 -->
<div class="flex" v-if="sysAdvancedList.hotlineSpecialTeamReplyFlag">
<div class="item">
<el-form-item label="答复人" label-width="118px" :class="{ 'form-item': source === 'visiual' }"
prop="respondent" >
@ -154,8 +155,8 @@
</div>
<el-divider></el-divider>
<div class="flex">
<el-divider v-if="sysAdvancedList.hotlineSpecialTeamReplyFlag"></el-divider>
<div class="flex" v-if="!sysAdvancedList.columnsIgnore">
<div class="item">
<el-form-item label="回访人" label-width="118px" :class="{ 'form-item': source === 'visiual' }"
prop="returnVisitor">
@ -240,7 +241,7 @@
</el-form-item>
</div>
</div>
<el-divider></el-divider>
<el-divider v-if="!sysAdvancedList.columnsIgnore"></el-divider>
<section v-if="pageType === 'check'">
<div :class="['process-title', { 'process-title-vis': source === 'visiual' },]">
<img src="../../../../../assets/images/index/title-icon-chuli.png" width="30px" height="30px" alt="">
@ -399,6 +400,7 @@ function iniFmData() {
export default {
data() {
return {
hotlineSpecialTeamReplyFlag:false,
binaryOptionList,
nonComplianceType,
satisfactionType,
@ -451,6 +453,9 @@ showHotline:false,
nonComplianceType: [
{ required: true, message: "不合规诉求类型不能为空", trigger: "blur" },
],
nonComplianceNotesText: [
{ required: true, message: "不合规诉求类型不能为空", trigger: "blur" },
],
solveState: [
{ required: true, message: "问题解决情况不能为空", trigger: "blur" },
],
@ -498,6 +503,7 @@ showHotline:false,
},
props: {
eventId: {
type: String,
default: "",
@ -565,16 +571,18 @@ showHotline:false,
if (this.sysAdvancedList.hotlineSpecialTeamFlag==1) {
this.showHotline=true
}
console.log(this.dataRule,"dskldsklfj");
if (this.sysAdvancedList.columnsIgnore) {
console.log(this.dataRule,"dskldsklfj");
this.dataRule={}
this.dataRule = {
content: [
{ required: true, message: "办理情况不能为空", trigger: "blur" },
],
if (this.sysAdvancedList.hotlineSpecialTeamReplyFlag==0) {
let keysToDelete=['respondent','respondentPhone','verified','solveState']
keysToDelete.forEach(key => {
this.$delete(this.dataRule, key);
});
}
console.log(this.dataRule,"dskldsklfj");
if (this.sysAdvancedList.columnsIgnore) {
let keysToDelete=['returnVisitor','returnTime','loseContact','putThrough','visitComments','cooperate','satisfaction']
keysToDelete.forEach(key => {
this.$delete(this.dataRule, key);
});
}

3
src/views/modules/shequzhili/event/cpts/process-form-contact.vue
View File

@ -156,6 +156,9 @@ export default {
uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
selectList: [{ label: '属实', value: 0 }, { label: '不属实', value: 1 }],
dataRule: {
nonComplianceNotesText: [
{ required: true, message: "不合规诉求类型不能为空", trigger: "blur" },
],
content: [
{ required: true, message: '办理情况不能为空', trigger: 'blur' }
],

3
src/views/modules/shequzhili/event/cpts/process-form-process.vue
View File

@ -154,6 +154,9 @@ export default {
uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
dataRule: {
nonComplianceNotesText: [
{ required: true, message: "不合规诉求类型不能为空", trigger: "blur" },
],
content: [
{ required: true, message: "办理情况不能为空", trigger: "blur" },
],

23
src/views/modules/workSys/sysConfigure/index.vue
View File

@ -164,12 +164,31 @@
<div style="display: flex; flex-direction: row; align-items: center;">
<div style="width: 10px; height: 10px; background-color: #4e89ec"></div>
<div style="font-weight:800;font-size: 14px; margin-left: 10px;">
是否需要开启答复情况、回访情况选项
是否需要开启答复情况选项
</div>
</div>
<div
style=" margin: 20px;font-size: 14px; display: flex; align-items: center;">
若开启答复情况、回访情况选项，事件办结时需要填写相应的答复、回访信息。
若开启答复情况选项，事件办结时需要填写相应的答复信息。
</div>
</div>
<el-switch v-model="sysAdvancedList.hotlineSpecialTeamReplyFlag"
active-color="#13ce66" :active-value=1 :inactive-value=0
inactive-color="#eaecf0" @change="handleChange()">
</el-switch>
</div>
<div
style=" margin-top: 20px;display: flex;border-bottom: 1px dotted rgba(0, 0, 0, 0.3); flex-direction: row; align-items: center; justify-content: space-between;">
<div>
<div style="display: flex; flex-direction: row; align-items: center;">
<div style="width: 10px; height: 10px; background-color: #4e89ec"></div>
<div style="font-weight:800;font-size: 14px; margin-left: 10px;">
是否需要开启回访情况选项
</div>
</div>
<div
style=" margin: 20px;font-size: 14px; display: flex; align-items: center;">
若开启回访情况选项，事件办结时需要填写相应的回访信息。
</div>
</div>
<el-switch v-model="sysAdvancedList.columnsIgnore"

Write Preview
Loading…
Cancel
Save