联调

src/views/sop/sop-manage/student-sop/index.vue

@@ -251,85 +251,107 @@ const selectChange = (value) => {
   selectedRowKeys.value = value;
 };
 const originColumns = ref([]);
+
 const defaultTableColumns = [
+  { fieldId: 'taskName', fieldTitle: '当前节点', width: 160, code: 'TEXT' },
   {
-    fieldId: 'serviceName',
-    fieldTitle: '服务单元',
-    width: 160,
-    code: 'TEXT',
-  },
-  { fieldId: 'sopNo', fieldTitle: 'SOP流水号', width: 200, code: 'TEXT' },
-  { fieldId: 'crmNo', fieldTitle: '项目单号', width: 200, code: 'TEXT' },
-  { fieldId: 'beginTime', fieldTitle: '派单时间', width: 180, code: 'DATE' },
-  {
-    fieldId: 'customManagerName',
-    fieldTitle: '客户经理',
+    fieldId: 'pendApproveName',
+    fieldTitle: '当前节点负责人',
     width: 140,
-    code: 'TEXT',
-  },
-  {
-    fieldId: 'customManagerType',
-    fieldTitle: '客户类型',
-    width: 120,
     code: 'SINGLE_SELECT',
-    options: dictToOptionList(CUSTOMER_TYPE),
   },
+
   { fieldId: 'customName', fieldTitle: '客户名称', width: 140, code: 'TEXT' },
-  { fieldId: 'crmName', fieldTitle: '项目名称', minWidth: 160, code: 'TEXT' },
-  {
-    fieldId: 'productName',
-    fieldTitle: '实施产品',
-    width: 120,
-    code: 'TEXT',
-  },
   {
-    fieldId: 'examStartTime',
-    fieldTitle: '考试开始时间',
-    width: 180,
-    code: 'DATE',
-  },
-  {
-    fieldId: 'examEndTime',
-    fieldTitle: '考试结束时间',
-    width: 180,
-    code: 'DATE',
-  },
-  {
-    fieldId: 'flowCreateName',
-    fieldTitle: '提交人',
+    fieldId: 'customManagerName',
+    fieldTitle: '客户经理',
     width: 140,
     code: 'TEXT',
   },
-  {
-    fieldId: 'flowCreateTime',
-    fieldTitle: '提交时间',
-    width: 180,
-    code: 'DATE',
-  },
-  {
-    fieldId: 'flowUpdateTime',
-    fieldTitle: '更新时间',
-    width: 180,
-    code: 'DATE',
-  },
-  {
-    fieldId: 'status',
-    fieldTitle: '流程状态',
-    width: 120,
-    code: 'SINGLE_SELECT',
-    options: [
-      { value: 'AUDITING', label: '进行中' },
-      { value: 'FINISH', label: '已完结' },
-    ],
-  },
-  { fieldId: 'taskName', fieldTitle: '流程节点', width: 160, code: 'TEXT' },
-  {
-    fieldId: 'pendApproveName',
-    fieldTitle: '当前节点负责人',
-    width: 140,
-    code: 'SINGLE_SELECT',
-  },
+  { fieldId: 'crmName', fieldTitle: '项目名称', minWidth: 160, code: 'TEXT' },
+  { fieldId: 'crmNo', fieldTitle: '派单号', width: 200, code: 'TEXT' },
+  { fieldId: 'sopNo', fieldTitle: 'SOP流水号', width: 200, code: 'TEXT' },
 ];
+
+// const defaultTableColumns = [
+//   {
+//     fieldId: 'serviceName',
+//     fieldTitle: '服务单元',
+//     width: 160,
+//     code: 'TEXT',
+//   },
+//   { fieldId: 'sopNo', fieldTitle: 'SOP流水号', width: 200, code: 'TEXT' },
+//   { fieldId: 'crmNo', fieldTitle: '项目单号', width: 200, code: 'TEXT' },
+//   { fieldId: 'beginTime', fieldTitle: '派单时间', width: 180, code: 'DATE' },
+//   {
+//     fieldId: 'customManagerName',
+//     fieldTitle: '客户经理',
+//     width: 140,
+//     code: 'TEXT',
+//   },
+//   {
+//     fieldId: 'customManagerType',
+//     fieldTitle: '客户类型',
+//     width: 120,
+//     code: 'SINGLE_SELECT',
+//     options: dictToOptionList(CUSTOMER_TYPE),
+//   },
+//   { fieldId: 'customName', fieldTitle: '客户名称', width: 140, code: 'TEXT' },
+//   { fieldId: 'crmName', fieldTitle: '项目名称', minWidth: 160, code: 'TEXT' },
+//   {
+//     fieldId: 'productName',
+//     fieldTitle: '实施产品',
+//     width: 120,
+//     code: 'TEXT',
+//   },
+//   {
+//     fieldId: 'examStartTime',
+//     fieldTitle: '考试开始时间',
+//     width: 180,
+//     code: 'DATE',
+//   },
+//   {
+//     fieldId: 'examEndTime',
+//     fieldTitle: '考试结束时间',
+//     width: 180,
+//     code: 'DATE',
+//   },
+//   {
+//     fieldId: 'flowCreateName',
+//     fieldTitle: '提交人',
+//     width: 140,
+//     code: 'TEXT',
+//   },
+//   {
+//     fieldId: 'flowCreateTime',
+//     fieldTitle: '提交时间',
+//     width: 180,
+//     code: 'DATE',
+//   },
+//   {
+//     fieldId: 'flowUpdateTime',
+//     fieldTitle: '更新时间',
+//     width: 180,
+//     code: 'DATE',
+//   },
+//   {
+//     fieldId: 'status',
+//     fieldTitle: '流程状态',
+//     width: 120,
+//     code: 'SINGLE_SELECT',
+//     options: [
+//       { value: 'AUDITING', label: '进行中' },
+//       { value: 'FINISH', label: '已完结' },
+//     ],
+//   },
+//   { fieldId: 'taskName', fieldTitle: '流程节点', width: 160, code: 'TEXT' },
+//   {
+//     fieldId: 'pendApproveName',
+//     fieldTitle: '当前节点负责人',
+//     width: 140,
+//     code: 'SINGLE_SELECT',
+//   },
+// ];
 originColumns.value = cloneDeep(defaultTableColumns);
 
 const originFieldIds = computed(() => {
@@ -527,9 +549,12 @@ const params = reactive({
 });
 
 const transParams = computed(() => {
-  let formWidgetMetadataViewList = params.formWidgetMetadataViewList
-    .filter((item) => !originFieldIds.value.includes(item.fieldId))
-    .map((item) => ({ fieldId: item.fieldId }));
+  // let formWidgetMetadataViewList = params.formWidgetMetadataViewList
+  //   .filter((item) => !originFieldIds.value.includes(item.fieldId))
+  //   .map((item) => ({ fieldId: item.fieldId }));
+  let formWidgetMetadataViewList = params.formWidgetMetadataViewList.map(
+    (item) => ({ fieldId: item.fieldId })
+  );
   return {
     ...omit(params, ['fastSearch', 'fastColumns']),
     formWidgetMetadataViewList,