Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/layout/index/top/index.vue

@@ -38,12 +38,12 @@
                 v-if="btnStatus.status1||btnStatus.status2||btnStatus.status3||btnStatus.status4" v-show="toPageData.qualityInspectionManagement.confirm != '1'" @click="goToPage(3)" class="btn_css">去复检
               </el-button>
               <el-button v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`"
-                v-if="btnStatus.status1||btnStatus.status2||btnStatus.status3" @click="goToPage(4)" class="btn_css">去称毛重
+                v-if="btnStatus.status1||btnStatus.status2||btnStatus.status3" @click="goToPage(4)" class="btn_css" >去称毛重
               </el-button>
               <el-button v-hasPermission="`acquisitionManagement.acquisitionPay.add`" v-if="btnStatus.status5"
                 @click="goToPage(5)" class="btn_css">去结算</el-button>
               <el-button v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`" 
-                v-if="btnStatus.status2||btnStatus.status3||btnStatus.status4||btnStatus.status5" @click="goToPage(6)" v-show="toPageData.qualityInspectionManagement.confirm != '1'" class="btn_css">去称皮重
+                v-if="btnStatus.status2||btnStatus.status3||btnStatus.status4||btnStatus.status5" @click="goToPage(6)" class="btn_css">去称皮重
               </el-button>
               <el-button @click="cancel" class="btn" >关闭</el-button>
           </div>
@@ -662,6 +662,10 @@
           	},
           })
         } else if (type === 4) {
+          if(this.toPageData.warehouseName == "白城内陆港" && this.toPageData.qualityInspectionManagement.confirm == 0){
+            this.$message.error("该仓库需要确认质检后才能称毛重")
+            return
+          }
              this.$router.push({
             name: 'weightCheck',
             query: {