소스 검색

台账审批,台账修订,页面加载优化相关

MaiXinRong 4 년 전
부모
커밋
cab418b7e4
5개의 변경된 파일10개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 2
      Dockerfile
  2. 5 2
      app/public/js/ledger_audit.js
  3. 1 0
      app/public/js/revise.js
  4. 1 0
      app/public/js/revise_history.js
  5. 1 1
      app/public/js/spreadjs_rela/spreadjs_zh.js

+ 2 - 2
Dockerfile

@@ -1,8 +1,8 @@
 FROM node:12
 
-WORKDIR /home
+COPY . /app/calc
 
-COPY . .
+WORKDIR /app/calc
 
 RUN npm install --registery=https://registery.npm.taobao.org
 

+ 5 - 2
app/public/js/ledger_audit.js

@@ -28,8 +28,11 @@ $(document).ready(() => {
         rootId: -1,
         keys: ['id', 'tender_id', 'ledger_id'],
         preUrl: '/ledger',
-        markFoldKey: 'bills-fold',
-        markFoldSubKey: window.location.pathname.split('/')[2],
+        autoExpand: 3,
+        // markFoldKey: 'bills-fold',
+        // markFoldSubKey: window.location.pathname.split('/')[2],
+        markExpandKey: 'bills-expand',
+        markExpandSubKey: window.location.pathname.split('/')[2],
     };
     if (checkTzMeasureType()) {
         treeSetting.calcFields = ['sgfh_tp', 'sjcl_tp', 'qtcl_tp', 'total_price'];

+ 1 - 0
app/public/js/revise.js

@@ -103,6 +103,7 @@ $(document).ready(() => {
         rootId: -1,
         keys: ['id', 'tender_id', 'ledger_id'],
         calcFields: ['sgfh_tp', 'sjcl_tp', 'qtcl_tp', 'total_price'],
+        autoExpand: 3,
     };
     if (!isTz) {
         treeSetting.calcFields.push('deal_tp');

+ 1 - 0
app/public/js/revise_history.js

@@ -53,6 +53,7 @@ $(document).ready(() => {
         rootId: -1,
         keys: ['id', 'tender_id', 'ledger_id'],
         calcFields: ['sgfh_tp', 'sjcl_tp', 'qtcl_tp', 'total_price'],
+        autoExpand: 3,
     };
     if (!isTz) {
         treeSetting.calcFields.push('deal_tp');

+ 1 - 1
app/public/js/spreadjs_rela/spreadjs_zh.js

@@ -506,7 +506,7 @@ const SpreadJsObj = {
     _loadRowData: function (sheet, data, row) {
         // 单元格重新写入数据
         if (!data) { return }
-        if (!data.visible && data.waitingLoading === undefined) {
+        if (sheet.zh_dataType === SpreadJsObj.DataType.Tree && !data.visible && data.waitingLoading === undefined) {
             data.waitingLoading = true;
             return;
         }