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

src/views/RMS/components/addCapacity.vue

@@ -229,6 +229,9 @@ export default {
       if (vehicleNumber.length == 7) {
         var express = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使场领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
         result = express.test(vehicleNumber);
+      }else if(vehicleNumber.length == 8){
+        var express = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼]{1}[A-HJ-NP-Z]{1}(([A-HJ-NP-Z0-9]{5})|([0-9]{6}|[A-HJ-NP-Z]{1}[0-9]{5}|[0-9]{5}[A-HJ-NP-Z]{1}|[A-HJ-NP-Z]{2}[0-9]{4}))$/;
+        result = express.test(vehicleNumber);
       }
       return result;
     },

src/views/index/components/printReceipt1.vue

@@ -394,4 +394,11 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
+@media print {
+  // 打印样式，去除页眉页脚
+  @page {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+}
 </style>

src/views/sale/components/offSiteTransportation/checkGPS.vue

@@ -511,6 +511,19 @@ export default {
       }
       
     },
+    //校验车牌号
+    isVehicleNumber(vehicleNumber) {
+      // console.log(vehicleNumber);
+      var result = false;
+      if (vehicleNumber.length == 7) {
+        var express = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使场领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
+        result = express.test(vehicleNumber);
+      }else if(vehicleNumber.length == 8){
+        var express = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼]{1}[A-HJ-NP-Z]{1}(([A-HJ-NP-Z0-9]{5})|([0-9]{6}|[A-HJ-NP-Z]{1}[0-9]{5}|[0-9]{5}[A-HJ-NP-Z]{1}|[A-HJ-NP-Z]{2}[0-9]{4}))$/;
+        result = express.test(vehicleNumber);
+      }
+      return result;
+    },
     //初始化数据
     initData() {
       let that = this;
@@ -523,6 +536,14 @@ export default {
           showClose:true
         });
         return;
