更新

src/layout/index/top/index.vue

@@ -409,7 +409,7 @@
         //  this.barCode = ''
         //判断当前账号公司是否是二维码上公司
         if (this.userINfo.userCompany != _userCompId) {
-          console.log("请切换公司在试！")
+          console.log('请切换公司在试！')
           this.$message.error('当前身份不可操作');
            this.barCode = ''
           return
@@ -556,7 +556,7 @@
                   //扫码枪扫码后显示弹框
                    this.getQRCodeData(this.tmp)
               }else{
-                console.log("你没有该权限，不可操作")
+                console.log('你没有该权限，不可操作')
                  this.$message.error('当前身份不可操作');
                  this.barCode = ''
                  return
@@ -582,11 +582,11 @@
               this.btnStatus.status1 = true
             } else if (_status2 == '已初检' && (_status1 == '已称毛重' || _status1 == '已质检')) {
               this.btnStatus.status2 = true
-            } else if (_status2 == '已复检' && (_status1 == '已称毛重' || _status1 == '已质检')) {
+            } else if ( (_status1 == '已称毛重' || _status1 == '已质检')) {
               this.btnStatus.status3 = true
-            } else if (_status2 == '已复检' && this.toPageData.qualityInspectionManagement.confirm != '1' && (_status1 == '已称皮重' || _status1 == '已质检')) {
+            } else if ( this.toPageData.qualityInspectionManagement.confirm != '0' && (_status1 == '已称皮重' || _status1 == '已质检')) {
               this.btnStatus.status4 = true
-            } else if (_status2 == '已复检' && _status1 == '已称皮重' && _status3 == '待结算') {
+            } else if ( this.toPageData.qualityInspectionManagement.confirm != '0' && _status1 == '已称皮重' && _status3 == '待结算') {
               this.btnStatus.status5 = true
             } else if (_status3 == '已结算') {
               this.btnStatus.status6 = true
@@ -610,7 +610,7 @@
         this.isOpenCodeGun = true
       },
       blur(e) {
-         e.target.setAttribute("readonly", 'true');
+         e.target.setAttribute('readonly', 'true');
 
         console.log('当前已失去焦点状态')
         this.isOpenCodeGun = false
@@ -662,10 +662,6 @@
           	},
           })
         } else if (type === 4) {
-          if(this.toPageData.warehouseName == "白城内陆港" && this.toPageData.qualityInspectionManagement.confirm == 0){
-            this.$message.error("该仓库需要确认质检后才能称毛重")
-            return
-          }
              this.$router.push({
             name: 'weightCheck',
             query: {

src/views/houseSelfCollect/weighingManagement.vue

@@ -439,8 +439,11 @@
         // 质检是否是已确定状态
         let _isGoweightCheck = this.isConfirmQuality(row)
         // let _isGoweightCheck = true
+        if(num == 1){
+          _isGoweightCheck = true
+        }
         console.log(row.qualityInspectionManagement)
-        if (_isGoweightCheck) {
+        if (_isGoweightCheck ) {
           this.$router.push({
             path: 'weightCheck',
             query: {