修改

build/utils.js

@@ -16,8 +16,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-// let devModules = ['all']
-let devModules = ['index', 'statisticalReport', 'sale']
+let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'appoint']
 // let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']

src/views/index/components/printReceipt1.vue

@@ -328,8 +328,8 @@ export default {
     print1() {
       console.log('进入了打印页面')
       let orderNumber = this.$route.query.orderNumber
-      this.axios.post('/api/v1/tms/changeNumber?orderNumber=' + orderNumber)
       window.print()
+      this.axios.post('/api/v1/tms/changeNumber?orderNumber=' + orderNumber)
       this.$router.push({ name: 'printScan1', params: { index: '1' } })
       //this.backScan()
     },

src/views/index/components/printScan1.vue

@@ -38,7 +38,7 @@
       >
       </el-switch>-->
     </div>
-<!--    <div class="tip">
+    <!--    <div class="tip">
       手机二维码对准下方摄像头<br />
       <div class="arrowDown">⇩</div>
       &lt;!&ndash; <i
@@ -57,14 +57,20 @@ export default {
       orderNumber: null,
       isEdit: true,
       edit1: true,
-      backgroundImgURLList:[require('@/assets/saleSelfMachine/00.png'),
+      backgroundImgURLList: [
+        require('@/assets/saleSelfMachine/00.png'),
         require('@/assets/saleSelfMachine/01.png'),
         require('@/assets/saleSelfMachine/02.png'),
-        require('@/assets/saleSelfMachine/03.png')],
+        require('@/assets/saleSelfMachine/03.png')
+      ],
       backgroundImgURL: require('@/assets/saleSelfMachine/00.png')
     }
   },
   created() {
+    localStorage.setItem(
+      'onlyKey',
+      Math.floor(Math.random() * 60 * 24 * 60) + 'huabao'
+    )
     this.changfouce()
   },
   // watch:{
