Redeem 1 tuần trước cách đây
mục cha
commit
11895b47e5

+ 1 - 1
cors.js

@@ -209,5 +209,5 @@ module.exports = {
   //devModules: ['reportForm', 'screeningTests', 'index',  'entrustedManagement','measurementDataManagement', 'approveManagement', 'testAnalysis', 'resourceManager', 'taskManagement']
   devModules: ["all"],
   //  devModules:['index']
-  // devModules: ["index", "approveManagement"],
+  // devModules: ["index", "approveManagement", "entrustedManagement"],
 };

+ 2 - 2
package.json

@@ -11,7 +11,7 @@
     "e2e": "node node_modules/icore-icp/test/e2e/runner.js",
     "test": "npm run unit && npm run e2e",
     "lint": "eslint --ext .js,.vue src node_modules/icore-icp/test/unit node_modules/icore-icp/test/e2e/specs",
-    "build": "node --max-old-space-size=8192 node_modules/icore-icp/build/build.js",
+    "build": "cross-env NODE_ENV=production GENERATE_SOURCEMAP=false node --max_old_space_size=8192 --optimize_for_size --gc_interval=100 node_modules/icore-icp/build/build.js",
     "testc": "cross-env NODE_ENV=test nyc mocha-webpack --webpack-config node_modules/icore-icp/build/webpack.test.conf.js --require node_modules/icore-icp/test/setup.js node_modules/icore-icp/test/**/*.spec.js"
   },
   "dependencies": {
@@ -122,4 +122,4 @@
     "instrument": false,
     "sourceMap": false
   }
-}
+}

+ 6 - 8
src/views/entrustedManagement/components/inspectionMaterials/inspectionMaterials.vue

@@ -308,9 +308,9 @@
               </el-table>
             </div>
             <div class="common-foot-style">
-              <el-pagination @size-change="pageSizeChange" @current-change="pageCurrentChange"
-                :current-page="page.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page.pageSize"
-                layout="total, sizes, prev, pager, next, jumper" :total="page.totalPage" background>
+              <el-pagination @size-change="pageSizeChange2" @current-change="pageCurrentChange2"
+                :current-page="page2.pageNum" :page-sizes="[100, 200, 500, 800, 1000]" :page-size="page2.pageSize"
+                layout="total, sizes, prev, pager, next, jumper" :total="page2.totalPage" background>
               </el-pagination>
             </div>
           </el-tab-pane>
@@ -970,8 +970,8 @@ export default {
         list: [this.search.testTypeCode],
         'startTime': this.startTime,
         'endTime': this.endTime,
-        pageIndex: this.page.pageNum,
-        pageSize: this.page.pageSize
+        pageIndex: this.page2.pageNum,
+        pageSize: this.page2.pageSize
       }
       this.axios.post('pass/testManagement/v1/limstestentrusts/queryLimsTestEntrustPage', obj, { individualType: 'json' }).then(res => {
         this.table.list1 = res.data.list;
@@ -986,7 +986,7 @@ export default {
           item.entrTime1 = formatDate(item.entrTime, 'yyyy-MM-dd' + ' ' + 'HH:mm:ss')
         })
         this.dataLoading = false;
-        this.page.totalPage = res.data.total;
+        this.page2.totalPage = res.data.total;
       }).catch(e => {
         this.dataLoading = false;
       });
@@ -1254,12 +1254,10 @@ export default {
     pageSizeChange(size) {
       this.page.pageSize = size;
       this.mainData();
-      this.mainData1();
     },
     pageCurrentChange(index) {
       this.page.pageNum = index;
       this.mainData();
-      this.mainData1();
     },
     handleSelectionChange2(val) {
       this.multipleSelection4 = val;