luobang 2 years ago
parent
commit
6f5caa1bff

+ 1 - 1
build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 //let devModules = ["index", "statisticalReport", "appoint", "sale"];
-let devModules = ['all']
+let devModules = ['index', 'statisticalReport']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

+ 7 - 0
config/index.js

@@ -33,6 +33,13 @@ let proxyTable = {
       '^/icore.icp.web/pass/auth/login': ''
     }
   },
+  '/icore-api/v1': {
+    target: 'http://172.16.33.166:8088/api/v1/truckTms', // target: "http://localhost:8080", // target: "http://192.168.1.109:8080",
+    ws: true,
+    pathRewrite: {
+      '^/icore-api/v1': ''
+    }
+  },
   '/icore-api': {
     target: 'http://172.16.33.166:9001',
     changeOrigin: true,

+ 2 - 2
package.json

@@ -30,11 +30,11 @@
     "crypto": "^1.0.1",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",
-    "element-ui": "2.13.2",
+    "element-ui": "2.4.2",
     "file-saver": "^1.3.8",
     "graphql": "^14.1.1",
     "graphql-tag": "^2.10.1",
-    "icore-sdk": "1.0.1-alpha.65",
+    "icore-sdk": "1.0.1-alpha.66",
     "json-schema-editor-vue": "1.2.5",
     "json2xml": "^0.1.3",
     "jspdf": "^2.5.1",

+ 12 - 1
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -101,6 +101,10 @@
         :row-style="{ height: '30' }"
         :cell-style="{ fontWeight: '500' }"
         @cell-click="cellClik"
+        :key="saleSteelKey"
+        id="salesLogisticsStat_saleSteelAllReport_table"
+        individual-panel
+        @resetTable="reset"
       >
         <el-table-column
           width="50"
@@ -849,7 +853,8 @@ export default {
         capacityNumber: '',
         startPointName: '',
         endPointName: ''
-      }
+      },
+      saleSteelKey: false
     }
   },
   created() {
@@ -867,6 +872,12 @@ export default {
   },
   computed: {},
   methods: {
+    reset() {
+      var that = this
+      that.$nextTick(() => {
+        that.saleSteelKey = !that.saleSteelKey
+      })
+    },
     checkTrans(row) {
       console.log(row)
       let that = this