tijiao

build/utils.js

@@ -15,7 +15,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['index','queue']
+let devModules = ['index','appoint','sale']
 // let devModules = ['index','appoint','sale','RMS','statisticalReport'];
 // let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','inward']

config/index.js

@@ -65,7 +65,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     // target: "http://172.16.33.166:8080",
-    target: "http://192.168.1.113:8080",
+    target: "http://192.168.1.112:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -1181,6 +1181,7 @@ export default {
     },
     //准备生成部分订单
     createACar() {
+      console.log("我进来了");
       if (
         !this.saleOrderConsigneeTel &&
         this.ignoreSaleOrderConsigneeTel == 0
@@ -1277,6 +1278,7 @@ export default {
     },
     // 添加物资到某个车序号
     addToCxh() {
+      console.log("wkk");
       if (!this.toCxh) {
         this.$message.warning("请先在左侧输入要添加物资的车序号！");
       } else {
@@ -1337,6 +1339,7 @@ export default {
         //若添加的车序号为最后一个车序号
         if (this.selectionList.length - 1 == toCxh) {
           //插入新增物资
+          console.log("1345wjj");
           this.materialList.forEach(e => {
             var addmap = {
               cxh: arr[toCxh].cxh,

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelForm.vue

@@ -6,80 +6,101 @@
       <el-date-picker
         v-model="startTime"
         type="datetime"
-        placeholder="选择日期时间">
+        placeholder="选择日期时间"
+      >
       </el-date-picker>
       <span>至</span>
       <el-date-picker
         v-model="endTime"
         type="datetime"
-        placeholder="选择日期时间">
+        placeholder="选择日期时间"
+      >
       </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
       <span style="margin-left: 1rem;width:68px">合计净重：</span>
-      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
+      <el-input
+        v-model="totalNumber"
+        :disabled="true"
+        style="width: 150px;"
+      ></el-input>
       <span style="margin-left: 1rem;width:68px">合计车数：</span>
-      <el-input v-model="totalCapacity" :disabled="true" style="width: 150px;"></el-input>
+      <el-input
+        v-model="totalCapacity"
+        :disabled="true"
+        style="width: 150px;"
+      ></el-input>
     </div>
     <div class="table">
-      <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable>
+      <!-- <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable> -->
+      <mergeRowTable ref="excelDom" v-bind.sync="option"> </mergeRowTable>
     </div>
   </div>
 </template>
 
 <script>
-import { sjTime } from '@/utils/sharedJsFile'
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      shiyHeigth:140,
-      isHeigth:true,
-      pageSize:100,
-      isKuang:false,
+      shiyHeigth: 140,
+      isHeigth: true,
+      pageSize: 100,
+      isKuang: false,
       option: {
         requestUrl: "",
+        comparison: "orderNumber",
+        columnIndexs: [1, 2, 3, 11, 12, 13, 16, 21, 22, 23, 24]
       },
-      startTime:null,
-      endTime:null,
+      startTime: null,
+      endTime: null,
       //合计净重
       totalNumber: 0,
       //合计车数
       totalCapacity: 0,
-      tableTitle:'销售统计报表'
+      tableTitle: "销售统计报表"
     };
   },
-  created(){
+  created() {
     //初始化表头
     if (getCookie("orgCode") == "chengyunshang") {
       this.option.requestUrl =
-        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" +
+        getCookie("userId") +
+        "&i=" +
+        new Date();
     } else {
       this.option.requestUrl =
-        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" + null +"&i=" +new Date();
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" +
+        null +
+        "&i=" +
+        new Date();
     }
     //时间段初始化
     const start = new Date(new Date(new Date().toLocaleDateString()).getTime());
     var startTime = this.dataFormat(sjTime(start));
     var endTime = this.dataFormat(sjTime(new Date()));
-    this.tableTitle = startTime + ' 至 ' + endTime;
+    this.tableTitle = startTime + " 至 " + endTime;
   },
   methods: {
-    refresh(){
+    refresh() {
       this.$router.go(0);
     },
-    func(res){
-      console.log(res)
-      var resultNetWeightTotal = 0
+    func(res) {
+      console.log(res);
+      var resultNetWeightTotal = 0;
       res.list.forEach(e => {
-        resultNetWeightTotal = resultNetWeightTotal+e.resultNetWeight
+        resultNetWeightTotal = resultNetWeightTotal + e.resultNetWeight;
       });
-      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t"
+      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t";
       this.totalCapacity = res.total;
       //获取总记录条数作为合计车数
       // this.totalCapacity = res.total;
@@ -88,53 +109,85 @@ export default {
     onclick() {
       let startTime = null;
       let endTime = null;
-      if(this.startTime && this.endTime){
+      if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
         endTime = sjTime(this.endTime);
         //修改报表名称
-        this.tableTitle = this.dataFormat(startTime) + ' 至 ' + this.dataFormat(endTime);
+        this.tableTitle =
+          this.dataFormat(startTime) + " 至 " + this.dataFormat(endTime);
         //加上时间重置表头
         if (getCookie("orgCode") == "chengyunshang") {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&orderType=1&shipperId=1"+ "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=1&shipperId=1" +
+            "&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&orderType=1&shipperId=1"+ "&carrierSsoId=" + null +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=1&shipperId=1" +
+            "&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
         }
-      }else{
-        if(this.startTime){
+      } else {
+        if (this.startTime) {
           startTime = sjTime(this.startTime);
-        }else if(this.endTime){
+        } else if (this.endTime) {
           endTime = sjTime(this.endTime);
         }
         //加上时间重置表头
         if (getCookie("orgCode") == "chengyunshang") {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime +"&orderType=1&shipperId=1"+ "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=1&shipperId=1" +
+            "&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime +"&orderType=1&shipperId=1"+ "&carrierSsoId=" + null +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=1&shipperId=1" +
+            "&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
         }
       }
     },
     //格式化日期
-    dataFormat(value){
+    dataFormat(value) {
       let date = new Date(value);
-        let y = date.getFullYear();
-        let MM = date.getMonth() + 1;
-        MM = MM < 10 ? ('0' + MM) : MM;
-        let d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        let h = date.getHours();
-        h = h < 10 ? ('0' + h) : h;
-        let m = date.getMinutes();
-        m = m < 10 ? ('0' + m) : m;
-        let s = date.getSeconds();
-        s = s < 10 ? ('0' + s) : s;
-        return y + '-' + MM + '-' + d + ' ' + h + '：' + m + '：' + s;
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? "0" + MM : MM;
+      let d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      let h = date.getHours();
+      h = h < 10 ? "0" + h : h;
+      let m = date.getMinutes();
+      m = m < 10 ? "0" + m : m;
+      let s = date.getSeconds();
+      s = s < 10 ? "0" + s : s;
+      return y + "-" + MM + "-" + d + " " + h + "：" + m + "：" + s;
     }
-
-  },
+  }
 };
 </script>
 
@@ -146,9 +199,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .el-date-editor{
+    .el-date-editor {
       margin: 20px;
     }
   }
 }
-</style>
+</style>