+      }else if(!that.isVehicleNumber(that.carNumber)){
+        this.$message({
+          message:"车牌号格式错误！",
+          offset:100,
+          type:"warning",
+          showClose:true
+        });
+        return;
       }
       if (that.time == null && that.time.length != 2) {
         this.$message.error("请选择时间");

src/views/sale/components/offSiteTransportation/currentLocation.vue

@@ -82,16 +82,28 @@ export default {
   },
   mounted() {},
   methods: {
+    //校验车牌号
+    isVehicleNumber(vehicleNumber) {
+      // console.log(vehicleNumber);
+      var result = false;
+      if (vehicleNumber.length == 7) {
+        var express = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使场领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
+        result = express.test(vehicleNumber);
+      }else if(vehicleNumber.length == 8){
+        var express = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼]{1}[A-HJ-NP-Z]{1}(([A-HJ-NP-Z0-9]{5})|([0-9]{6}|[A-HJ-NP-Z]{1}[0-9]{5}|[0-9]{5}[A-HJ-NP-Z]{1}|[A-HJ-NP-Z]{2}[0-9]{4}))$/;
+        result = express.test(vehicleNumber);
+      }
+      return result;
+    },
     //初始化数据
     initData() {
       let that = this;
-      let regExp = /(^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$)/;
       if (that.carNumber == "") {
         this.$message.error("车牌号不能为空！");
         //清除旧的定时器
         clearTimeout(this.timer);
         return;
-      } else if (!regExp.test(that.carNumber)) {
+      } else if (!that.isVehicleNumber(that.carNumber)) {
         this.$message.error("请输入正确的车牌号！");
         //清除旧的定时器
         clearTimeout(this.timer);

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -124,7 +124,12 @@
         </el-form-item>
         <el-form-item v-show="activeName == 'first'">
           <el-button type="primary" @click="openDetails"  v-if="!notRoutList.includes('uploadDetails')">
-            <i class="el-icon-circle-check"></i>直接修改详单金额
+            <i class="el-icon-circle-check"></i>直接修改单价
+          </el-button>
+        </el-form-item>
+         <el-form-item v-show="activeName == 'first'">
+          <el-button type="primary" @click="openDetailsAdd"  v-if="!notRoutList.includes('uploadDetails')">
+            <i class="el-icon-circle-check"></i>冲红
           </el-button>
         </el-form-item>
         <!-- <el-form-item v-if="isShowOperate">
@@ -891,6 +896,33 @@
         >确定</el-button
       >
     </el-dialog>
+    <el-dialog
+      title="冲红"
+      :visible.sync="showDetailsAdd"
+    >
+      <el-form style="margin-left:20%">
+        <el-form-item label="冲红金额">
+          <el-input
+            v-model="detailAmount"
+            style="width:200px"
+            type="number"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="冲红备注">
+          <el-input
+            v-model="detailRemark"
+            style="width:200px"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <el-button
+        type="primary"
+        @click="addTruckDetail"
+        :loading="isLoading"
+        style="margin-left:40%"
+        >确定</el-button
+      >
+    </el-dialog>
     <el-dialog :visible.sync="dialogVisible" width="80%">
       <img width="100%" :src="dialogImageUrl" alt="" />
     </el-dialog>
@@ -1222,6 +1254,7 @@ export default {
       detailAmount:null,
       detailsList:[],
       showDetailsUpLoad:false,
+      showDetailsAdd:false,
       detailRemark:null,
       showPhotoPreview:false,
       previewList:[],
@@ -1639,8 +1672,15 @@ export default {
         if (this.setteldAllselectValue == 1) {
           data = this.tableData1
         } else {
-          data = this.$refs.tableRef1.selection
+          let orderList= [];
+          this.$refs.tableRef1.selection.forEach((item)=>{
+            orderList.push(item.orderId);
+          });
+          console.log("orderList",orderList);
+          console.log("tableData1",this.tableData1);
+          data = this.tableData1.filter(item => orderList.indexOf(item.orderId)>=0);
         }
+        console.log(data, 'data')
         this.selecteddetailsOrderAmount = data.reduce((prev, item) => {
           return item.detailsAmount + prev
         }, 0)
@@ -1735,9 +1775,6 @@ export default {
       if (!this.detailAmount || !this.detailRemark) {
         this.$message.warning('请填写所有信息！')
         this.isLoading = false
-      } else if (this.detailsList.length < 1) {
-        this.$message.warning('请上传凭证')
-        this.isLoading = false
       } else {
         let data = []
         if (this.unSetteleAllselectValue == 1) {
@@ -1750,9 +1787,11 @@ export default {
         })
         console.log(orderList, 'orderList')
         let formData = new window.FormData()
-        this.detailsList.forEach((item,index)=>{
-          formData.append('file'+index, item.raw)
-        });
+        if(this.detailsList){
+          this.detailsList.forEach((item,index)=>{
+            formData.append('file'+index, item.raw)
+          });
+        }
         formData.append('orderList', orderList)
         formData.append('userId', getCookie('userId'))
         formData.append('detailAmount',this.detailAmount);
@@ -1779,6 +1818,68 @@ export default {
         })
       }
     },
+    openDetailsAdd(){
+       console.log(this.$refs.tableRef.selection, 'selection')
+      if (
+        !this.$refs.tableRef.selection ||
+        this.$refs.tableRef.selection.length != 1
+      ) {
+        this.$message.warning('请选择需要冲红的订单,一次只允许修改一个')
+        return;
+      } else {
+        this.detailAmount = null
+        this.detailRemark = null
+        this.detailsList = []
+        let data = []
+        if (this.unSetteleAllselectValue == 1) {
+          data = this.tableData
+        } else {
+          data = this.$refs.tableRef.selection
+        }
+        for(let i=0;i<data.length;i++){
+          if(!data[i].orderId){
+            this.$message.warning('没有派发运单，无法修改此项')
+            return;
+          }
+        }
+        this.showDetailsAdd = true
+      }
+    },
+    addTruckDetail(){
+        this.isLoading = true
+      if (!this.detailAmount || !this.detailRemark) {
+        this.$message.warning('请填写所有信息！')
+        this.isLoading = false
+      } else {
+        let data = []
+        if (this.unSetteleAllselectValue == 1) {
+          data = this.tableData
+        } else {
+          data = this.$refs.tableRef.selection
+        }
+        let orderList = data.map(e => {
+          return e.orderId
+        })
+        console.log(orderList, 'orderList')
+        let map = {
+          orderList:orderList,
+          userId:getCookie('userId'),
+          detailAmount:this.detailAmount,
+          detailRemark:this.detailRemark
+        }
+        this.axios.post('/api/v1/bms/addTruckDetail',map).then(res => {
+          if (res.data.status == 'succeed') {
+            this.$message.success('修改成功！')
+            this.setteldAllselectValue = 0
+            this.onclick();
+          } else {
+            this.$message.error(res.data.data)
+          }
+          this.showDetailsAdd = false
+          this.isLoading = false
+        })
+      }
+    },
     receiveClick(src, title) {
       // this.dialogImageUrl = src
       downloadFile(src, `${this.downloadCapacityNo}${title}照片`, '.jpg')

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

@@ -1196,6 +1196,22 @@
             :disabled="orgCode != 'wuliuyunshubu'"
           ></el-input>
         </el-form-item>
+        <el-form-item label="抵达时间">
+          <el-date-picker
+            v-model="arrivalTime"
+            type="datetime"
+            :disabled="orgCode != 'wuliuyunshubu'"
+            placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="签收时间">
+          <el-date-picker
+            v-model="receiptTime"
+            type="datetime"
+            :disabled="orgCode != 'wuliuyunshubu'"
+            placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="抵达图片（车头、满货箱）" style="">
           <el-upload
             ref="arrival"
@@ -1922,6 +1938,8 @@ export default {
       dialogImageUrl: '',
       dialogVisible: false,
       isLoading: false,
+      arrivalTime:null,
+      receiptTime:null,
       dialogFormVisible: false,
       addresText: null,
       originalPriceValue: null,
@@ -2821,6 +2839,8 @@ export default {
       }
       this.orderNumber = row.orderNo
       this.capacityNumber = row.capacityNo
+      this.arrivalTime = row.arrivalTime
+      this.receiptTime = row.receiptTime
       this.arrivalReceiving = true
       //抵达图片
       this.axios
@@ -2884,6 +2904,9 @@ export default {
       })
       formData.append('orderNumber', this.orderNumber)
       formData.append('resultArrivalAddress', this.location)
+      if(this.arrivalTime){
+        formData.append('arrivalTime',sjTime(this.arrivalTime));
+      }
       let options = {
         // 设置axios的参数
         url: '/api/v1/otms/addtmstruckArrivalResult',
@@ -2903,6 +2926,9 @@ export default {
         })
         formData.append('orderNumber', this.orderNumber)
         formData.append('resultArrivalAddress', this.location)
+        if(this.receiptTime){
+          formData.append('receiptTime',sjTime(this.receiptTime));
+        }
         formData.append('num', request.length)
         let options = {
           url: '/api/v1/otms/addTmstruckReceiptResultForWeb',
@@ -2918,6 +2944,7 @@ export default {
           this.steelMap.arrivalAddress = this.location
           this.closeUpload()
           this.refresh()
+          this.tableRowIndex=''
         })
       })
     },
@@ -2936,6 +2963,8 @@ export default {
     },
     closeUpload() {
       this.location = null
+      this.arrivalTime = null
+      this.receiptTime= null
       this.arrivalReceiving = false
       this.isLoading = false
       this.$refs.arrival.clearFiles()