Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -794,16 +794,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.seller) {
           this.$message({
             message: '请输入卖方名称！',
@@ -832,16 +822,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1121,16 +1121,6 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.buyerPhone.length < 7 ||
-        this.deptBudgetList.buyerPhone.length > 20
-      ) {
-        this.$message({
-          message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-          type: 'warning',
-        })
-        return
-      }
       if (!this.deptBudgetList.seller) {
         this.$message({
           message: '请输入卖方名称！',
@@ -1159,16 +1149,6 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.buyerPhone.length < 7 ||
-        this.deptBudgetList.buyerPhone.length > 20
-      ) {
-        this.$message({
-          message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-          type: 'warning',
-        })
-        return
-      }
       if (!this.deptBudgetList.acceptanceMethod) {
         this.$message({
           message: '请选择验收方式',

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -773,16 +773,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.seller) {
           this.$message({
             message: '请输入卖方名称！',
@@ -811,16 +801,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -840,16 +840,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.seller) {
           this.$message({
             message: '请输入卖方名称！',
@@ -878,16 +868,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/priceConfirmationSheetAdd.vue

@@ -309,16 +309,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方联络人电话输入错误!',
-            type: 'warning',
-          })
-          return
-        }
         if (isNaN(this.deptBudgetList.buyerPhone)) {
           this.$message({
             message: '卖方联络人电话输入有误!',
@@ -333,16 +323,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.seller.length < 2 ||
-          this.deptBudgetList.seller.length > 20
-        ) {
-          this.$message({
-            message: '卖方联络人姓名输入错误!',
-            type: 'warning',
-          })
-          return
-        }
 
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
@@ -358,16 +338,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方联络人电话输入有误!',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.transactionsNumberHand) {
           this.$message({
             message: '成交数量不能为空!',

src/views/contractManagement/priceConfirmationSheetEdit.vue

@@ -356,16 +356,6 @@ export default {
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方联络人电话输入错误!',
-            type: 'warning',
-          })
-          return
-        }
         if (isNaN(this.deptBudgetList.buyerPhone)) {
           this.$message({
             message: '卖方联络人电话输入有误!',
@@ -405,16 +395,6 @@ export default {
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方联络人电话输入有误!',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.transactionsNumberHand) {
           this.$message({
             message: '成交数量不能为空!',

src/views/contractManagement/purchaseContractAdd.vue

@@ -875,16 +875,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
             message: '请输入卖方电话！',
@@ -899,16 +889,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/purchaseContractEdit.vue

@@ -776,16 +776,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
             message: '请输入卖方电话！',
@@ -800,16 +790,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/salesContractAdd.vue

@@ -802,16 +802,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
             message: '请输入卖方电话！',
@@ -826,16 +816,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/salesContractEdit.vue

@@ -802,16 +802,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.buyerPhone.length < 7 ||
-          this.deptBudgetList.buyerPhone.length > 20
-        ) {
-          this.$message({
-            message: '买方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
             message: '请输入卖方电话！',
@@ -826,16 +816,6 @@
           })
           return
         }
-        if (
-          this.deptBudgetList.sellerPhone.length < 7 ||
-          this.deptBudgetList.sellerPhone.length > 20
-        ) {
-          this.$message({
-            message: '卖方电话长度不符合要求,请输入7到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/warehouse/warehouseManagementGross.vue

@@ -452,7 +452,7 @@
 
         }
       }
-      getReceiptTaskNo({flag:2,warehouseName:this.deptBudgetList.warehouseName,agentKey: localStorage.getItem("ws-pf_userId")}).toPromise()
+      getReceiptTaskNo({flag:2,warehouseName:this.deptBudgetList.warehouseName,agentKey: localStorage.getItem('ws-pf_userId')}).toPromise()
         .then((response) => {
           console.log(response)
           this.deptBudgetList1 = response
@@ -540,7 +540,7 @@
                 }
               }
             } 
-            else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺城粮库'||this.deptBudgetList.warehouseName == '鲅鱼圈金信库')) {
+            else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺诚粮库'||this.deptBudgetList.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 console.log(tmp)
@@ -1261,6 +1261,9 @@
                     // this.deptBudgetList.netWeight = Math.round(this.dataList.netWeight*1000)
                     // this.deptBudgetList.pureWeight = Math.round(this.dataList.pureWeight*1000)
                     // this.deptBudgetList.deductionWeight = Math.round(this.dataList.deductionWeight*1000)
+                    if(this.reader){
+                      this.reader.cancel()
+                    }
                     this.$message.success('添加成功')
                     this.$router.push({
                       path: 'warehouseManagementList'
@@ -1773,6 +1776,9 @@
                 addstorageputList(this.deptBudgetList)
                   .toPromise()
                   .then((response) => {
+                     if(this.reader){
+                        this.reader.cancel()
+                      }
                     this.$message.success('保存成功')
                     this.$router.push({
                       path: 'warehouseManagementList'

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -499,7 +499,7 @@
         this.isGetCost = true
         this.cost = this.dataList.cost
       }
-      getReceiptTaskNo({flag:2,warehouseName:this.deptBudgetList1.warehouseName,agentKey: localStorage.getItem("ws-pf_userId")}).toPromise()
+      getReceiptTaskNo({flag:2,warehouseName:this.deptBudgetList1.warehouseName,agentKey: localStorage.getItem('ws-pf_userId')}).toPromise()
         .then((response) => {
           this.deptBudgetList2 = response
         })
@@ -1312,6 +1312,9 @@
                     this.dataList.netWeight = Math.round(this.dataList.netWeight * 1000)
                     this.dataList.pureWeight = Math.round(this.dataList.pureWeight * 1000)
                     this.dataList.deductionWeight = Math.round(this.dataList.deductionWeight * 1000)
+                    if(this.reader){
+                        this.reader.cancel()
+                      }
                     this.$message.success('提交成功')
                     this.$confirm(`是否打印磅单`, {
                         cancelButtonText: '取消',

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -406,7 +406,7 @@
       this.dataList.statusFlag = this.$route.statusFlag
       this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
       console.log(this.dataList)
-      getReceiptTaskNo({flag:1,warehouseName:this.deptBudgetList.warehouseName,agentKey: localStorage.getItem("ws-pf_userId")}).toPromise()
+      getReceiptTaskNo({flag:1,warehouseName:this.deptBudgetList.warehouseName,agentKey: localStorage.getItem('ws-pf_userId')}).toPromise()
         .then((response) => {
           this.deptBudgetList2 = response
         })
@@ -1084,6 +1084,9 @@
                 addstorageputList(this.dataList)
                   .toPromise()
                   .then((response) => {
+                    if(this.reader){
+                        this.reader.cancel()
+                      }
                     this.$message.success('提交成功')
                     this.$confirm(`是否打印磅单`, {
                         cancelButtonText: '取消',

src/views/warehouse/warehouseManagementTare.vue

@@ -395,7 +395,7 @@
       this.deptBudgetList.warehouseType = this.$route.query.warehouseType
       this.deptBudgetList.warehouseId = this.$route.query.warehouseId
       this.getList()
-      getReceiptTaskNo({flag:1,warehouseName:this.deptBudgetList.warehouseName,agentKey: localStorage.getItem("ws-pf_userId")}).toPromise()
+      getReceiptTaskNo({flag:1,warehouseName:this.deptBudgetList.warehouseName,agentKey: localStorage.getItem('ws-pf_userId')}).toPromise()
         .then((response) => {
           console.log(response)
           this.deptBudgetList1 = response
@@ -964,13 +964,16 @@
                 this.deptBudgetList.inOutFlag = 1
                 this.deptBudgetList.pcFlag = 1
                 this.deptBudgetList.statusFlag = 1
-                his.deptBudgetList.grossWeight /= 1000
+                this.deptBudgetList.grossWeight /= 1000
                 this.deptBudgetList.tare /= 1000
                 this.deptBudgetList.netWeight = this.deptBudgetList.netWeight.toFixed(2)
                 this.deptBudgetList.pureWeight /= 1000
                 addstorageputList(this.deptBudgetList)
                   .toPromise()
                   .then((response) => {
+                    if(this.reader){
+                      this.reader.cancel()
+                    }
                     this.$message.success('保存成功')
                     this.$router.push({
                       path: 'warehouseManagementList'
@@ -1409,6 +1412,9 @@
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
+                  if(this.reader){
+                    this.reader.cancel()
+                  }
                   this.$message.success('添加成功')
                   this.$router.push({
                     path: 'warehouseManagementList'