Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    // target: 'http://localhost:8080',
+    //target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

src/views/inward/components/inwardFactory/countResult.vue

@@ -17,7 +17,7 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <!-- excel导出 -->
-      <el-button type="primary" @click="exportData()">
+      <el-button type="primary" @click="exportAllExcel()">
         <i class="el-icon-download"></i>导出(Excel)
       </el-button>
     </div>
@@ -94,7 +94,9 @@ export default {
       direction: "rtl",
       orderId: 0,
       stepList: [],
-      tableTitle: "计次统计"
+      tableTitle: "计次统计",
+      exportAllList:[],
+      noSettleDetailsColumn:[]
     };
   },
   created() {
@@ -111,6 +113,102 @@ export default {
     }
   },
   methods: {
+    exportAllExcel() {
+      this.tableTitle = '计次统计'
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          console.log(startTime);
+          console.log(endTime);
+          if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu" ||
+            getCookie("orgCode") == "wuliuchuyunzhongxin"
+          ) {
+            this.axios
+              .post(
+                "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=26&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date()
+              )
+              .then(res => {
+                console.log(res.data.data)
+                console.log(res.data.data)
+                this.exportAllList = res.data.data.list
+                this.noSettleDetailsColumn=res.data.data.columnData
+                this.exportAllReportToExcel(
+                  this.tableTitle,
+                  this.exportAllList,
+                  this.noSettleDetailsColumn
+                )
+              })
+          } else {
+            this.axios
+              .post(
+                "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=26&userId=" +
+                getCookie("orgCode") +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date()
+              )
+              .then(res => {
+                console.log(res.data.data)
+                console.log(res.data.data)
+                this.exportAllList = res.data.data.list
+                this.noSettleDetailsColumn=res.data.data.columnData
+                this.exportAllReportToExcel(
+                  this.tableTitle,
+                  this.exportAllList,
+                  this.noSettleDetailsColumn
+                )
+              })
+          }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+      }
+
+    },
+    //导出excel
+    exportAllReportToExcel(tableTitle, dataArr, columnData) {
+      var title = tableTitle
+      let tHeader = []
+      let filterVal = []
+      columnData.forEach(e1 => {
+        if (tHeader.indexOf(e1.label) === -1) {
+          tHeader.push(e1.label)
+        }
+        if (filterVal.indexOf(e1.prop) === -1) {
+          filterVal.push(e1.prop)
+        }
+      })
+      //导出为excel
+      this.downloadLoading = true
+      require.ensure([], () => {
+        const {
+          export_json_to_excel
+        } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        // let list = this.$refs.excelDom.dataTabel;
+        let data = dataArr.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+        export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
+      })
+    },
     // -------查看物资详情(已拒绝)
     detailclick1(row) {
       // 记录重复点击次数

src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -138,47 +138,76 @@ export default {
   methods: {
     //导出excel的前置动作
     exportAllExcel() {
-      let startTime = null
-      let endTime = null
-      let orgCode = null
-      let carrierSsoId = null
-      if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime)
-        endTime = sjTime(this.endTime)
+      this.tableTitle = '计时统计'
+      //
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
       }
-      if (getCookie('orgCode') == 'chengyunshang') {
-        carrierSsoId = getCookie('userId')
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
       }
-      if (
-        getCookie('orgCode') == 'dagangadmin' ||
-        getCookie('orgCode') == 'zidonghuabu' ||
-        getCookie('orgCode') == 'wuliuchuyunzhongxin'
-      ) {
-        orgCode = null
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          console.log(startTime);
+          console.log(endTime);
+          if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu" ||
+            getCookie("orgCode") == "wuliuchuyunzhongxin"
+          ) {
+            this.axios
+              .post(
+                "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date()
+              )
+              .then(res => {
+                console.log("进入了打印界面")
+                console.log(res.data.data)
+                this.exportAllList = res.data.data.list
+                this.noSettleDetailsColumn=res.data.data.columnData
+                this.exportAllReportToExcel(
+                  this.tableTitle,
+                  this.exportAllList,
+                  this.noSettleDetailsColumn
+                )
+              })
+          } else {
+            this.axios
+              .post(
+                "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21&userId=" +
+                getCookie("orgCode") +
+                "&startTime=" +
+                startTime +
+                "&endTime=" +
+                endTime +
+                "&i=" +
+                new Date()
+              )
+              .then(res => {
+                console.log("进入了打印界面")
+                console.log(res.data.data)
+                this.exportAllList = res.data.data.list
+                this.noSettleDetailsColumn = res.data.data.columnData
+                this.exportAllReportToExcel(
+                  this.tableTitle,
+                  this.exportAllList,
+                  this.noSettleDetailsColumn
+                )
+              })
+          }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
       } else {
-        orgCode = getCookie('orgCode')
       }
-      this.tableTitle = '计时统计'
-      this.axios
-        .post(
-          "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21&startTime=" +
-          startTime +
-          "&endTime=" +
-          endTime +
-          "&i=" +
-          new Date()
-        )
-        .then(res => {
-          console.log("进入了打印界面")
-          console.log(res.data.data)
-          this.exportAllList = res.data.data.list
-          this.noSettleDetailsColumn=res.data.data.columnData
-          this.exportAllReportToExcel(
-            this.tableTitle,
-            this.exportAllList,
-            this.noSettleDetailsColumn
-          )
-        })
       },
     //导出excel
     exportAllReportToExcel(tableTitle, dataArr, columnData) {

src/views/inward/components/inwardSettlement/countDetailOrder.vue

@@ -97,69 +97,175 @@ export default {
   },
   methods:{
     exportAllExcel() {
-      let startTime = null
-      let endTime = null
-      let orgCode = null
-      let carrierSsoId = null
-      if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime)
-        endTime = sjTime(this.endTime)
-      }
-      if (getCookie('orgCode') == 'chengyunshang') {
-        carrierSsoId = getCookie('userId')
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
       }
-      if (
-        getCookie('orgCode') == 'dagangadmin' ||
-        getCookie('orgCode') == 'zidonghuabu' ||
-        getCookie('orgCode') == 'wuliuchuyunzhongxin'
-      ) {
-        orgCode = null
-      } else {
-        orgCode = getCookie('orgCode')
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
       }
       if (this.activeName == 'first') {
         this.tableTitle = '未结算计费详单'
-        this.axios
-          .post(
-            "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0" +
-            "&startTime=" +
-            startTime +
-            "&endTime=" +
-            endTime +
-            "&i" +
-            new Date()
-          )
-          .then(res => {
-            console.log(res.data.data)
-            this.exportAllList = res.data.data.list
-            this.noSettleDetailsColumn=res.data.data.columnData
-            this.exportAllReportToExcel(
-              this.tableTitle,
-              this.exportAllList,
-              this.noSettleDetailsColumn
-            )
-          })
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+            if (
+              getCookie("orgCode") == "dagangadmin" ||
+              getCookie("orgCode") == "zidonghuabu" ||
+              getCookie("orgCode") == "wuliuchuyunzhongxin"
+            ) {
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0" +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            } else if (getCookie("orgCode") == "chengyunshang") {
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&carrierSsoId=" +
+                  getCookie("userId") +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            } else {
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&userId=" +
+                  getCookie("orgCode") +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            }
+          } else {
+            this.startTime = null;
+            this.endTime = null;
+            this.$message.warning("开始时间要比结束时间早");
+          }
+        }
+
       } else if (this.activeName == 'second') {
         this.tableTitle = '已结算计费详单'
-        this.axios
-          .post(
-            "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0" +
-            "&startTime=" +
-            startTime +
-            "&endTime=" +
-            endTime +
-            "&i" +
-            new Date()
-          )
-          .then(res => {
-            this.exportAllList = res.data.data.list
-            this.noSettleDetailsColumn=res.data.data.columnData
-            this.exportAllReportToExcel(
-              this.tableTitle,
-              this.exportAllList,
-              this.settleDetailsColumn
-            )
-          })
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+            if (
+              getCookie("orgCode") == "dagangadmin" ||
+              getCookie("orgCode") == "zidonghuabu" ||
+              getCookie("orgCode") == "wuliuchuyunzhongxin"
+            ) {
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1" +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            } else if (getCookie("orgCode") == "chengyunshang") {
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&carrierSsoId=" +
+                  getCookie("userId") +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            } else {
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&userId=" +
+                  getCookie("orgCode") +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            }
+          } else {
+            this.startTime = null;
+            this.endTime = null;
+            this.$message.warning("开始时间要比结束时间早");
+          }
+        }
       }
     },
     //导出excel

