联调

src/main.js

@@ -16,7 +16,6 @@ import './style/black.less';
 import 'uno.css';
 import { setGlobalOptions } from 'vue-request';
 import packageJson from '../package.json';
-import dataKitSdk from '@/utils/dataKit';
 // import './mock/index';
 setGlobalOptions({
   manual: true, //当 manual 设置为 true 时，你需要手动触发 run 或者 runAsync 才会发起请求 ,见vue-request文档：https://www.attojs.com/api/#manual
@@ -31,4 +30,3 @@ app.mount('#app');
 
 capsule('质控平台', `v${packageJson.version} release`);
 appUpdateObserver();
-dataKitSdk.init();

src/store/modules/user.js

@@ -8,7 +8,6 @@ import asyncRoutes, {
 } from '@/router/asyncRoutes';
 import { getTreeList, local, session, clear } from '@/utils/tool';
 import { routesNotMenu } from '@/router/asyncRoutes';
-import dataKitSdk from '@/utils/dataKit';
 // 路由扁平化
 const flatAsyncRoutes = (routes, breadcrumb = []) => {
   const res = [];
@@ -99,10 +98,6 @@ const useUserStore = defineStore('user', {
     },
     setInfo(data) {
       this.user = data;
-      dataKitSdk.setUser({
-        id: data.id,
-        name: data.realName,
-      });
     },
     resetUserInfo() {
       this.$reset();

src/views/sop/components/dynamic-form-item/SELECT.vue

@@ -6,6 +6,7 @@
     :disabled="!config.writable"
     filterable
     @change="emitChange"
+    :keys="keys"
   ></t-select>
 </template>
 <script setup name="SELECT">
@@ -15,6 +16,7 @@ import { request } from '@/utils/request.js';
 const props = defineProps({
   config: { type: Object },
   modelValue: { type: [String, Array] },
+  sop: { type: Object, default: () => ({}) },
 });
 const emit = defineEmits(['update:modelValue', 'change']);
 
@@ -24,9 +26,15 @@ const isMultiple = computed(() => {
 });
 
 const options = ref([]);
+const keys = ref({ label: 'label', value: 'value' });
 const getOptionsApi = () => {
+  let dataGrid = props.config?.dataGrid;
+  if (props.config?.formId === 'engineer_users_id_1') {
+    dataGrid = dataGrid.replace('#{id}', props.sop?.crmDetailId);
+    keys.value = { label: 'name', value: 'userId' };
+  }
   return request({
-    url: props.config.dataGrid,
+    url: dataGrid,
     method: 'post',
   });
 };

src/views/sop/components/dynamic-form-item/UPLOAD_IMAGE.vue

@@ -4,13 +4,13 @@
       ref="uploadRef3"
       v-model="files"
       :theme="theme"
-      :tips="`最多只能上传 ${config.length || 3} 张图片`"
+      :tips="config.length ? `最多只能上传 ${config.length} 张图片` : ''"
       accept="image/*"
       :abridge-name="[6, 6]"
       :auto-upload="true"
       :upload-all-files-in-one-request="false"
       multiple
-      :max="config.length || 3"
+      :max="config.length || 0"
       :disabled="!config.writable"
       :before-upload="handleBeforeUpload"
       :request-method="upload"

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

@@ -260,70 +260,92 @@ const selectChange = (value) => {
   selectedRowKeys.value = value;
 };
 const originColumns = ref([]);
+
 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: 'taskName', fieldTitle: '当前节点', width: 160, code: 'TEXT' },
   {
-    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: '提交人', 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: '当前节点负责人',
+    fieldId: 'customManagerName',
+    fieldTitle: '客户经理',
     width: 140,
-    code: 'SINGLE_SELECT',
+    code: 'TEXT',
   },
+  { 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(() => {
   return originColumns.value.map((item) => item.fieldId);
@@ -496,8 +518,11 @@ const params = reactive({
   formWidgetMetadataOperation: 'AND',
 });
 const transParams = computed(() => {
-  let formWidgetMetadataViewList = params.formWidgetMetadataViewList.filter(
-    (item) => !originFieldIds.value.includes(item.fieldId)
+  // let formWidgetMetadataViewList = params.formWidgetMetadataViewList.filter(
+  //   (item) => !originFieldIds.value.includes(item.fieldId)
+  // );
+  let formWidgetMetadataViewList = params.formWidgetMetadataViewList.map(
+    (item) => ({ fieldId: item.fieldId })
   );
   return {
     ...omit(params, ['fastSearch', 'fastColumns']),