1.获取数据的时候要存储old数据

Min
1 parent 49541f7f
Showing 4 changed files with 42 additions and 31 deletions
src/components/Common/CommonBase.js
src/components/Common/CommonBillEvent.js
src/components/Common/CommonListEvent.js
src/models/content.js
@@ -763,6 +763,7 @@ export default (ChildComponent) =&gt; {
             }
           }
           addState[`${name}Data`] = returnData;
+          addState[`${name}DataOld`] = returnData;
           if(commonUtils.isNotEmptyObject(returnData.customConfig) && commonUtils.isJSON(returnData.customConfig) && commonUtils.isNotEmptyObject(slaveConfig)) {
             const columnConfig = JSON.parse(returnData.customConfig);
             const newConfig =JSON.parse(JSON.stringify(slaveConfig));
@@ -796,6 +797,20 @@ export default (ChildComponent) =&gt; {
         this.getServiceError(dataReturn);
       }
     };
+    handleGetDataOld = async (sId) => {
+      const {
+        token, sModelsId, formSrcRoute
+      } = this.state;
+      const dataUrl = `${commonConfig.server_host}log/getLogDetail/${sId}?sModelsId=${sModelsId}&sName=${formSrcRoute}`;
+      const condition = {};
+      const dataReturn = (await commonServices.postValueService(token, condition, dataUrl)).data;
+      if(dataReturn.sCode === 1) {
+        let returnData = dataReturn.dataset.rows[0].dataSet;
+        console.log('ssreturnDatas', returnData);
+
+      }
+
+    }
     /* 获取后台数据（数据集） */
     handleGetDataSet = async (params) => {
@@ -1048,6 +1063,7 @@ export default (ChildComponent) =&gt; {
           const filterConditionNew = commonUtils.isNotEmptyObject(filterCondition) ? filterCondition.filter(item => item.bFilterType !== 'tree') : '';
           let addState = {
             [`${name}Data`]: returnData,
+            [`${name}DataOld`]: returnData,
             [`${name}Pagination`]: returnPagination,
             [`${name}FilterCondition`]: filterConditionNew,
             [`${name}OrderBy`]: orderBy,
@@ -3435,6 +3451,7 @@ export default (ChildComponent) =&gt; {
             getDateFormat={this.getDateFormat}
             handleGetDataOne={this.handleGetDataOne}
             handleGetDataSet={this.handleGetDataSet}
+            onGetDataOld={this.handleGetDataOld}
             handleGetTreeDataSet={this.handleGetTreeDataSet}
             onSaveState={this.handleSaveState}
             onChange={this.handleMasterChange}
@@ -78,6 +78,8 @@ export default (ChildComponent) =&gt; {
         employeeConfig: employeeConfigOld,
         slaveInfoList: slaveInfoListOld,
       } = nextProps;
+      const { currentPane } =  app;
+      const bHistoryView =  currentPane?.bHistoryView;
       if (commonUtils.isEmptyObject(slaveConfigOld) && formData.length > 0 && (sModelsId === '12710101117024321284220' || (sModelsType !== 'cashier/financialTransfer' && sModelsType !== 'cashier/financialAdjustment' && sModelsType !== 'quality/accident' && sModelsType !== 'purchase/purchaseEnquiry' && sModelsType !== 'complaint/complaint' && sModelsType !== 'print/printLabel' && sModelsType !== 'commonBill/onlyMaster' && (formRoute.indexOf('indexOee') === -1 || formRoute === '/indexOee/commonOeeBill')))) {
         const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
@@ -402,6 +404,8 @@ export default (ChildComponent) =&gt; {
             // if (sModelsType.includes('sales/salesOrder') || sModelsType === 'purchase/purchaseOrder') {
             //   this.props.onSaveState(addState1);
             // }
+          } else if(bHistoryView){
+            this.handleGetDataOld();
           } else {
             this.handleGetData(masterConfig, slaveConfig, checkConfig);
             if (sModelsType.includes('sales/salesOrder')) {
@@ -772,6 +776,11 @@ export default (ChildComponent) =&gt; {
       return processData;
     };
+    handleGetDataOld = async () => {
+      const { currentId } = this.props; /* 当前页签数据 */
+      this.props.onGetDataOld(currentId);
+    }
+
     /**   获取主表、从表、审核表数据   */
     handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => {
       const { currentId, masterData = {} } = this.props; /* 当前页签数据 */
@@ -2603,8 +2612,12 @@ export default (ChildComponent) =&gt; {
               }
             });
           }
+          const sOldData = commonUtils.getOldDataFromProps(this.props);
+          console.log('组装后的原始数据', sOldData);
+          const sOperationType  = masterData?.handleType === 'add' ?  '1' : '2' ;
-          this.handleSaveData({ data, sClientType: '1', sSysLogSrcId: masterData.sId });
+          this.handleSaveData({ data, sClientType: '1', sSysLogSrcId: masterData.sId,
+            sOldData, sOperationType, sBillNo: masterData.sBillNo  });
         }
       });
     };
@@ -3115,12 +3128,16 @@ export default (ChildComponent) =&gt; {
           }
         }
       }