src/views/inward/components/inwardSettlement/timeDetailsWeight.vue

@@ -15,7 +15,7 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"
+      <el-button type="primary" @click="exportAllExcel()"
         ><i class="el-icon-download"></i>导出(Excel)</el-button
       >
       <span style="margin-left: 1rem;">合计时间：</span>
@@ -105,6 +105,203 @@ export default {
     this.options2GetRequestUrl();
   },
   methods: {
+    exportAllExcel() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (this.activeName == 'first') {
+        this.tableTitle = '未结算计费详单'
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+            if (
+              getCookie("orgCode") == "dagangadmin" ||
+              getCookie("orgCode") == "zidonghuabu" ||
+              getCookie("orgCode") == "wuliuchuyunzhongxin"
+            ) {
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=0" +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            }else if (getCookie("orgCode") == "chengyunshang"){
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=0&carrierSsoId=" +
+                  getCookie("userId") +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            }else {
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=0&userId=" +
+                  getCookie("orgCode") +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            }
+          }else {
+            this.startTime = null;
+            this.endTime = null;
+            this.$message.warning("开始时间要比结束时间早");
+          }
+        } else {
+        }
+      } else if (this.activeName == 'second') {
+        this.tableTitle = '已结算计费详单'
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+            if (
+              getCookie("orgCode") == "dagangadmin" ||
+              getCookie("orgCode") == "zidonghuabu" ||
+              getCookie("orgCode") == "wuliuchuyunzhongxin"
+            ) {
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=1" +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            }else if (getCookie("orgCode") == "chengyunshang"){
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=1&carrierSsoId=" +
+                  getCookie("userId") +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            }else {
+              this.axios
+                .post(
+                  "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&detailStatus=1&userId=" +
+                  getCookie("orgCode") +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&i" +
+                  new Date()
+                )
+                .then(res => {
+                  console.log(res.data.data)
+                  this.exportAllList = res.data.data.list
+                  this.noSettleDetailsColumn=res.data.data.columnData
+                  this.exportAllReportToExcel(
+                    this.tableTitle,
+                    this.exportAllList,
+                    this.noSettleDetailsColumn
+                  )
+                })
+            }
+          }else {
+            this.startTime = null;
+            this.endTime = null;
+            this.$message.warning("开始时间要比结束时间早");
+          }
+        } else {
+        }
+      }
+    },
+    //导出excel
+    exportAllReportToExcel(tableTitle, dataArr, columnData) {
+      var title = tableTitle
+      let tHeader = []
+      let filterVal = []
+      columnData.forEach(e1 => {
+        if (tHeader.indexOf(e1.label) === -1) {
+          tHeader.push(e1.label)
+        }
+        if (filterVal.indexOf(e1.prop) === -1) {
+          filterVal.push(e1.prop)
+        }
+      })
+      //导出为excel
+      this.downloadLoading = true
+      require.ensure([], () => {
+        const {
+          export_json_to_excel
+        } = require('@/assets/excel/Export2Excel.js') //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        // let list = this.$refs.excelDom.dataTabel;
+        let data = dataArr.map(v => filterVal.map(j => v[j])) //3.formatJson格式转换
+        export_json_to_excel(tHeader, data, title) // (title)导出的表格名称
+      })
+    },
     //未结算数据
     options1GetRequestUrl() {
       if (getCookie("orgCode") == "chengyunshang") {