@@ -72,18 +78,18 @@ export default {
   // },
   methods: {
     //打印函数
-    printing(){
-      console.log("进入了打印方法")
-      this.backgroundImgURL=this.backgroundImgURLList[2];
-      setTimeout(()=>{
-        console.log("进入了第一层定时器")
-        this.backgroundImgURL=this.backgroundImgURLList[3]
-        setTimeout(()=>{
-          console.log("进入了第二层定时器")
-          this.backgroundImgURL=this.backgroundImgURLList[0]
-          this.$route.params.index=0
-        },2000)
-      },30000);
+    printing() {
+      console.log('进入了打印方法')
+      this.backgroundImgURL = this.backgroundImgURLList[2]
+      setTimeout(() => {
+        console.log('进入了第一层定时器')
+        this.backgroundImgURL = this.backgroundImgURLList[3]
+        setTimeout(() => {
+          console.log('进入了第二层定时器')
+          this.backgroundImgURL = this.backgroundImgURLList[0]
+          this.$route.params.index = 0
+        }, 2000)
+      }, 30000)
     },
     //全屏函数
     fullScreen() {
@@ -168,8 +174,8 @@ export default {
     document.getElementById('full').click()
     console.log(screenfull.isFullscreen)
     console.log(this.$route.params.index)
-    if (this.$route.params.index==1){
-      this.printing();
+    if (this.$route.params.index == 1) {
+      this.printing()
     }
     /*const timer1 = setInterval(async ()=>{
       this.backgroundImgURL=this.backgroundImgURLList[0]
@@ -191,12 +197,12 @@ export default {
           let promise = await this.querynumber(this.orderNumber)
           console.log(promise)
           if (promise == 1) {
-            this.backgroundImgURL=this.backgroundImgURLList[1]
+            this.backgroundImgURL = this.backgroundImgURLList[1]
             this.orderNumber = null
-            setTimeout(()=>{
-              this.backgroundImgURL=this.backgroundImgURLList[0]
-              console.log("进入该方法了")
-            },4000)
+            setTimeout(() => {
+              this.backgroundImgURL = this.backgroundImgURLList[0]
+              console.log('进入该方法了')
+            }, 4000)
             return
           }
           this.$router.push({

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

@@ -785,13 +785,13 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="发票日期">
-            <el-date-picker
+          <el-date-picker
             v-model="statementTime"
             type="date"
             placeholder="选择日期"
             style="width:200px"
           >
-        </el-date-picker>
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="发票图片" style="">
           <el-upload
@@ -837,7 +837,7 @@ export default {
   },
   data() {
     return {
-      statementTime:null,
+      statementTime: null,
       saleOrderMaterialIds: [],
       batchAddressProvince: '',
       batchAddressDistrict: '',
@@ -1568,7 +1568,7 @@ export default {
     },
     generateStatement() {
       this.isLoading = true
-      if (!this.excludeTax ||! this.statementTime) {
+      if (!this.excludeTax || !this.statementTime) {
         this.$message.warning('请填写所有信息！')
         this.isLoading = false
       } else if (this.statementList.length < 1) {
@@ -1592,8 +1592,8 @@ export default {
         formData.append('orderList', orderList)
         formData.append('excludeTax', this.excludeTax)
         formData.append('userId', getCookie('userId'))
-        console.log("statementTime:",this.statementTime);
-        formData.append('statementTime',this.statementTime.getTime());
+        console.log('statementTime:', this.statementTime)
+        formData.append('statementTime', this.statementTime.getTime())
         let options = {
           url: '/api/v1/bms/addTruckStatement',
           data: formData,
@@ -2861,6 +2861,7 @@ export default {
           let map = this.steelMap
           map.operateName = getCookie('loginName')
           map.isCloseEas = Number(0)
+          map.userName = getCookie('loginName')
           const loading = this.$loading({
             lock: true,
             text: '正在关闭车辆',
@@ -3256,8 +3257,8 @@ export default {
       this.selecteddetailsOrderAmount = 0
       this.amsPriceList = []
       this.isRowClick = 0
-      if(!obj){
-        obj=new Object();
+      if (!obj) {
+        obj = new Object()
       }
       if (this.activeName == 'first') {
         const loading = this.$loading({
@@ -3293,13 +3294,13 @@ export default {
         }
         if (this.screen == '收款客户' && this.screen1 == '收款客户') {
           obj.paymentCustomer = [this.input, this.input1]
-        }else {
+        } else {
           if (this.screen == '收款客户') {
             obj.paymentCustomer = [this.input]
-          } 
+          }
           if (this.screen1 == '收款客户') {
             obj.paymentCustomer = [this.input1]
-          } 
+          }
         }
         if (this.screen == '客户') {
           consigneeName = this.input
@@ -3310,7 +3311,7 @@ export default {
         } else if (this.screen == '分录ID') {
           console.log('进入了分录')
           easPrimaryId = this.input
-        } else if(this.screen != '收款客户' && this.input){
+        } else if (this.screen != '收款客户' && this.input) {
           remark = this.input
         }
         if (
@@ -3414,13 +3415,13 @@ export default {
         console.log(this.screen1, this.input1, 'here')
         if (this.screen == '收款客户' && this.screen1 == '收款客户') {
           obj.paymentCustomer = [this.input, this.input1]
-        }else {
+        } else {
           if (this.screen == '收款客户') {
             obj.paymentCustomer = [this.input]
-          } 
+          }
           if (this.screen1 == '收款客户') {
             obj.paymentCustomer = [this.input1]
-          } 
+          }
         }
         if (this.screen == '客户') {
           consigneeName = this.input
@@ -3431,7 +3432,7 @@ export default {
         } else if (this.screen == '分录ID') {
           console.log('进入了分录')
           easPrimaryId = this.input
-        } else if(!this.screen && this.input){
+        } else if (!this.screen && this.input) {
           remark = this.input
         }
         if (
@@ -3452,7 +3453,7 @@ export default {
           this.input1 != ''
         ) {
           capacityNo = this.input1
-        } else if(!this.screen1 && this.input1) {
+        } else if (!this.screen1 && this.input1) {
           remark = this.input1
         }
         this.axios

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

@@ -832,7 +832,7 @@
                 >反关闭运单</el-button
               >
             </div>
-            <el-button  round @click="resetPrintNumber">重置打印次数</el-button>
+            <el-button round @click="resetPrintNumber">重置打印次数</el-button>
           </div>
           <div class="steelMapClass3">
             <div class="steelMapClass32">
@@ -1578,7 +1578,7 @@ import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
 import PathView from './mapTest.vue'
 import currentLocation from './currentLocation.vue'
-import { downloadFile,creatImageFile } from '@/utils/base64ToBlob.js'
+import { downloadFile, creatImageFile } from '@/utils/base64ToBlob.js'
 export default {
   components: {
     PathView,
@@ -2095,14 +2095,16 @@ export default {
   },
   computed: {},
   methods: {
-    resetPrintNumber(){
-      this.axios.post('/api/v1/bp/resetPrintNumber',this.steelMap).then((res)=>{
-        if(res.data.status=='succeed'){
-          this.$message.success("重置成功！");
-        }else{
-          this.$message.error("重置失败！");
-        }
-      });
+    resetPrintNumber() {
+      this.axios
+        .post('/api/v1/bp/resetPrintNumber', this.steelMap)
+        .then(res => {
+          if (res.data.status == 'succeed') {
+            this.$message.success('重置成功！')
+          } else {
+            this.$message.error('重置失败！')
+          }
+        })
     },
     showBatchCapacity() {
       this.capacityNo = null
@@ -2133,7 +2135,7 @@ export default {
       this.capacityId = selection.capacityId
     },
     //批量修改车牌号
-    async batchEditCapacity() {
+    batchEditCapacity() {
       if (this.capacityId && this.capacityNo) {
         if (
           !(
@@ -2147,7 +2149,7 @@ export default {
           return
         }
         console.log('this.batchCapacityList', this.batchCapacityList)
-         this.batchCapacityList.forEach(row => {
+        this.batchCapacityList.forEach(row => {
           row.capacityId = this.capacityId
           row.capacityNumber = this.capacityNo
           //是否校验GPS
@@ -2160,18 +2162,16 @@ export default {
           if (row.capacityIds == 0) {
             row.lineId = this.lineSpelling[row.size]
           }
-         })
-         let map={
-          list:this.batchCapacityList
-         }
-        await this.axios
-              .post('/api/v1/ams/batchUpdateCapacity',map )
-              .then(res => {
-                if (res.data.code == '200') {
-                  this.$message.success('派车成功!')
-                } else {
-                  this.$message.error(res.data.data)
-                }
+        })
+        let map = {
+          list: this.batchCapacityList
+        }
+        this.axios.post('/api/v1/ams/batchUpdateCapacity', map).then(res => {
+          if (res.data.code == '200') {
+            this.$message.success('派车成功!')
+          } else {
+            this.$message.error(res.data.data)
+          }
         })
         this.batchCarrierVisible = false
         this.getSteelReport()
@@ -2215,18 +2215,18 @@ export default {
     },
     mergeSplit() {
       //如果勾选了多条则执行合并操作,如果勾选了一条则执行拆分操作
-      if (
-        this.$refs.tableRef.selection.filter(e => {
-          return e.entryGateTime != null
-        }).length > 0
-      ) {
-        this.$message({
-          type: 'warning',
-          message: '该车已进厂不允许操作',
-          offset: '250',
-          duration: '2300'
-        })
-      }
+      // if (
+      //   this.$refs.tableRef.selection.filter(e => {
+      //     return e.entryGateTime != null
+      //   }).length > 0
+      // ) {
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '该车已进厂不允许操作',
+      //     offset: '250',
+      //     duration: '2300'
+      //   })
+      // }
       if (this.$refs.tableRef.selection.length == 1) {
         this.splitOrder()
       } else if (this.$refs.tableRef.selection.length > 1) {
@@ -2274,7 +2274,7 @@ export default {
               } else {
                 this.$message({
                   type: 'error',
-                  message: '拆分失败',
+                  message: res.data.data,
                   offset: '250',
                   duration: '2500'
                 })
@@ -2300,7 +2300,7 @@ export default {
     },
     mergeOrder() {
       this.$confirm(
-        `勾选了${this.$refs.tableRef.selection.length}条运单将执行合并操作`,
+        `勾选了${this.$refs.tableRef.selection.length}条运单将执行合并操作,此操作不可逆!`,
         '提醒',
         {
           confirmButtonText: '确定',
@@ -2314,6 +2314,9 @@ export default {
             map.saleOrderMaterialId = e.saleOrderMaterialId
             map.orderId = e.orderId
             map.saleOrderId = e.saleOrderId
+            map.orderNo = e.orderNo
+            map.capacityNo = e.capacityNo
+            map.userName = getCookie('loginName')
             return map
           })
           let map = {
@@ -2327,14 +2330,14 @@ export default {
                 this.getSteelReport()
                 this.$message({
                   type: 'success',
-                  message: '合并成功',
+                  message: '合并成功,请提醒驾驶员!',
                   offset: '250',
-                  duration: '2500'
+                  duration: '3000'
                 })
               } else {
                 this.$message({
                   type: 'error',
-                  message: '合并失败',
+                  message: res.data.data,
                   offset: '250',
                   duration: '2500'
                 })
@@ -2653,13 +2656,13 @@ export default {
           if (res.data) {
             this.arriavlList = []
             res.data.forEach((e, index) => {
-              creatImageFile(e,'file1-'+index).then((res)=>{
+              creatImageFile(e, 'file1-' + index).then(res => {
                 this.arriavlList.push({
                   name: 'file' + index,
                   raw: res,
                   url: e
                 })
-              });
+              })
             })
             this.fileListArrival = this.arriavlList
           }
@@ -2672,13 +2675,13 @@ export default {
           if (res.data) {
             this.receiveList = []
             res.data.forEach((e, index) => {
-              creatImageFile(e,'file2-'+index).then((res)=>{
+              creatImageFile(e, 'file2-' + index).then(res => {
                 this.receiveList.push({
                   name: 'file' + index,
                   raw: res,
                   url: e
                 })
-              });
+              })
             })
             this.fileListReceive = this.receiveList
           }
@@ -2740,7 +2743,7 @@ export default {
           this.$message.success('上传成功！')
           this.steelMap.arrivalAddress = this.location
           this.closeUpload()
-          this.refresh();
+          this.refresh()
         })
       })
     },
@@ -2778,7 +2781,6 @@ export default {
     },
     //筛选
     filterChange(obj) {
-      debugger
       //承运商筛选,后续有待优化
       if (typeof obj.carrierList != 'undefined' && obj.carrierList.length > 0) {
         this.filterMap.carrierList = obj.carrierList
@@ -3653,6 +3655,7 @@ export default {
           let map = this.steelMap
           map.operateName = getCookie('loginName')
           map.isCloseEas = Number(0)
+          map.userName = getCookie('loginName')
           const loading = this.$loading({
             lock: true,
             text: '正在关闭车辆',
@@ -3852,6 +3855,7 @@ export default {
       let map = this.steelMap
       map.isCloseEas = Number(1)
       map.isNewCar = Number(1)
+      map.userName = getCookie('loginName')
       map.shipperAddressId = this.addressId
       this.axios
         .post('/api/v1/ams/updateCarAddress', map)
@@ -3889,6 +3893,7 @@ export default {
         map.isCloseEas = Number(1)
         map.isNewCar = Number(1)
         map.shipperAddressId = this.addressId
+        map.userName = getCookie('loginName')
         this.axios
           .post('/api/v1/ams/updateCarAddress', map)
           .then(res => {

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

@@ -77,6 +77,11 @@
             <i class="el-icon-refresh"></i>
           </el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="updateSaleOrderRemark">
+            重置上传限制
+          </el-button>
+        </el-form-item>
         <el-form-item>
           <span style="margin-left: 1rem;font-size:16px">车数/件数：</span>
           <span style="font-size:16px"
@@ -1082,6 +1087,46 @@ export default {
           })
           this.getSpanArr(res.data.data)
         })
+    },
+    updateSaleOrderRemark() {
+      this.$confirm(
+        `确定将所选${this.$refs.tableRef.selection.length}条分录重置上传限制?`,
+        '提示',
+        {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          center: true
+        }
+      )
+        .then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: '正在快马加鞭为您重置上传限制,请稍候',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          let map = {
+            list: this.$refs.tableRef.selection
+          }
+          this.axios
+            .post('/api/v1/ams/updateSaleOrderRemark', map, {
+              timeout: 5 * 60 * 1000
+            })
+            .then(res => {
+              if (res.data.code == '200') {
+              }
+            })
+            .catch(e => {
+              loading.close()
+            })
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消操作',
+            offset: '200'
+          })
+        })
     }
   }
 }