Browse Source

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

liyg 2 years ago
parent
commit
1d3d7d4d04

File diff suppressed because it is too large
+ 298 - 367
src/views/inward/components/truckAppoint/addRequirement2.vue


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

@@ -759,6 +759,10 @@ export default {
         {
           value: '车牌号',
           lable: '车牌号'
+        },
+        {
+          value: '分录ID',
+          lable: '分录ID'
         }
       ],
       options1: [
@@ -1777,6 +1781,7 @@ export default {
       let capacityNo = null
       let remark = null
       let saler = null
+      let easPrimaryId = null
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime)
         endTime = sjTime(this.endTime)
@@ -1793,6 +1798,8 @@ export default {
         carrierName = this.input
       } else if (this.screen == '车牌号') {
         capacityNo = this.input
+      } else if (this.screen == '分录ID') {
+        easPrimaryId = this.input
       } else {
         remark = this.input
       }
@@ -1824,7 +1831,9 @@ export default {
             '&capacityNo=' +
             capacityNo +
             '&saler=' +
-            saler
+            saler +
+            '&easPrimaryId=' +
+            easPrimaryId
         )
         .then(res => {
           this.tableData = res.data.data

File diff suppressed because it is too large
+ 0 - 0
static/lib/element-ui/element-ui.css


Some files were not shown because too many files changed in this diff