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

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>
@@ -409,7 +410,7 @@
         //  this.barCode = ''
         //判断当前账号公司是否是二维码上公司
         if (this.userINfo.userCompany != _userCompId) {
-          console.log("请切换公司在试！")
+          console.log('请切换公司在试！')
           this.$message.error('当前身份不可操作');
            this.barCode = ''
           return
@@ -556,7 +557,7 @@
                   //扫码枪扫码后显示弹框
                    this.getQRCodeData(this.tmp)
               }else{
-                console.log("你没有该权限，不可操作")
+                console.log('你没有该权限，不可操作')
                  this.$message.error('当前身份不可操作');
                  this.barCode = ''
                  return
@@ -580,15 +581,20 @@
             let _status3 = response.paymentManagement?response.paymentManagement.status:''
             if (_status2 == '已初检' && _status1 == '已质检') {
               this.btnStatus.status1 = true
-            } else if (_status2 == '已初检' && (_status1 == '已称毛重' || _status1 == '已质检')) {
+            } 
+            if ((_status1 == '已称毛重' || _status1 == '已质检')) {
               this.btnStatus.status2 = true
-            } else if (_status2 == '已复检' && (_status1 == '已称毛重' || _status1 == '已质检')) {
+            } 
+            if (this.toPageData.qualityInspectionManagement.confirm != '1' && (_status1 == '已称毛重' || _status1 == '已质检')) {
               this.btnStatus.status3 = true
-            } else if (_status2 == '已复检' && this.toPageData.qualityInspectionManagement.confirm != '1' && (_status1 == '已称皮重' || _status1 == '已质检')) {
+            } 
+            if (  (_status1 == '已称毛重' || _status1 == '已质检')) {
               this.btnStatus.status4 = true
-            } else if (_status2 == '已复检' && _status1 == '已称皮重' && _status3 == '待结算') {
+            } 
+            if ( this.toPageData.qualityInspectionManagement.confirm != '0' &&  (_status1 == '已称毛重' || _status1 == '已称皮重') && _status3 == '') {
               this.btnStatus.status5 = true
-            } else if (_status3 == '已结算') {
+            } 
+            if ( this.toPageData.qualityInspectionManagement.confirm != '0' &&   _status1 == '已称皮重' && _status3 == '待结算')  {
               this.btnStatus.status6 = true
             }
             if (_status3 == '已结算') {
@@ -610,7 +616,7 @@
         this.isOpenCodeGun = true
       },
       blur(e) {
-         e.target.setAttribute("readonly", 'true');
+         e.target.setAttribute('readonly', 'true');
 
         console.log('当前已失去焦点状态')
         this.isOpenCodeGun = false
@@ -662,10 +668,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

@@ -98,7 +98,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="status" label="状态"></el-table-column>
-      <el-table-column width="270" prop="contractNo1" label="操作">
+      <el-table-column width="340" prop="contractNo1" label="操作">
         <template slot-scope="scope">
           <el-button @click="weightCheck(scope.row, 1)" v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' "
             v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`">毛重</el-button>
@@ -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: {

src/views/warehouse/warehouseManagementDelete.vue

@@ -76,8 +76,7 @@
         </el-table-column>
         <el-table-column prop="warehouseLocation" label="仓库所在地">
           <template scope="scope">
-            {{ scope.row.warehousePrivate }}{{ scope.row.warehouseCity
-            }}{{ scope.row.warehouseArea }}
+            {{ scope.row.warehousePrivate }}{{ scope.row.warehouseCity}}{{ scope.row.warehouseArea }}
           </template>
         </el-table-column>
         <el-table-column prop="residual" label="应余库存（吨）">
@@ -88,18 +87,10 @@
             <ws-button
               type="primary"
               @click="handleHide(scope.row)"
-              v-if="scope.row.showFlag == 0"
-              >显示</ws-button
-            >
-            <ws-button
-              type="primary"
-              @click="handleHide(scope.row)"
-              v-if="scope.row.showFlag == 1"
-              >隐藏</ws-button
-            >
+              v-if="scope.row.showFlag == 0">显示</ws-button>
+            <ws-button type="primary" @click="handleHide(scope.row)" v-if="scope.row.showFlag == 1">隐藏</ws-button>
             <ws-button type="primary" @click="handleDelete(scope.row)"
-              >删除</ws-button
-            >
+              >删除</ws-button>
           </template>
         </el-table-column>
       </el-table>

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -73,7 +73,7 @@
             <el-table-column prop="backOffice" label="操作人"> </el-table-column>
             <el-table-column prop="updateDate" label="保存时间">
             </el-table-column>
-            <el-table-column prop="address" label="操作" width="200">
+            <el-table-column prop="address" label="操作" width="400">
               <template slot-scope="scope">
                 <ws-button v-if="scope.row.inOutFlag =='2' " v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.in`
@@ -300,7 +300,9 @@
 
        },
       datechange() {
-        this.getList()
+        this.getList( this.$route.query.baseId,
+              this.$route.query.positionId,
+              this.$route.query.warehouseType)
       },
       //返回按钮
       returnWarehouse() {
@@ -480,12 +482,16 @@
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val
-        this.getList()
+        this.getList( this.$route.query.baseId,
+              this.$route.query.positionId,
+              this.$route.query.warehouseType)
       },
       handleCurrentChange(val) {
         this.currentPage = val
         console.log(`当前页: ${val}`)
-        this.getList()
+        this.getList( this.$route.query.baseId,
+              this.$route.query.positionId,
+              this.$route.query.warehouseType)
       },
       //收
       getList(id, id1, id2) {
@@ -523,6 +529,7 @@
             })
             .toPromise()
             .then((response) => {
+              this.deptBudgetTotal = response.total
               this.improved = response
             })
         }
@@ -569,7 +576,9 @@
       this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
       this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
       this.currentPage = 1
-      this.getList()
+      this.getList( this.$route.query.baseId,
+              this.$route.query.positionId,
+              this.$route.query.warehouseType)
     },
     // deletecontract(){},
     //删除