瀏覽代碼

fix: 提交流转页面DIYTable填写功能

ZhaoJun 2 年之前
父節點
當前提交
218cc5180f
共有 2 個文件被更改,包括 9 次插入11 次删除
  1. 4 4
      src/pages/Detail/AuditDetailed.js
  2. 5 7
      src/pages/Detail/CommitAuditModal.js

+ 4 - 4
src/pages/Detail/AuditDetailed.js

@@ -6,8 +6,8 @@ import { FormulaType } from '@/components/AuditForm/FormulaModal';
 const AuditDetailed = props => {
   const { allValues = [], items, form, onValuesChange, onTableValChange } = props;
   const depId = useMemo(() => {
-    const id = items.find(item => item.componentName == 'DepartmentField')?.props.id;
-    const value = allValues.find(item => item.id == id)?.value;
+    const id = items.find(item => item.componentName === 'DepartmentField')?.props.id;
+    const value = allValues.find(item => item.id === id)?.value;
     if (value) return value[0];
   }, [allValues, items]);
 
@@ -35,9 +35,9 @@ const AuditDetailed = props => {
 
   const GetComponent = item => {
     const { id, label, bizAlias, required, notUpper } = item.props;
-    //判断是否关联项
+    // 判断是否关联项
     if (data.linkedList.findIndex(curId => curId == id) !== -1) {
-      let control = null; //当前空间是否显示的条件 当id为control.id的组件选择的选项值为control.value 时显示
+      let control = null; // 当前空间是否显示的条件 当id为control.id的组件选择的选项值为control.value 时显示
       Object.keys(data.linkedData).forEach(ctlIs => {
         const linked = data.linkedData[ctlIs];
         Object.keys(linked).forEach(value => {

+ 5 - 7
src/pages/Detail/CommitAuditModal.js

@@ -73,6 +73,7 @@ function CommitAuditModal(props) {
   const [auditList, setAuditList] = useState([]); //用于创建Tabs表单
   const [formComponentValues, setFormComponentValues] = useState({}); //用于创建Tabs表单
   const [form] = Form.useForm();
+  const [aduitDetailForm] = Form.useForm();
   const [approvalProcess, setApprovalProcess] = useState({});
   const [selectUserList, setSelectUserList] = useState([]);
   const [curNodeIdx, setCurNodeIdx] = useState(-1);
@@ -351,8 +352,7 @@ function CommitAuditModal(props) {
 
   const onDIYTableChange = (value, id, label) => {
     const currentNodeID = auditList[currentTab].nodeId;
-    const oldData = [...formComponentValues[currentNodeID]] || [];
-    console.log(oldData);
+    const oldData = formComponentValues[currentNodeID] || [];
 
     const ids = id.split(';');
     const [rowIndex, colIndex] = ids[0].split(',').map(item => Number(item));
@@ -373,10 +373,8 @@ function CommitAuditModal(props) {
 
     if (oldData && oldData.length) {
       const table = oldData.find(item => item.id === tableID);
-      console.log(table);
       if (table) {
         const oldRows = table.value;
-        debugger;
         if (oldRows) {
           const oldCols = oldRows[rowIndex];
           if (oldCols) {
@@ -468,8 +466,8 @@ function CommitAuditModal(props) {
         value: [changedFields[currentFieldID]],
       });
     }
-    console.log(formComponentValues);
     setFormComponentValues({ ...formComponentValues, [currentNodeID]: componentValue });
+    advanceSubmit();
   };
 
   // 处理tabs页
@@ -850,13 +848,13 @@ function CommitAuditModal(props) {
                 <AuditDetailed
                   allValues={formValueRef.current.form}
                   items={item.items}
-                  form={form}
+                  form={aduitDetailForm}
                   onValuesChange={onFormValueChange}
                   onTableValChange={onDIYTableChange}
                 />
               </Col>
               <Col offset={1} span={6}>
-                {!approvalProcess[item.nodeId] ? ( //!formComponentValues[item.nodeId] ||
+                {!approvalProcess[item.nodeId] ? ( // !formComponentValues[item.nodeId] ||
                   <Empty description="请先填写表单" />
                 ) : (
                   <ApprovalProcess