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

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -760,9 +760,9 @@
           }
           return false
         }
-        if (this.baseInfoForm.saleLimit == '' || _baseWaterValidate(100, 100000, '', '', 'saleLimit', parseFloat(this
+        if (this.baseInfoForm.saleLimit == '' || _baseWaterValidate(100, 10000000, '', '', 'saleLimit', parseFloat(this
             .baseInfoForm.saleLimit))) {
-          if (_baseWaterValidate(100, 100000, '', '', 'saleLimit', parseFloat(this.baseInfoForm.saleLimit))) {
+          if (_baseWaterValidate(100, 10000000, '', '', 'saleLimit', parseFloat(this.baseInfoForm.saleLimit))) {
             that.$message.error('销售上限输入错误!');
           } else {
             that.$message.error('销售上限不能为空！');

src/views/houseSelfCollect/weighingManagement.vue

@@ -410,37 +410,51 @@
         }
         this.getList()
       },
+      isConfirmQuality(val) {
+        if (val.qualityInspectionManagement.confirm == '1'&&val.qualityInspectionManagement.warehouseName=='哈尔滨依兰库') return true;
+        return false
+      },
       weightCheck(row, num) {
         console.log(this.cangid)
-        this.$router.push({
-          path: 'weightCheck',
-          query: {
-            tpyeNo: num,
-            id: row.id,
-            number: row.number,
-            binNumber: row.binNumber,
-            customer: row.customer,
-            storageNumber: row.storageNumber,
-            carNumber: row.carNumber,
-            boxNo: row.qualityInspectionManagement.boxNo,
-            boxNoOther: row.qualityInspectionManagement.boxNoOther,
-            titleNo: row.qualityInspectionManagement.titleNo,
-            titleNoOther: row.qualityInspectionManagement.titleNoOther,
-            goodsName: row.goodsName,
-            grossWeight: row.grossWeight,
-            tare: row.tare,
-            netWeight: row.netWeight,
-            relationId: row.relationId,
-            warehouseId: this.warehouseId,
-            monitorUrl1: this.monitorUrl1,
-            monitorUrl2: this.monitorUrl2,
-            allowEdit: this.allowEdit,
-            cangid: this.cangid,
-            warehouseName: this.warehouseName,
-            paramType: row.qualityInspectionManagement.paramType,
-            customerNumberCard:row.customerNumberCard
-          },
-        })
+        // 质检是否是已确定状态
+        let _isGoweightCheck = this.isConfirmQuality(row)
+        if (_isGoweightCheck) {
+          this.$router.push({
+            path: 'weightCheck',
+            query: {
+              tpyeNo: num,
+              id: row.id,
+              number: row.number,
+              binNumber: row.binNumber,
+              customer: row.customer,
+              storageNumber: row.storageNumber,
+              carNumber: row.carNumber,
+              boxNo: row.qualityInspectionManagement.boxNo,
+              boxNoOther: row.qualityInspectionManagement.boxNoOther,
+              titleNo: row.qualityInspectionManagement.titleNo,
+              titleNoOther: row.qualityInspectionManagement.titleNoOther,
+              goodsName: row.goodsName,
+              grossWeight: row.grossWeight,
+              tare: row.tare,
+              netWeight: row.netWeight,
+              relationId: row.relationId,
+              warehouseId: this.warehouseId,
+              monitorUrl1: this.monitorUrl1,
+              monitorUrl2: this.monitorUrl2,
+              allowEdit: this.allowEdit,
+              cangid: this.cangid,
+              warehouseName: this.warehouseName,
+              paramType: row.qualityInspectionManagement.paramType,
+              customerNumberCard: row.customerNumberCard
+            },
+          })
+        } else {
+          this.$message({
+            message: '质检状态未确认，质检状态确认后称毛重！',
+            type: 'warning',
+          })
+        }
+
       },
       find() {
         this.getList()
@@ -723,7 +737,8 @@
     text-align: center;
     font-size: 20px;
   }
-  .show-excel{
-    opacity:0;
+
+  .show-excel {
+    opacity: 0;
   }
 </style>

src/views/houseSelfCollect/weightCheck.vue

@@ -480,7 +480,7 @@
             // console.log("receData",receData);
             var flag = false;
             var flag1 = false;
-            if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库'||this.warehouseName == '鲅鱼圈祥腾库')) {
+            if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库'||this.warehouseName == '鲅鱼圈祥腾库'||this.warehouseName == '哈尔滨依兰库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {

src/views/outboundManagement/weighing.vue

@@ -213,7 +213,7 @@
 				// else{
 				// 	this.weighingList.tare = parseInt(result) 
 				// }
-				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')||this.warehouseName == '鲅鱼圈祥腾库'){
+				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')||this.warehouseName == '鲅鱼圈祥腾库'||this.warehouseName == '哈尔滨依兰库'){
 					for (var i = 0; i < value.length; i++) {
 						var tmp = String.fromCharCode(value[i])
 						if (tmp == '+') {

src/views/warehouse/warehouseManagementAdd.vue

@@ -379,6 +379,20 @@
             })
             return
           }
+          if (!this.deptBudgetList.addressUrl) {
+            this.$message({
+              message: '附件不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+           if (!this.deptBudgetList.warehousePositioning) {
+            this.$message({
+              message: '仓库定位不能为空！',
+              type: 'warning',
+            })
+            return
+          }
 
           if (this.totalStorage <= 0) {
             this.$message({

src/views/warehouse/warehouseManagementEdit.vue

@@ -479,7 +479,11 @@
             // if(this.deptBudgetList.addressUrl){
             //   this.fileList =  this._getFileList(this.deptBudgetList.addressUrl)
             // }
-            this.addressUrls = this.deptBudgetList.addressUrl.split(',')
+            if(this.deptBudgetList.addressUrl){
+              this.addressUrls = this.deptBudgetList.addressUrl.split(',')
+            }else{
+                this.addressUrls = []
+            }
             this.deptBudgetList.otherPersonPhone = this.deptBudgetList.otherPersonPhone.split(',')
             this.addressUrls.pop()
           })
@@ -557,6 +561,20 @@
           })
           return
         }
+        if (!this.deptBudgetList.addressUrl) {
+          this.$message({
+            message: '附件不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+          if (!this.deptBudgetList.warehousePositioning) {
+          this.$message({
+            message: '仓库定位不能为空！',
+            type: 'warning',
+          })
+          return
+        }
         if (this.warehouseType == 1) {
           if (this.totalStorage <= 0) {
             this.$message({

src/views/warehouse/warehouseManagementGross.vue

@@ -396,7 +396,7 @@
           deductionWeight: 0,
           grossWeight: '',
           tare: '',
-          inOutDate:"",
+          inOutDate:'',
         },
         historyList: [],
         cost: '',
@@ -434,7 +434,7 @@
         var year = date.getFullYear();
         var month = date.getMonth() + 1;
         var strDate = date.getDate()
-        this.deptBudgetList.inOutDate = ""+year+"-"+month+"-"+strDate
+        this.deptBudgetList.inOutDate = ''+year+'-'+month+'-'+strDate
       this.information = this.$route.query.information
       if (this.$route.query.allowEdit == 1) {
         this.allowEdit = false
@@ -526,7 +526,7 @@
             // }
             console.log('value:', value);
             if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '山东诸城迈饶库' || this
-                .deptBudgetList.warehouseName == '克东千红库' || this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库')) {
+                .deptBudgetList.warehouseName == '克东千红库' || this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库'|| this.deptBudgetList.warehouseName == '哈尔滨依兰库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -552,7 +552,7 @@
             //     this.dataList.tare = parseInt(result)
             // }
             if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '山东诸城迈饶库' || this
-                .deptBudgetList1.warehouseName == '克东千红库' || this.deptBudgetList1.warehouseName == '鲅鱼圈祥腾库')) {
+                .deptBudgetList1.warehouseName == '克东千红库' || this.deptBudgetList1.warehouseName == '鲅鱼圈祥腾库'|| this.deptBudgetList1.warehouseName == '哈尔滨依兰库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -458,7 +458,7 @@
             //     this.dataList.grossWeight = parseInt(result)
             // }
             if (this.deptBudgetList1.warehouseName && (this.deptBudgetList.warehouseName == '山东诸城迈饶库' || this
-                .deptBudgetList1.warehouseName == '克东千红库' || this.deptBudgetList1.warehouseName == '鲅鱼圈祥腾库')) {
+                .deptBudgetList1.warehouseName == '克东千红库' || this.deptBudgetList1.warehouseName == '鲅鱼圈祥腾库'|| this.deptBudgetList1.warehouseName == '哈尔滨依兰库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {

src/views/warehouse/warehouseManagementTare.vue

@@ -349,7 +349,7 @@
           warehouseInOutDetail: {},
           grossWeight: '',
           tare: '',
-          inOutDate:"",
+          inOutDate:'',
         },
         historyList: [],
 
@@ -387,7 +387,7 @@
         var year = date.getFullYear();
         var month = date.getMonth() + 1;
         var strDate = date.getDate()
-        this.deptBudgetList.inOutDate = year+"-"+month+"-"+strDate
+        this.deptBudgetList.inOutDate = year+'-'+month+'-'+strDate
       this.information = this.$route.query.information
       if (this.$route.query.allowEdit == 1) {
         this.allowEdit = false
@@ -460,7 +460,7 @@
             //   }
             // }
             if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '山东诸城迈饶库' || this
-                .deptBudgetList.warehouseName == '克东千红库' || this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库')) {
+                .deptBudgetList.warehouseName == '克东千红库' || this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库'|| this.deptBudgetList.warehouseName == '哈尔滨依兰库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {