更新 sdy

src/layout/index/top/index.vue

@@ -29,18 +29,18 @@
             v-if="btnStatus.status1||btnStatus.status2" @click="goToPage(1)">去初检
           </el-button>
           <el-button v-hasPermission="`acquisitionManagement.acquisitionQuality.con`"
-            v-if="btnStatus.status3||btnStatus.status4" @click="goToPage(2)">去确认质检
+            v-if="btnStatus.status3||btnStatus.status4" v-show="toPageData.qualityInspectionManagement.confirm != '1'"  @click="goToPage(2)">去确认质检
           </el-button>
           <el-button v-hasPermission="`acquisitionManagement.acquisitionQuality.again`"
-            v-if="btnStatus.status1||btnStatus.status2||btnStatus.status3||btnStatus.status4" @click="goToPage(3)">去复检
+            v-if="btnStatus.status1||btnStatus.status2||btnStatus.status3||btnStatus.status4" v-show="toPageData.qualityInspectionManagement.confirm != '1'" @click="goToPage(3)">去复检
           </el-button>
           <el-button v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`"
             v-if="btnStatus.status1||btnStatus.status2||btnStatus.status3" @click="goToPage(4)">去称毛重
           </el-button>
           <el-button v-hasPermission="`acquisitionManagement.acquisitionPay.add`" v-if="btnStatus.status5"
             @click="goToPage(5)">去结算</el-button>
-          <el-button v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`"
-            v-if="btnStatus.status2||btnStatus.status3||btnStatus.status4||btnStatus.status5" @click="goToPage(6)">去称皮重
+          <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'">去称皮重
           </el-button>
           <el-button @click="smAlert = false" class="btn">关闭</el-button>
         </el-dialog>
@@ -291,7 +291,8 @@
         account: localStorage.getItem('ws-pf_account'),
         // compName: '',
         companyId: localStorage.getItem('ws-pf_compId'),
-        cangid:''
+        cangid:'',
+        tmp:{},
       }
     },
     filters: {},
@@ -359,13 +360,14 @@
         let _qualityNo = this.barCode.split('&')[1]
         let _userHouseId = this.barCode.split('&')[2]
         this.cangid = this.barCode.split('&')[2]
