|
@@ -23,24 +23,12 @@ import { PlusOutlined, UploadOutlined } from '@ant-design/icons';
|
|
|
import { connect } from 'dva';
|
|
|
import { useForm } from 'rc-field-form';
|
|
|
import AuditDetailed from './AuditDetailed';
|
|
|
-import AuditFlow from './AuditFlow';
|
|
|
-import {
|
|
|
- queryDingSchema,
|
|
|
- queryGetBomForm,
|
|
|
- queryProcessFlows,
|
|
|
- querySaveBomForm,
|
|
|
-} from '@/services/boom';
|
|
|
+import { queryGetBomForm, queryProcessFlows, querySaveBomForm } from '@/services/boom';
|
|
|
import { Form as Form3x } from '@ant-design/compatible';
|
|
|
-import { getCurrentUser } from '@/utils/authority';
|
|
|
-import DDCode from '@/components/DDComponents/DDCode';
|
|
|
-import { uploadFile, queryUserListByRoleID } from '@/services/boom';
|
|
|
import ApprovalProcess from './ApprovalProcess';
|
|
|
import { uuidv4 } from '@antv/xflow';
|
|
|
import AliyunOSSUpload from '@/components/OssUpload/AliyunOssUploader';
|
|
|
import AttachmentTable from '@/components/AttachmentTable';
|
|
|
-import { getToken } from '@/utils/utils';
|
|
|
-import LuckyExcel from 'luckyexcel';
|
|
|
-import DDComponents from '@/components/DDComponents';
|
|
|
import uploadExcelByUrl from '@/utils/uploadExcelByUrl';
|
|
|
|
|
|
const { TextArea } = Input;
|
|
@@ -225,11 +213,12 @@ function CommitAuditModal(props) {
|
|
|
? data.find(item => item.template_node_id === approvalNode.Id).formComponentValues
|
|
|
: [];
|
|
|
let values = data[approvalNode.Id] || prevValues || [];
|
|
|
- values.forEach(tempValue => {
|
|
|
- if (tempValue.id.includes('DIYTable')) {
|
|
|
- tempValue.value = tempValue.value.map(item => JSON.stringify(item));
|
|
|
- }
|
|
|
- });
|
|
|
+ // DIYTable的值不应该在此处处理,stringify逻辑挪至DIYTable内部
|
|
|
+ // values.forEach(tempValue => {
|
|
|
+ // if (tempValue.id.includes('DIYTable')) {
|
|
|
+ // tempValue.value = tempValue.value.map(item => JSON.stringify(item));
|
|
|
+ // }
|
|
|
+ // });
|
|
|
|
|
|
let audit_list = [],
|
|
|
cc_list = [];
|
|
@@ -351,7 +340,7 @@ function CommitAuditModal(props) {
|
|
|
prevFormData.forEach(pItem => {
|
|
|
pItem.formComponentValues?.map(item => {
|
|
|
if (item.id.includes('ProjectField')) {
|
|
|
- item.value = [version.project_id];
|
|
|
+ item.value = [String(version.project_id)];
|
|
|
}
|
|
|
});
|
|
|
formValues[pItem.template_node_id] = [...pItem.formComponentValues];
|