diff --git a/src/views/bg/xispeak/BgXiSpeak.api.ts b/src/views/bg/xispeak/BgXiSpeak.api.ts
index 548d3cf..61b6683 100644
--- a/src/views/bg/xispeak/BgXiSpeak.api.ts
+++ b/src/views/bg/xispeak/BgXiSpeak.api.ts
@@ -162,3 +162,7 @@ export const saveBpmForm = (params) => {
export const setProcessVariable = (params) => {
return defHttp.post({ url: '/act/process/setProcessVariable', params }, { isTransformResponse: false });
};
+
+export const updateLaunchType = (params) => {
+ return defHttp.post({ url: '/bg/xispeak/bgXiSpeak/edit', params }, { isTransformResponse: false });
+};
diff --git a/src/views/bg/xispeak/BgXiSpeak.data.ts b/src/views/bg/xispeak/BgXiSpeak.data.ts
index 34b36ba..a3da185 100644
--- a/src/views/bg/xispeak/BgXiSpeak.data.ts
+++ b/src/views/bg/xispeak/BgXiSpeak.data.ts
@@ -119,20 +119,15 @@ export const columns: BasicColumn[] = [
//子表列表数据
export const bgXiSpeakFeedbackColumns: BasicColumn[] = [
{
- title: '反馈部门id',
+ title: '序号',
align: 'center',
- dataIndex: 'responDeptid',
+ dataIndex: 'num',
},
{
title: '反馈部门名称',
align: 'center',
dataIndex: 'responDeptname',
},
- {
- title: '反馈人id',
- align: 'center',
- dataIndex: 'responPersonid',
- },
{
title: '反馈人姓名',
align: 'center',
@@ -143,13 +138,51 @@ export const bgXiSpeakFeedbackColumns: BasicColumn[] = [
align: 'center',
dataIndex: 'responTime',
customRender: ({ text }) => {
- text = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
- return text;
+ if (!text) return '';
+ if (text instanceof Date) {
+ const y = text.getFullYear();
+ const m = String(text.getMonth() + 1).padStart(2, '0');
+ const d = String(text.getDate()).padStart(2, '0');
+ return `${y}-${m}-${d}`;
+ }
+ text = String(text);
+ return text.length > 10 ? text.substr(0, 10) : text;
},
},
{
- title: '落实情况',
+ title: '措施内容',
+ align: 'left',
+ dataIndex: 'method',
+ },
+ {
+ title: '完成期限',
align: 'center',
+ dataIndex: 'deadline',
+ customRender: ({ text }) => {
+ if (!text) return '';
+ if (text instanceof Date) {
+ const y = text.getFullYear();
+ const m = String(text.getMonth() + 1).padStart(2, '0');
+ const d = String(text.getDate()).padStart(2, '0');
+ return `${y}-${m}-${d}`;
+ }
+ text = String(text);
+ return text.length > 10 ? text.substr(0, 10) : text;
+ },
+ },
+ {
+ title: '成果形式',
+ align: 'center',
+ dataIndex: 'outcomeForm',
+ },
+ {
+ title: '进展情况',
+ align: 'left',
+ dataIndex: 'progress',
+ },
+ {
+ title: '落实情况',
+ align: 'left',
dataIndex: 'implStatus',
},
{
@@ -158,9 +191,29 @@ export const bgXiSpeakFeedbackColumns: BasicColumn[] = [
dataIndex: 'completionStatus',
},
{
- title: '外键',
+ title: '落实计划',
+ align: 'left',
+ dataIndex: 'completionPlan',
+ },
+ {
+ title: '总措施号',
align: 'center',
- dataIndex: 'mainId',
+ dataIndex: 'sumMethodNum',
+ },
+ {
+ title: '检查情况',
+ align: 'center',
+ dataIndex: 'checkStatus',
+ },
+ {
+ title: '监督意见',
+ align: 'left',
+ dataIndex: 'inspectionAdvice',
+ },
+ {
+ title: '措施数量',
+ align: 'center',
+ dataIndex: 'measureNum',
},
];
diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue
index a648796..6a72fee 100644
--- a/src/views/bg/xispeak/BgXiSpeakList.vue
+++ b/src/views/bg/xispeak/BgXiSpeakList.vue
@@ -37,13 +37,53 @@
+
+
+
+
+
+
+
+
+
反馈信息
+
+ {{ feedbackTableLoading ? '加载中' : `${getFeedbackCount(record)} 条` }}
+
+
+
+
+
+
+
+ -
+
+
+
+
-
-
-
-
-
-
@@ -57,23 +97,24 @@