扫码

src/layout/index/top/index.vue

@@ -29,22 +29,23 @@
         <el-dialog title="扫描二维码" :visible.sync="smAlert"  :before-close="cancel">
           <div class="btn-list">
             <el-button v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`"
-                v-if="btnStatus.status1||btnStatus.status2" @click="goToPage(1)" class="btn_css">去初检
+                v-if="btnStatus.status1" @click="goToPage(1)" class="btn_css">去初检
               </el-button>
               <el-button v-hasPermission="`acquisitionManagement.acquisitionQuality.con`"
-                v-if="btnStatus.status3||btnStatus.status4" v-show="toPageData.qualityInspectionManagement.confirm != '1'"  @click="goToPage(2)" class="btn_css">去确认质检
+                v-if="btnStatus.status2" v-show="toPageData.qualityInspectionManagement.confirm != '1'"  @click="goToPage(2)" class="btn_css">去确认质检
               </el-button>
               <el-button v-hasPermission="`acquisitionManagement.acquisitionQuality.again`"
-                v-if="btnStatus.status1||btnStatus.status2||btnStatus.status3||btnStatus.status4" v-show="toPageData.qualityInspectionManagement.confirm != '1'" @click="goToPage(3)" class="btn_css">去复检
+                v-if="btnStatus.status3" 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.status4" @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)" class="btn_css">去称皮重
+                v-if="btnStatus.status5" @click="goToPage(6)" class="btn_css">去称皮重
               </el-button>
+              <el-button v-hasPermission="`acquisitionManagement.acquisitionPay.add`" v-if="btnStatus.status6"
+                @click="goToPage(5)" class="btn_css">去结算</el-button>
               <el-button @click="cancel" class="btn" >关闭</el-button>
           </div>
         </el-dialog>
@@ -580,15 +581,15 @@
             let _status3 = response.paymentManagement?response.paymentManagement.status:''
             if (_status2 == '已初检' && _status1 == '已质检') {
               this.btnStatus.status1 = true
-            } else if (_status2 == '已初检' && (_status1 == '已称毛重' || _status1 == '已质检')) {
+            } else if ((_status1 == '已称毛重' || _status1 == '已质检')) {
               this.btnStatus.status2 = true
-            } else if ( (_status1 == '已称毛重' || _status1 == '已质检')) {
+            } else if (this.toPageData.qualityInspectionManagement.confirm != '1' && (_status1 == '已称毛重' || _status1 == '已质检')) {
               this.btnStatus.status3 = true
-            } else if ( this.toPageData.qualityInspectionManagement.confirm != '0' && (_status1 == '已称皮重' || _status1 == '已质检')) {
+            } else if (  (_status1 == '已称毛重' || _status1 == '已质检')) {
               this.btnStatus.status4 = true
-            } else if ( this.toPageData.qualityInspectionManagement.confirm != '0' && _status1 == '已称皮重' && _status3 == '待结算') {
+            } else if ( this.toPageData.qualityInspectionManagement.confirm != '0' &&  (_status1 == '已称毛重' || _status1 == '已称皮重') && _status3 == '') {
               this.btnStatus.status5 = true
-            } else if (_status3 == '已结算') {
+            } else if ( this.toPageData.qualityInspectionManagement.confirm != '0' &&   _status1 == '已称皮重' && _status3 == '待结算')  {
               this.btnStatus.status6 = true
             }
             if (_status3 == '已结算') {