zouzhd 3 lat temu
rodzic
commit
51a734f60a

+ 1 - 1
build/utils.js

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

+ 3 - 3
config/index.js

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

+ 2 - 7
src/components/DilCommonUI/packages/table/src/table.js

@@ -70,7 +70,6 @@ export default {
         }
         //判断是否是带分页查询
         if(this.isKuang){
-          console.log(11111111111111111111111111);
           // 发送请求
           this.axios
           .post(url, data, {
@@ -90,7 +89,6 @@ export default {
             this.isShow = true;
           });
         }else{
-          console.log(2222222222222222222222222);
           // 发送请求
           this.axios
             .post(url, data, {
@@ -109,11 +107,8 @@ export default {
               this.refreshColumnData(d.columnData);
 
               this.isShow = true;
-              //若父组件存在要合计的值
-              if(this.$parent.totalNumber>=0){
-                //将筛选的字段传给父组件
-                this.$parent.calculationTotalNumber(this.dataRequestQuery);
-              }
+              //抛出请求参数
+              this.$emit("requestQuery", this.dataRequestQuery);
             });
         }
       } else {

+ 1 - 1
src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -421,7 +421,7 @@ export default {
     },
     // 返回
     onClickCancel() {
-      this.$router.push("/transportReserveRan");
+      this.$router.push("/transportationReservation");
     },
     currentRadioChange1(selection) {
       this.materialName = selection.materialName;

+ 7 - 2
src/views/statisticalReport/components/salesLogisticsStatistics/transportationPerformance.vue

@@ -23,7 +23,7 @@
       <el-input v-model="totalCapacity" :disabled="true" style="width: 150px;"></el-input>
     </div>
     <div class="table">
-      <dilTable ref="excelDom" v-bind.sync="option" :isKuang="isKuang" @func="func" :pageSize = "pageSize"></dilTable>
+      <dilTable ref="excelDom" v-bind.sync="option" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable>
     </div>
   </div>
 </template>
@@ -46,7 +46,8 @@ export default {
       tableTitle:'销售统计报表'
     };
   },
-  created(){
+  created(){ 
+      //初始化报表的名称
       var startTime = this.dataFormat(sjTime(new Date()));
       var endTime = this.dataFormat(sjTime(new Date()));
       this.tableTitle = startTime + ' 至 ' + endTime;
@@ -60,6 +61,10 @@ export default {
       this.totalCapacity = res.total;
       this.isKuang = false;
     },
+    requestQuery(q){
+      //调用获取总净重方法
+      this.calculationTotalNumber(q);
+    },
     onclick() {
       let startTime = null;
       let endTime = null;