Compare commits

..

No commits in common. 'ed0739295a62613131e1ca54f1415b8665c8d8b1' and '1b01eda9a2216b836c557bc94388998725e9d123' have entirely different histories.

  1. 31
      src/components/negative/add.vue
  2. 4
      src/components/negative/description.vue
  3. 59
      src/views/data/ComplaintCollection.vue
  4. 32
      src/views/datav/MailVisits.vue
  5. 21
      src/views/datav/subonedatav/SubOneMailVisits.vue
  6. 26
      src/views/jwpy/query_110jcj.vue
  7. 26
      src/views/jwpy/query_122jcj.vue
  8. 26
      src/views/jwpy/query_cjglfw.vue
  9. 26
      src/views/jwpy/query_jwpy_total.vue
  10. 26
      src/views/jwpy/query_rjckfw.vue
  11. 26
      src/views/jwpy/query_zfba.vue
  12. 26
      src/views/mobileSupervise/Query_xcdc.vue
  13. 7
      src/views/mobileSupervise/TaskProblem.vue
  14. 4
      src/views/sjdc/Query_JJZRSJ.vue
  15. 4
      src/views/sjdc/Query_ZFSACFSS.vue
  16. 4
      src/views/sjdc/Query_ZXSJ.vue

31
src/components/negative/add.vue