-        let tmp = {
+        this.tmp = {
           compId: _userCompId,
           number: _qualityNo,
           warehouseId: _userHouseId
         }
          this.barCode = ''
         //判断当前账号公司是否是二维码上公司
+        
         if (this.userINfo.userCompany != _userCompId) {
           this.$message.error('当前身份不可操作');
           return
@@ -373,8 +375,9 @@
         //判断二维码上的仓库当前账号是否有权限操作
         this.getLook(this.cangid, this.userINfo.userName)
         
-        //扫码枪扫码后显示弹框
-        this.getQRCodeData(tmp)
+        //   //扫码枪扫码后显示弹框
+        // this.getQRCodeData(this.tmp)
+        
       },
       // 查看二维码仓库负责人
       async getLook(compId, userName) {
@@ -383,19 +386,21 @@
           })
           .toPromise()
           .then((response) => {
-            if (response.code == 200) {
-              if (response.personCharge != userName || response.otherPersonCharge.indexOf(userName) <= -1) {
+              if (response.personCharge != userName || response.otherPersonCharge.indexOf(userName) < -1) {
                 this.$message.error('当前身份不可操作');
                 return
+              }else{
+                   //扫码枪扫码后显示弹框
+                   this.getQRCodeData(this.tmp)
               }
-            }
+            
           })
       },
       // 二维码获取数据
       async getQRCodeData(tmp) {
         await getQRCodeData(tmp)
           .toPromise()
-          .then((response) => {
+          .then((response) => { 
             this.toPageData = response
             // 处理按钮显示状态
             // this.btnStatus 
@@ -407,13 +412,13 @@
             let _status3 = response.paymentManagement?response.paymentManagement.status:''
             if (_status2 == '已初检' && _status1 == '已质检') {
               this.btnStatus.status1 = true
-            } else if (_status2 == '已初检' && _status1 == '已称毛重') {
+            } else if (_status2 == '已初检' && (_status1 == '已称毛重' || _status1 == '已质检')) {
               this.btnStatus.status2 = true
-            } else if (_status2 == '已复检' && _status1 == '已称毛重') {
+            } else if (_status2 == '已复检' && (_status1 == '已称毛重' || _status1 == '已质检')) {
               this.btnStatus.status3 = true
-            } else if (_status2 == '已复检' && _status1 == '已称皮重') {
+            } else if (_status2 == '已复检' && this.toPageData.qualityInspectionManagement.confirm != '1' && (_status1 == '已称皮重' || _status1 == '已质检')) {
               this.btnStatus.status4 = true
-            } else if (_status2 == '已确认' && _status1 == '已称皮重' && _status3 == '待结算') {
+            } else if (_status2 == '已复检' && _status1 == '已称皮重' && _status3 == '待结算') {
               this.btnStatus.status5 = true
             } else if (_status3 == '已结算') {
               this.btnStatus.status6 = true
@@ -441,7 +446,7 @@
         if (type === 1) {
 // this.toPageData 
           this.$router.push({
-          	path: 'inspectInfo',
+          	name: 'inspectInfo',
           	query: {
           		type: 3,
           		cangid: this.cangid,
@@ -455,7 +460,7 @@
           })
         } else if (type === 2) {
                this.$router.push({
-          	path: 'inspectInfo',
+          	name: 'inspectInfo',
           	query: {
           		type: 5,
           		cangid: this.cangid,
@@ -469,7 +474,7 @@
           })
         } else if (type === 3) {
             this.$router.push({
-          	path: 'inspectInfo',
+          	name: 'inspectInfo',
           	query: {
           		type: 4,
           		cangid: this.cangid,
@@ -483,7 +488,7 @@
           })
         } else if (type === 4) {
              this.$router.push({
-            path: 'weightCheck',
+            name: 'weightCheck',
             query: {
               tpyeNo: 1,
               id: this.toPageData.id,
@@ -515,15 +520,15 @@
         } else if (type === 5) {
              localStorage.setItem('paymentManagementReturn', false)
           this.$router.push({
-            path: 'settlement',
+            name: 'settlement',
             query: {
               type: 1,
-              id: this.toPageData.paymentList.id,
+              id: this.toPageData.paymentManagement.id,
             },
           })
         } else if (type === 6) {
            this.$router.push({
-            path: 'weightCheck',
+            name: 'weightCheck',
             query: {
               tpyeNo: 2,
               id: this.toPageData.id,

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -822,13 +822,13 @@
           })
           return
         }
-        if (isNaN(this.deptBudgetList.sellerPhone)) {
-          this.$message({
-            message: '输入卖方电话有误！',
-            type: 'warning',
-          })
-          return
-        }
+        // if (isNaN(this.deptBudgetList.sellerPhone)) {
+        //   this.$message({
+        //     message: '输入卖方电话有误！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -773,13 +773,13 @@
           })
           return
         }
-        if (isNaN(this.deptBudgetList.buyerPhone)) {
-          this.$message({
-            message: '输入买方电话有误!',
-            type: 'warning',
-          })
-          return
-        }
+        // if (isNaN(this.deptBudgetList.buyerPhone)) {
+        //   this.$message({
+        //     message: '输入买方电话有误!',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.seller) {
           this.$message({
             message: '请输入卖方名称！',

src/views/contractManagement/purchaseContractAdd.vue

@@ -941,13 +941,13 @@
           })
           return
         }
-        if (isNaN(this.deptBudgetList.sellerPhone)) {
-          this.$message({
-            message: '输入卖方电话有误！',
-            type: 'warning',
-          })
-          return
-        }
+        // if (isNaN(this.deptBudgetList.sellerPhone)) {
+        //   this.$message({
+        //     message: '输入卖方电话有误！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
             message: '请选择验收方式',

src/views/contractManagement/salesContractAdd.vue

@@ -831,13 +831,13 @@
           })
           return
         }
-        if (isNaN(this.deptBudgetList.buyerPhone)) {
-          this.$message({
-            message: '输入买方电话有误!',
-            type: 'warning',
-          })
-          return
-        }
+        // if (isNaN(this.deptBudgetList.buyerPhone)) {
+        //   this.$message({
+        //     message: '输入买方电话有误!',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
             message: '请输入卖方电话！',

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -1,6 +1,7 @@
 <!--质检信息-->
 <template>
   <div class="center">
+    123
     <div class="number">{{ printData.qualityNo }}</div>
     <table class="table">
       <tr class="row">
@@ -78,6 +79,7 @@
         <div>{{ printData.qualityDate }}</div>
       </div>
       <div class="bottom-row2">
+        {{printData.codeUrl}}
         <div class="left">
           <img :src="printData.codeUrl" alt="" />
         </div>

src/views/houseSelfCollect/inspectionManagement.vue

@@ -332,7 +332,6 @@
 					.toPromise()
 					.then((response) => {
 						this.inspect = response.records
-						
 						this.deptBudgetTotal = response.total
 						// this.$forceUpdate();
 					})
@@ -343,17 +342,11 @@
 					})
 					.toPromise()
 					.then((response) => {
-						// let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid 
-						// 	getQRcode({printString}).toPromise()
-					    //       .then((res) => {
-								this.isShowPrint = true
 								this.printData = response
-								// this.printData.qrCodeUrl = res
-							//   })
+									this.isShowPrint = true
 						    if (response.compName == '黑龙江秋收有限公司') {
                			    	 this.printData.compName = '黑龙江中天昊元贸易有限公司'
               					}
-						// window.location.href="../../../static/inspection.html?dataList="+JSON.stringify(response)
 					})
 			},
 		},