提交代码

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','ADMINISTRATORS']
-//let devModules = ['index', 'statisticalReport', 'queue','appoint','sale','TMS','RMS']
+//let devModules = ['index', 'statisticalReport', 'queue','appoint','sale','TMS','RMS','inward']
 let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {

src/views/RMS/components/capacity.vue

@@ -18,9 +18,8 @@
       <el-button type="primary" class="btn" @click="toInsert1">
         <i class="el-icon-plus"></i>新增特殊车牌
       </el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
+      <el-button type="primary" @click="exportAllExcel()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
     </div>
     <div class="table">
       <dilTable
@@ -77,7 +76,9 @@ export default {
       options: {
         // first请求数据的地址
         requestUrl: ""
-      }
+      },
+      noSettleDetailsColumn: [],
+      exportAllList:[]
     };
   },
   created() {
@@ -114,6 +115,135 @@ export default {
         this.selectLoading = false;
       }
     },
+    exportAllExcel() {
+      this.isKuang = true;
+      this.tableloading = true;
+      this.selectLoading = true;
+      if (this.textInput) {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.axios.post("/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.textInput +
+            "&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") == "baohua") {
+          this.axios.post("/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            this.textInput +
+            "&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/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.textInput +
+            "&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/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&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") == "baohua") {
+          this.axios.post("/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&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/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            null +
+            "&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
+            )
+          })
+        }
+      }
+    },
+    //导出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)导出的表格名称
+      })
+    },
     onclick() {
       this.isKuang = true;
       this.tableloading = true;

src/views/RMS/components/editCapacity.vue

@@ -143,7 +143,6 @@ export default {
     information() {
       //       //编辑
       //     console.log(this.$route.params)
-      // console.log(this.$route.params)
       this.axios
         .post(
           "/api/v1/rms/getCapacityInfoById/" +

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

@@ -373,6 +373,13 @@
         </el-table-column>
         <el-table-column prop="isSelfMention" label="是否自提" align="center">
         </el-table-column>
+        <el-table-column
+          prop="saleRemark"
+          label="摘要"
+          width="100px"
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           prop="saleOrderNo"
           label="销售订单号"
@@ -1186,7 +1193,8 @@ export default {
         '销售片区',
         '抵达时间',
         '签收时间',
-        '系统建议运价'
+        '系统建议运价',
+        '摘要'
       ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
@@ -2219,7 +2227,13 @@ export default {
             if (res.data.code == 200) {
               this.$message.success('变更车牌号成功!')
               this.operation(this.steelMap)
-              this.axios
+              console.log("更改车牌号之后的变化")
+              console.log(res.data)
+              if(res.data.data.capacityTel != 0){
+                console.log("进入了这个界面")
+                this.steelMap.capacityTel=res.data.data.capacityTel
+              }else{
+                this.axios
                 .post(
                   '/api/v1/ams/matchingDriverTelRecently?capacityNumber=' +
                     this.steelMap.capacityNo
@@ -2227,10 +2241,10 @@ export default {
                 .then(res => {
                   if (res.data.data != null) {
                     this.steelMap.capacityTel = res.data.data
-                    this.updateDriverTel()
                   }
                 })
-
+              }
+              this.updateDriverTel()
               this.getSteelReport()
               loading.close()
             } else {
@@ -2309,6 +2323,13 @@ export default {
         this.steelMap.capacityTel == ''
       ) {
         this.$message.error('电话号码不能为空')
+        loading.close()
+        return
+      }
+      var regex=/^[1][2,3,4,5,6,7,8,9][0-9]{9}$/
+      if(!regex.test(this.steelMap.capacityTel)){
+        this.$message.error('电话号码不符合规则')
+        loading.close()
         return
       }
       this.axios