@ -68,17 +68,22 @@
<el-row> <el-row>
<el-col <el-col
:span="12" :span="12"
v-if="
form.problemSourcesCode === ProblemSources.ZXDC
"
> >
<el-form-item <el-form-item
label="专项督察" label="专项督察"
prop="specialSupervision" prop="specialSupervision"
:rules="{
required: true,
message: '请选择专项督察',
trigger: ['blur'],
}"
> >
<el-select <el-select
v-model="form.specialSupervision" v-model="form.specialSupervision"
multiple
clearable clearable
collapse-tags
placeholder="请选择专项督察"
> >
<el-option <el-option
v-for="item in dict.specialSupervision" v-for="item in dict.specialSupervision"
@ -91,6 +96,11 @@
</el-col> </el-col>
<el-col <el-col
:span="12" :span="12"
v-if="
form.problemSourcesCode ===
ProblemSources.ZXDC ||
form.problemSourcesCode === ProblemSources.XCDC
"
> >
<el-form-item-ext <el-form-item-ext
@ -98,6 +108,7 @@
content="如未下拉项中找到对应的通报期数,请前往通报管理中补充对应的通报" content="如未下拉项中找到对应的通报期数,请前往通报管理中补充对应的通报"
prop="reportNumber" prop="reportNumber"
:rules="{ :rules="{
required: form.specialSupervision !== '2',
message: '请输入通报期数', message: '请输入通报期数',
trigger: ['blur'], trigger: ['blur'],
}" }"
@ -601,15 +612,6 @@ const form = ref({
timeLimit: TimeLimit.WORK_137, timeLimit: TimeLimit.WORK_137,
approvalFlow: ApprovalFlow.SECOND, approvalFlow: ApprovalFlow.SECOND,
problems: [], problems: [],
specialSupervision: [],
});
//
const specialSupervisionStr = computed(() => {
if (Array.isArray(form.value.specialSupervision)) {
return form.value.specialSupervision.filter(v => v).join(',');
}
return form.value.specialSupervision;
}); });
watch( watch(
@ -634,10 +636,6 @@ async function handleAddNegative() {
form.value.thingFiles = form.value.thingFiles.filter( form.value.thingFiles = form.value.thingFiles.filter(
(item) => item.filePath (item) => item.filePath
); );
//
if (Array.isArray(form.value.specialSupervision)) {
form.value.specialSupervision = form.value.specialSupervision.filter(v => v).join(',');
}
loading.value = true; loading.value = true;
try { try {
await addNegative(form.value); await addNegative(form.value);
@ -651,7 +649,6 @@ async function handleAddNegative() {
hostLevel: HostLevel.THREE, hostLevel: HostLevel.THREE,
timeLimit: TimeLimit.WORK_137, timeLimit: TimeLimit.WORK_137,
approvalFlow: ApprovalFlow.SECOND, approvalFlow: ApprovalFlow.SECOND,
specialSupervision: [],
}; };
reportData.value=null; reportData.value=null;
feedback.msgSuccess("下发成功"); feedback.msgSuccess("下发成功");

4
src/components/negative/description.vue

@ -40,7 +40,7 @@
</div> </div>
<div class="col col-6" v-if="negative.specialSupervision"> <div class="col col-6" v-if="negative.specialSupervision">
<label>专项督察</label> <label>专项督察</label>
<span>{{ getInvolveProblem(negative.specialSupervision, dict.specialSupervision) }}</span> <span>{{ getDictLable(dict.specialSupervision, negative.specialSupervision) }}</span>
</div> </div>
<div class="col col-6" v-if="negative.reportNumber"> <div class="col col-6" v-if="negative.reportNumber">
<label>警情期数</label> <label>警情期数</label>
@ -82,7 +82,7 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { getInvolveProblem } from "@/utils/util"; import { getDictLable, getInvolveProblem } from "@/utils/util";
const negative = inject('negative') const negative = inject('negative')
import useCatchStore from "@/stores/modules/catch"; import useCatchStore from "@/stores/modules/catch";
const catchSotre = useCatchStore(); const catchSotre = useCatchStore();

59
src/views/data/ComplaintCollection.vue

@ -53,14 +53,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="涉及三级机构" prop="thirdDepartId">
<depart-tree-select
v-model="query.thirdDepartId"
:check-strictly="true"
/>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="办理方式"> <el-form-item label="办理方式">
<el-select <el-select
@ -87,7 +79,24 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="标签">
<el-select
placeholder="全部"
clearable
v-model="query.tags"
multiple
collapse-tags
>
<el-option
v-for="item in dict.sfssTags"
:key="item.id"
:value="item.dictValue"
:label="item.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
@ -157,24 +166,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="标签">
<el-select
placeholder="全部"
clearable
v-model="query.tags"
multiple
collapse-tags
>
<el-option
v-for="item in dict.sfssTags"
:key="item.id"
:value="item.dictValue"
:label="item.dictLabel"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="录入时间"> <el-form-item label="录入时间">
<date-time-range-picker-ext <date-time-range-picker-ext
@ -256,12 +247,7 @@
:formatter="row => row.responderIdCode ? row.responderIdCode : '无'" show-overflow-tooltip/> :formatter="row => row.responderIdCode ? row.responderIdCode : '无'" show-overflow-tooltip/>
<el-table-column label="联系电话" width="100" prop="responderPhone" <el-table-column label="联系电话" width="100" prop="responderPhone"
:formatter="row => row.responderPhone ? row.responderPhone : '无'" show-overflow-tooltip/> :formatter="row => row.responderPhone ? row.responderPhone : '无'" show-overflow-tooltip/>
<el-table-column label="被投诉机构" width="130" show-overflow-tooltip> <el-table-column label="被投诉机构" width="130" prop="secondDepartName"/>
<template #default="{ row }">
<span>{{ row.secondDepartName }}</span>
<span v-if="row.thirdDepartName"> {{ row.thirdDepartName }}</span>
</template>
</el-table-column>
<el-table-column label="来信内容" width="100" prop="thingDesc" show-overflow-tooltip/> <el-table-column label="来信内容" width="100" prop="thingDesc" show-overflow-tooltip/>
<el-table-column label="涉嫌问题" width="100" prop="involveProblemStr" show-overflow-tooltip/> <el-table-column label="涉嫌问题" width="100" prop="involveProblemStr" show-overflow-tooltip/>
<el-table-column label="是否重复件" width="100"> <el-table-column label="是否重复件" width="100">
@ -452,8 +438,6 @@ const query = ref({
sourcePath: [], sourcePath: [],
sourceTableList: [], sourceTableList: [],
sourceTableSubOneList: [], sourceTableSubOneList: [],
secondDepartId: null,
thirdDepartId: null,
}); });
watch( watch(
() => query.value.sourcePath, () => query.value.sourcePath,
@ -500,11 +484,6 @@ function reset() {
query.value = { query.value = {
size: 10, size: 10,
current: 1, current: 1,
sourcePath: [],
sourceTableList: [],
sourceTableSubOneList: [],
secondDepartId: null,
thirdDepartId: null,
}; };
getList(); getList();
} }

32
src/views/datav/MailVisits.vue

@ -127,7 +127,7 @@
</template> </template>
<div <div
class="overview-tip-trigger" class="overview-tip-trigger"
style="width: 33.33%" style="width: 20%"
:class="{ 'is-clickable': item.clickable }" :class="{ 'is-clickable': item.clickable }"
@click="item.onClick && item.onClick()" @click="item.onClick && item.onClick()"
> >
@ -170,7 +170,6 @@
autoresize autoresize
/> />
</datav-tab-item> </datav-tab-item>
<!-- 12337信访 - 已隐藏
<datav-tab-item label="12337信访" name="4"> <datav-tab-item label="12337信访" name="4">
<v-charts <v-charts
style="width: 105%; height: 300px; " style="width: 105%; height: 300px; "
@ -178,7 +177,6 @@
autoresize autoresize
/> />
</datav-tab-item> </datav-tab-item>
-->
</datav-tabs> </datav-tabs>
<div class="gobal-dropdown-container"> <div class="gobal-dropdown-container">
<el-dropdown class="test" @command="handleCommand"> <el-dropdown class="test" @command="handleCommand">
@ -362,15 +360,14 @@ const overviewCards = computed(() => [
clickable: true, clickable: true,
onClick: () => open('/data/gabxf?open=view'), onClick: () => open('/data/gabxf?open=view'),
}, },
// 12337访 - {
// { title: "12337信访",
// title: "12337访", value: overview.value.numberMail,
// value: overview.value.numberMail, desc: "统计时间范围内 12337 平台来源的数据数量。",
// desc: " 12337 ", formula: "统计方式:12337信访数据数量汇总",
// formula: "12337访", clickable: true,
// clickable: true, onClick: () => open('/query?open=12337'),
// onClick: () => open('/query?open=12337'), },
// },
]); ]);
// //
// //
@ -496,9 +493,7 @@ const option = ref({
<li>信访总件数 <span>${dataItem.total}</span></li> <li>信访总件数 <span>${dataItem.total}</span></li>
<li>国家信访 <span> ${dataItem.countryTotal}</span></li> <li>国家信访 <span> ${dataItem.countryTotal}</span></li>
<li>公安部信访 <span> ${dataItem.policeTotal}</span></li> <li>公安部信访 <span> ${dataItem.policeTotal}</span></li>
<!-- 12337信访 - 已隐藏
<li>12337信访 <span>${dataItem.numTotal}</span></li> <li>12337信访 <span>${dataItem.numTotal}</span></li>
-->
</ul> </ul>
</div> </div>
</div>`; </div>`;
@ -510,9 +505,7 @@ const option = ref({
<li>信访总件数 <span>0</span></li> <li>信访总件数 <span>0</span></li>
<li>国家信访 <span>0</span></li> <li>国家信访 <span>0</span></li>
<li>公安部信访 <span>0</span></li> <li>公安部信访 <span>0</span></li>
<!-- 12337信访 - 已隐藏
<li>12337信访 <span>0</span></li> <li>12337信访 <span>0</span></li>
-->
</ul> </ul>
</div> </div>
</div>`; </div>`;
@ -871,8 +864,7 @@ const getAllMailCountDataFun = async () => {
option2.value.series[0].data= [{value:overview.value.manageMail,name:"局长信箱"}, option2.value.series[0].data= [{value:overview.value.manageMail,name:"局长信箱"},
{value:overview.value.countryMail,name:"国家信访"}, {value:overview.value.countryMail,name:"国家信访"},
{value:overview.value.policeMail,name:"公安部信访"}, {value:overview.value.policeMail,name:"公安部信访"},
// {value:overview.value.numberMail,name:"12337访"}, // {value:overview.value.numberMail,name:"12337信访"},].filter(item => item.value > 0);
].filter(item => item.value > 0);
} }
@ -1023,9 +1015,9 @@ const mailMapAnimation = () => {
}; };
mailMapIntervalId = setInterval(mailMapAnimation, 2000); mailMapIntervalId = setInterval(mailMapAnimation, 2000);
// - 12337访Tab //
const mailTrendAnimation = () => { const mailTrendAnimation = () => {
mailTrendTabs.value = (parseInt(mailTrendTabs.value) % 3 + 1).toString(); mailTrendTabs.value = (parseInt(mailTrendTabs.value) % 4 + 1).toString();
} }
mailTrendIntervalId = setInterval(mailTrendAnimation, 2000); mailTrendIntervalId = setInterval(mailTrendAnimation, 2000);
// 访访 // 访访

21
src/views/datav/subonedatav/SubOneMailVisits.vue

@ -112,32 +112,30 @@
<datav-statistic <datav-statistic
:value="overview.manageMail" :value="overview.manageMail"
title="局长信箱" title="局长信箱"
style="width: 33.3%" style="width: 20%"
/> />
<datav-statistic <datav-statistic
:value="overview.totalMail" :value="overview.totalMail"
title="信访总件数" title="信访总件数"
style="width: 33.3%" style="width: 20%"
/> />
<datav-statistic <datav-statistic
:value="overview.countryMail" :value="overview.countryMail"
title="国家信访" title="国家信访"
style="width: 33.3%" style="width: 20%"
/> />
<datav-statistic <datav-statistic
:value="overview.policeMail" :value="overview.policeMail"
title="公安部信访" title="公安部信访"
style="width: 33.3%" style="width: 20%"
/> />
<!-- 12337信访 - 已隐藏
<datav-statistic <datav-statistic
:value="overview.numberMail" :value="overview.numberMail"
title="12337信访" title="12337信访"
style="width: 20%" style="width: 20%"
/> />
-->
</div> </div>
<v-charts <v-charts
@ -171,7 +169,6 @@
autoresize autoresize
/> />
</datav-tab-item> </datav-tab-item>
<!-- 12337信访 - 已隐藏
<datav-tab-item label="12337信访" name="4"> <datav-tab-item label="12337信访" name="4">
<v-charts <v-charts
style="width: 105%; height: 300px; " style="width: 105%; height: 300px; "
@ -179,7 +176,6 @@
autoresize autoresize
/> />
</datav-tab-item> </datav-tab-item>
-->
</datav-tabs> </datav-tabs>
<div class="gobal-dropdown-container"> <div class="gobal-dropdown-container">
<el-dropdown class="test" @command="handleCommand"> <el-dropdown class="test" @command="handleCommand">
@ -462,8 +458,7 @@ const getSubOneAllMailCountData = async () => {
option2.value.series[0].data= [{value:overview.value.manageMail,name:"局长信箱"}, option2.value.series[0].data= [{value:overview.value.manageMail,name:"局长信箱"},
{value:overview.value.countryMail,name:"国家信访"}, {value:overview.value.countryMail,name:"国家信访"},
{value:overview.value.policeMail,name:"公安部信访"}, {value:overview.value.policeMail,name:"公安部信访"},
// {value:overview.value.numberMail,name:"12337访"}, // 12337访 - {value:overview.value.numberMail,name:"12337信访"},].filter(item => item.value > 0);
].filter(item => item.value > 0);
} }
@ -567,9 +562,7 @@ const option = ref({
<li>国家信访 <span>${dataItem.countryTotal}</span></li> <li>国家信访 <span>${dataItem.countryTotal}</span></li>
<li>公安部信访 <span>${dataItem.policeTotal}</span></li> <li>公安部信访 <span>${dataItem.policeTotal}</span></li>
<li>局长信箱 <span>${dataItem.commissionerTotal}</span></li> <li>局长信箱 <span>${dataItem.commissionerTotal}</span></li>
<!-- 12337信访 - 已隐藏
<li>12337信访 <span>${dataItem.numTotal}</span></li> <li>12337信访 <span>${dataItem.numTotal}</span></li>
-->
</ul> </ul>
</div> </div>
</div>`; </div>`;
@ -582,9 +575,7 @@ const option = ref({
<li>国家信访 <span>0</span></li> <li>国家信访 <span>0</span></li>
<li>公安部信访 <span>0</span></li> <li>公安部信访 <span>0</span></li>
<li>局长信箱 <span>0</span></li> <li>局长信箱 <span>0</span></li>
<!-- 12337信访 - 已隐藏
<li>12337信访 <span>0</span></li> <li>12337信访 <span>0</span></li>
-->
</ul> </ul>
</div> </div>
</div>`; </div>`;
@ -980,7 +971,7 @@ const subOneMailMapAnimation = () => {
subOneMailMapIntervalId = setInterval(subOneMailMapAnimation, 2000); subOneMailMapIntervalId = setInterval(subOneMailMapAnimation, 2000);
// //
const subOneMailTrendAnimation = () => { const subOneMailTrendAnimation = () => {
subOneMailTrendTabs.value = (parseInt(subOneMailTrendTabs.value) % 3 + 1).toString(); subOneMailTrendTabs.value = (parseInt(subOneMailTrendTabs.value) % 4 + 1).toString();
} }
subOneMailTrendIntervalId = setInterval(subOneMailTrendAnimation, 2000); subOneMailTrendIntervalId = setInterval(subOneMailTrendAnimation, 2000);
// 访访 // 访访

26
src/views/jwpy/query_110jcj.vue

@ -540,12 +540,12 @@
width="150" width="150"
sortable="custom" sortable="custom"
/> />
<!-- <el-table-column <el-table-column
label="问题发现时间" label="问题发现时间"
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
sortable="custom" sortable="custom"
/> --> />
<el-table-column <el-table-column
label="问题来源" label="问题来源"
prop="problemSources" prop="problemSources"
@ -1067,28 +1067,20 @@ const formData = ref({});
const formRef = ref(null); const formRef = ref(null);
function handleEdit(row) { function handleEdit(row) {
const form = {...row}; console.log(row);
editShow.value = true;
formData.value = {...row};
if (row.involveProblem) { if (row.involveProblem) {
form.involveProblem = row.involveProblem.split(","); formData.value.involveProblem =
formData.value.involveProblem.split(",");
} else { } else {
form.involveProblem = []; formData.value.involveProblem = [];
} }
if (row.specialSupervision) {
form.specialSupervision = row.specialSupervision.split(",");
} else {
form.specialSupervision = [];
}
formData.value = form;
editShow.value = true;
} }
async function handleSumbit() { async function handleSumbit() {
await formRef.value.validate(); await formRef.value.validate();
const submitData = JSON.parse(JSON.stringify(formData.value)); await updateNegative(formData.value);
if (Array.isArray(submitData.specialSupervision)) {
submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
}
await updateNegative(submitData);
editShow.value = false; editShow.value = false;
feedback.msgSuccess("操作成功"); feedback.msgSuccess("操作成功");
getList(); getList();

26
src/views/jwpy/query_122jcj.vue

@ -540,12 +540,12 @@
width="150" width="150"
sortable="custom" sortable="custom"
/> />
<!-- <el-table-column <el-table-column
label="问题发现时间" label="问题发现时间"
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
sortable="custom" sortable="custom"
/> --> />
<el-table-column <el-table-column
label="问题来源" label="问题来源"
prop="problemSources" prop="problemSources"
@ -1067,28 +1067,20 @@ const formData = ref({});
const formRef = ref(null); const formRef = ref(null);
function handleEdit(row) { function handleEdit(row) {
const form = {...row}; console.log(row);
editShow.value = true;
formData.value = {...row};
if (row.involveProblem) { if (row.involveProblem) {
form.involveProblem = row.involveProblem.split(","); formData.value.involveProblem =
formData.value.involveProblem.split(",");
} else { } else {
form.involveProblem = []; formData.value.involveProblem = [];
} }
if (row.specialSupervision) {
form.specialSupervision = row.specialSupervision.split(",");
} else {
form.specialSupervision = [];
}
formData.value = form;
editShow.value = true;
} }
async function handleSumbit() { async function handleSumbit() {
await formRef.value.validate(); await formRef.value.validate();
const submitData = JSON.parse(JSON.stringify(formData.value)); await updateNegative(formData.value);
if (Array.isArray(submitData.specialSupervision)) {
submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
}
await updateNegative(submitData);
editShow.value = false; editShow.value = false;
feedback.msgSuccess("操作成功"); feedback.msgSuccess("操作成功");
getList(); getList();

26
src/views/jwpy/query_cjglfw.vue

@ -540,12 +540,12 @@
width="150" width="150"
sortable="custom" sortable="custom"
/> />
<!-- <el-table-column <el-table-column
label="问题发现时间" label="问题发现时间"
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
sortable="custom" sortable="custom"
/> --> />
<el-table-column <el-table-column
label="问题来源" label="问题来源"
prop="problemSources" prop="problemSources"
@ -1067,28 +1067,20 @@ const formData = ref({});
const formRef = ref(null); const formRef = ref(null);
function handleEdit(row) { function handleEdit(row) {
const form = {...row}; console.log(row);
editShow.value = true;
formData.value = {...row};
if (row.involveProblem) { if (row.involveProblem) {
form.involveProblem = row.involveProblem.split(","); formData.value.involveProblem =
formData.value.involveProblem.split(",");
} else { } else {
form.involveProblem = []; formData.value.involveProblem = [];
} }
if (row.specialSupervision) {
form.specialSupervision = row.specialSupervision.split(",");
} else {
form.specialSupervision = [];
}
formData.value = form;
editShow.value = true;
} }
async function handleSumbit() { async function handleSumbit() {
await formRef.value.validate(); await formRef.value.validate();
const submitData = JSON.parse(JSON.stringify(formData.value)); await updateNegative(formData.value);
if (Array.isArray(submitData.specialSupervision)) {
submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
}
await updateNegative(submitData);
editShow.value = false; editShow.value = false;
feedback.msgSuccess("操作成功"); feedback.msgSuccess("操作成功");
getList(); getList();

26
src/views/jwpy/query_jwpy_total.vue

@ -540,12 +540,12 @@
width="150" width="150"
sortable="custom" sortable="custom"
/> />
<!-- <el-table-column <el-table-column
label="问题发现时间" label="问题发现时间"
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
sortable="custom" sortable="custom"
/> --> />
<el-table-column <el-table-column
label="问题来源" label="问题来源"
prop="problemSources" prop="problemSources"
@ -1102,28 +1102,20 @@ const formData = ref({});
const formRef = ref(null); const formRef = ref(null);
function handleEdit(row) { function handleEdit(row) {
const form = {...row}; console.log(row);
editShow.value = true;
formData.value = {...row};
if (row.involveProblem) { if (row.involveProblem) {
form.involveProblem = row.involveProblem.split(","); formData.value.involveProblem =
formData.value.involveProblem.split(",");
} else { } else {
form.involveProblem = []; formData.value.involveProblem = [];
} }
if (row.specialSupervision) {
form.specialSupervision = row.specialSupervision.split(",");
} else {
form.specialSupervision = [];
}
formData.value = form;
editShow.value = true;
} }
async function handleSumbit() { async function handleSumbit() {
await formRef.value.validate(); await formRef.value.validate();
const submitData = JSON.parse(JSON.stringify(formData.value)); await updateNegative(formData.value);
if (Array.isArray(submitData.specialSupervision)) {
submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
}
await updateNegative(submitData);
editShow.value = false; editShow.value = false;
feedback.msgSuccess("操作成功"); feedback.msgSuccess("操作成功");
getList(); getList();

26
src/views/jwpy/query_rjckfw.vue

@ -540,12 +540,12 @@
width="150" width="150"
sortable="custom" sortable="custom"
/> />
<!-- <el-table-column <el-table-column
label="问题发现时间" label="问题发现时间"
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
sortable="custom" sortable="custom"
/> --> />
<el-table-column <el-table-column
label="问题来源" label="问题来源"
prop="problemSources" prop="problemSources"
@ -1067,28 +1067,20 @@ const formData = ref({});
const formRef = ref(null); const formRef = ref(null);
function handleEdit(row) { function handleEdit(row) {
const form = {...row}; console.log(row);
editShow.value = true;
formData.value = {...row};
if (row.involveProblem) { if (row.involveProblem) {
form.involveProblem = row.involveProblem.split(","); formData.value.involveProblem =
formData.value.involveProblem.split(",");
} else { } else {
form.involveProblem = []; formData.value.involveProblem = [];
} }
if (row.specialSupervision) {
form.specialSupervision = row.specialSupervision.split(",");
} else {
form.specialSupervision = [];
}
formData.value = form;
editShow.value = true;
} }
async function handleSumbit() { async function handleSumbit() {
await formRef.value.validate(); await formRef.value.validate();
const submitData = JSON.parse(JSON.stringify(formData.value)); await updateNegative(formData.value);
if (Array.isArray(submitData.specialSupervision)) {
submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
}
await updateNegative(submitData);
editShow.value = false; editShow.value = false;
feedback.msgSuccess("操作成功"); feedback.msgSuccess("操作成功");
getList(); getList();

26
src/views/jwpy/query_zfba.vue

@ -540,12 +540,12 @@
width="150" width="150"
sortable="custom" sortable="custom"
/> />
<!-- <el-table-column <el-table-column
label="问题发现时间" label="问题发现时间"
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
sortable="custom" sortable="custom"
/> --> />
<el-table-column <el-table-column
label="问题来源" label="问题来源"
prop="problemSources" prop="problemSources"
@ -1067,28 +1067,20 @@ const formData = ref({});
const formRef = ref(null); const formRef = ref(null);
function handleEdit(row) { function handleEdit(row) {
const form = {...row}; console.log(row);
editShow.value = true;
formData.value = {...row};
if (row.involveProblem) { if (row.involveProblem) {
form.involveProblem = row.involveProblem.split(","); formData.value.involveProblem =
formData.value.involveProblem.split(",");
} else { } else {
form.involveProblem = []; formData.value.involveProblem = [];
} }
if (row.specialSupervision) {
form.specialSupervision = row.specialSupervision.split(",");
} else {
form.specialSupervision = [];
}
formData.value = form;
editShow.value = true;
} }
async function handleSumbit() { async function handleSumbit() {
await formRef.value.validate(); await formRef.value.validate();
const submitData = JSON.parse(JSON.stringify(formData.value)); await updateNegative(formData.value);
if (Array.isArray(submitData.specialSupervision)) {
submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
}
await updateNegative(submitData);
editShow.value = false; editShow.value = false;
feedback.msgSuccess("操作成功"); feedback.msgSuccess("操作成功");
getList(); getList();

26
src/views/mobileSupervise/Query_xcdc.vue

@ -545,12 +545,12 @@
width="150" width="150"
sortable="custom" sortable="custom"
/> />
<!-- <el-table-column <el-table-column
label="问题发现时间" label="问题发现时间"
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
sortable="custom" sortable="custom"
/> --> />
<el-table-column <el-table-column
label="问题来源" label="问题来源"
prop="problemSources" prop="problemSources"
@ -1068,28 +1068,20 @@ const formData = ref({});
const formRef = ref(null); const formRef = ref(null);
function handleEdit(row) { function handleEdit(row) {
const form = {...row}; console.log(row);
editShow.value = true;
formData.value = {...row};
if (row.involveProblem) { if (row.involveProblem) {
form.involveProblem = row.involveProblem.split(","); formData.value.involveProblem =
formData.value.involveProblem.split(",");
} else { } else {
form.involveProblem = []; formData.value.involveProblem = [];
} }
if (row.specialSupervision) {
form.specialSupervision = row.specialSupervision.split(",");
} else {
form.specialSupervision = [];
}
formData.value = form;
editShow.value = true;
} }
async function handleSumbit() { async function handleSumbit() {
await formRef.value.validate(); await formRef.value.validate();
const submitData = JSON.parse(JSON.stringify(formData.value)); await updateNegative(formData.value);
if (Array.isArray(submitData.specialSupervision)) {
submitData.specialSupervision = submitData.specialSupervision.filter(v => v).join(',');
}
await updateNegative(submitData);
editShow.value = false; editShow.value = false;
feedback.msgSuccess("操作成功"); feedback.msgSuccess("操作成功");
getList(); getList();

7
src/views/mobileSupervise/TaskProblem.vue

@ -57,7 +57,7 @@
<el-tabs class="demo-tabs" @tab-click="handleTabClick"> <el-tabs class="demo-tabs" @tab-click="handleTabClick">
<el-tab-pane label="全部" name="0"></el-tab-pane> <el-tab-pane label="全部" name="0"></el-tab-pane>
<el-tab-pane label="待下发" name="1"></el-tab-pane> <el-tab-pane label="查实" name="1"></el-tab-pane>
<el-tab-pane label="查否" name="2"></el-tab-pane> <el-tab-pane label="查否" name="2"></el-tab-pane>
</el-tabs> </el-tabs>
<div class="table-container"> <div class="table-container">
@ -85,7 +85,6 @@
<el-table-column label="涉及单位" prop="departName" show-overflow-tooltip /> <el-table-column label="涉及单位" prop="departName" show-overflow-tooltip />
<el-table-column label="问题类型" prop="problemType" show-overflow-tooltip /> <el-table-column label="问题类型" prop="problemType" show-overflow-tooltip />
<el-table-column label="问题描述" prop="thingDesc" show-overflow-tooltip /> <el-table-column label="问题描述" prop="thingDesc" show-overflow-tooltip />
<el-table-column label="查否时间" prop="rejectTime" width="150" v-if="query.actionType === '2'" />
<el-table-column label="分发状态" width="90" align="center"> <el-table-column label="分发状态" width="90" align="center">
<template #default="{ row }"> <template #default="{ row }">
<span v-if="row.distributionState === '0'">未分发</span> <span v-if="row.distributionState === '0'">未分发</span>
@ -105,11 +104,11 @@
编辑 编辑
</el-button> </el-button>
<el-button <el-button
v-if="row.distributionState === '0' && query.actionType !== '2'" v-if="row.distributionState === '0'"
type="primary" type="primary"
link link
@click="issueMatterFun(row)" @click="issueMatterFun(row)"
>下发</el-button> >查实</el-button>
<el-button <el-button
:type="row.problemState == '1' ? 'danger' : 'primary'" :type="row.problemState == '1' ? 'danger' : 'primary'"
link link

4
src/views/sjdc/Query_JJZRSJ.vue

@ -545,12 +545,12 @@
width="150" width="150"
sortable="custom" sortable="custom"
/> />
<!-- <el-table-column <el-table-column
label="问题发现时间" label="问题发现时间"
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
sortable="custom" sortable="custom"
/> --> />
<el-table-column <el-table-column
label="问题来源" label="问题来源"
prop="problemSources" prop="problemSources"

4
src/views/sjdc/Query_ZFSACFSS.vue

@ -545,12 +545,12 @@
width="150" width="150"
sortable="custom" sortable="custom"
/> />
<!-- <el-table-column <el-table-column
label="问题发现时间" label="问题发现时间"
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
sortable="custom" sortable="custom"
/> --> />
<el-table-column <el-table-column
label="问题来源" label="问题来源"
prop="problemSources" prop="problemSources"

4
src/views/sjdc/Query_ZXSJ.vue

@ -545,12 +545,12 @@
width="150" width="150"
sortable="custom" sortable="custom"
/> />
<!-- <el-table-column <el-table-column
label="问题发现时间" label="问题发现时间"
prop="discoveryTime" prop="discoveryTime"
width="150" width="150"
sortable="custom" sortable="custom"
/> --> />
<el-table-column <el-table-column
label="问题来源" label="问题来源"
prop="problemSources" prop="problemSources"

Loading…
Cancel
Save