修改表单

build/utils.js

@@ -18,8 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index','statisticalReport','appoint']
 // let devModules = ['index','appoint','sale','RMS','statisticalReport'];
 //let devModules = ['index','appoint','WMS'];
-// let devModules = ['index','inward']
-let devModules = ['all']
+let devModules = ['index','statisticalReport']
+// let devModules = ['all']
 //let devModules = ['index','sale']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']

config/index.js

@@ -64,14 +64,14 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
+    target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.166:8080",
+    target: "http://localhost:8080",
     pathRewrite: {
       "^/views/api/v1": "/api/v1"
     }

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.js

@@ -108,6 +108,7 @@ export default {
       },
     // 通过请求获取数据
     requestData(options) {
+      console.log(options);
       let pageNum = undefined;
       let pageSize = undefined;
       

src/components/DilCommonUI/packages/table/src/table.js

@@ -87,7 +87,6 @@ export default {
         // 判断是否需要在请求体中放入参数
         if(this.requestQuery){
           this.dataRequestQuery=this.requestQuery;
-          // console.log(this.dataRequestQuery.resultBreakId)
         }
         let data = undefined;
         for (const key in this.dataRequestQuery) {
@@ -144,14 +143,7 @@ export default {
     },
     // 刷新表头显示数据
     refreshColumnData(columnData) {
-      // 表头只赋值一次(在查出全部数据的情况下才只赋值一次)
-      console.log("biaof")
-      console.log(this.dataColumnData.length)
-      if (this.dataColumnData.length > 0){
-          return;
-      } 
       // 如果前端有写表头，则加在后端表头前面
-      
       const d = this.columnData.concat(columnData);
       // 把操作列拼接到最后一列
       this.dataColumnData = d;
@@ -272,6 +264,7 @@ export default {
     },
     // current-page 改变时会触发
     currentChange(val, isRequest = true) {
+      console.log(val);
       if (isRequest) {
         this.requestData({ pageNum: val });
       }
@@ -281,6 +274,7 @@ export default {
     },
     // pageSize 改变时会触发
     sizeChange(val) {
+      console.log(val);
       this.dataPageSize = val;
       this.requestData({});
       this.$emit("update:size-change", val);

src/views/sale/components/transport_order/receiveOrder.vue

@@ -259,7 +259,7 @@ export default {
     };
   },
   created() {
-    if (getCookie("chengyunshang")) {
+    if (getCookie("orgCode") == "chengyunshang") {
       this.option1.requestUrl =
         "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
         getCookie("userId") +