+      const sOldData = commonUtils.getOldDataFromProps(this.props);
+      console.log('删除的原始数据', sOldData);
       const value = {
         sClientType: '1',
         data: {
           sMasterTable: masterConfig.sTbName,
           sId: [masterData.sId],
         },
+        sOldData,
+        sSysLogSrcId: masterData.sId,
       };
       const sSlaveTable = [];
       if (commonUtils.isNotEmptyObject(slaveConfig)) {
@@ -3684,7 +3701,6 @@ export default (ChildComponent) =&gt; {
           this.handleTableWorkCopyAll(name, isWait, isTree);
           return;
         }
-
         const {
           [`${name}Data`]: tableData, [`${name}SelectedRowKeys`]: tableSelectedRowKeys,
         } = this.props;
@@ -715,32 +715,7 @@ export default (ChildComponent) =&gt; {
         // masterData,
         // employeeConfig,
       } = this.props;
-      // oee双击查看开工任务
-      // if (formRoute.indexOf('indexOee') > -1) {
-      //   if (slaveSelectedData[0].sCompleteCheck !== 'bCompleteCheck' && commonUtils.isNotEmptyArr(slaveSelectedData)) {
-      //     this.props.changePage(false, 'startWork', '2', false);
-      //     this.props.onSaveState({
-      //       masterData: slaveSelectedData[0],
-      //     });
-      //     if (commonUtils.isNotEmptyObject(record)) {
-      //       const bFilter1 = [];
-      //       bFilter1.push({
-      //         bFilterName: 'sParentId',
-      //         bFilterCondition: '=',
-      //         bFilterValue: record.sId,
-      //       });
-      //       const employeeData = (await this.props.handleGetDataSet({
-      //         name: 'employee',
-      //         configData: employeeConfig,
-      //         condition: { bFilter: bFilter1 },
-      //         isWait: true,
-      //       }));
-      //       this.props.onSaveState({
-      //         ...employeeData,
-      //       });
-      //     }
-      //   }
-      // } else {}
+
       // 工单明细弹窗
       if (commonUtils.isNotEmptyObject(slaveConfig) && slaveConfig.sTbName === 'sys_workorder') {
@@ -818,7 +793,8 @@ export default (ChildComponent) =&gt; {
             currentIndex: slaveData.findIndex(item => item.sId === record.sId),
             sSqlConditionValues: this.handleGetSqlConditionValues(picArr[0], record),
             sSrcModelsId: this.props.sModelsId,
-            sFilterOrderBy: slaveOrderBy
+            sFilterOrderBy: slaveOrderBy,
+            bHistoryView : sModelsType === '/log'
           },
         });
       }
@@ -42,6 +42,7 @@ export default {
         sName, /* 当前列的sName */
         sSqlConditionValues,
         sSrcModelsId,
+        bHistoryView
       } = payload; /*   参数接收   */
       const token = yield select(state => state.app.token); /*   用户令牌   */
       /*   从接口获取数据   */
@@ -84,6 +85,7 @@ export default {
               sName,
               sSqlConditionValues,
               sSrcModelsId,
+              bHistoryView
             },
           },
         });
@@ -95,7 +97,7 @@ export default {
     *onRouterMobile({ payload }, { put, call, select }) {
       const { urlKey } = payload; /*   参数接收   */
       console.log(payload,'payload');
-      
+
       if (urlKey !== undefined) {
         const token = yield select(state => state.app.token); /*   用户令牌   */
         const { data } = yield call(services.getService, token, urlKey);
@@ -128,7 +130,7 @@ export default {
           yield put({ type: 'app/throwErrorMobile', payload: data });
         }
       } else {
-        
+
         const param = {
           sModelsId: payload.sModelsId,
           sId: payload.sId,