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

public/static/payprint1.html

@@ -322,7 +322,7 @@
                                 <td class="col col-bgc">不完善粒</td>
                                 <td class="col col-bgc">扣重比</td>
                                 <td v-if="printData1[index].type=='潮粮'" class="col col-bgc">扣量%</td>
-                                <td :colspan="printData1[index].type == '潮粮'?1:2" class="col col-bgc"></td>
+                                <td :colspan="printData1[index].type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
                             </tr>
                             <tr class="row">
                                 <td class="col">{{ printData1[index].pureWeight}}</td>
@@ -349,6 +349,7 @@
                                 <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData1[index].type=='潮粮'">{{ (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
                                 <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData1[index].type=='潮粮'"></td>
                                 <td :colspan="printData1[index].type == '潮粮'?1:2" class="col "></td>
+                                <td :colspan="printData.type == '潮粮'?1:2" class="col ">{{printData1[index].qualityInspectionManagement.binNumber}}</td>
                                 <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
                             </tr>
                             <tr class="row">
@@ -711,7 +712,7 @@
                         <td class="col col-bgc">不完善粒</td>
                         <td class="col col-bgc">扣重比</td>
                         <td v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
-                        <td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc"></td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
                         <!-- <td class="col col-bgc">1卸车扣款</td> -->
                     </tr>
                     <tr class="row">
@@ -738,7 +739,7 @@
                         <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
                         <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
                         <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'"></td>
-                        <td :colspan="printData.type == '潮粮'?1:2" class="col "></td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col ">{{printData.qualityInspectionManagement.binNumber}}</td>
                         <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
                     </tr>
                     <tr class="row">
@@ -922,7 +923,7 @@
                         <td class="col col-bgc">不完善粒</td>
                         <td class="col col-bgc">扣重比</td>
                         <td v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
-                        <td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc"></td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
                         <!-- <td class="col col-bgc">1卸车扣款</td> -->
                     </tr>
                     <tr class="row">
@@ -949,7 +950,7 @@
                         <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
                         <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
                         <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'"></td>
-                        <td :colspan="printData.type == '潮粮'?1:2" class="col "></td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col ">{{printData.qualityInspectionManagement.binNumber}}</td>
                         <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
                     </tr>
                     <tr class="row">

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1235,7 +1235,7 @@ export default {
           }
         });
       }else{
-        if(this.deptBudgetList.inOutType=="收购入库"){ //收购入库  价格取至合同
+        if(this.deptBudgetList.inOutType=='收购入库'){ //收购入库  价格取至合同
         return
       }else{
         getinspectLookUnitPrice({
@@ -3735,8 +3735,8 @@ export default {
             this.deptBudgetList.contractNo = this.taskNolist[i].contractNo
             this.deptBudgetList.inOutType == this.taskNolist[i].inOutType
             this.deptBudgetList.goodsName = this.taskNolist[i].goodsName
-            if(this.taskNolist[i].goodsName.indexOf("潮粮") != -1){  //收购从合同中带出货名  单价等信息  用货名是否带有潮粮字符来判断干潮类型
-              this.deptBudgetList.type = "潮粮"
+            if(this.taskNolist[i].goodsName.indexOf('潮粮') != -1){  //收购从合同中带出货名  单价等信息  用货名是否带有潮粮字符来判断干潮类型
+              this.deptBudgetList.type = '潮粮'
               this.deptBudgetList.grade = this.gradeList[1].constValue
 				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
               this.deptBudgetList.imperfectGrain=8
@@ -3744,7 +3744,7 @@ export default {
 							this.deptBudgetList.mildewGrain=2
 							this.deptBudgetList.jiaorenli=0
             }else{
-              this.deptBudgetList.type = "干粮"
+              this.deptBudgetList.type = '干粮'
               this.deptBudgetList.grade = this.gradeList[1].constValue
 				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
               this.deptBudgetList.imperfectGrain=8
@@ -3765,8 +3765,8 @@ export default {
       if (!data) return
       var response=await getcontract({contractNo:this.deptBudgetList.contractNo,compId:localStorage.getItem('ws-pf_compId')}).toPromise()
         this.outContractNo=response  
-        if(this.outContractNo.priceType == "定价收购"){
-            if( this.deptBudgetList.type == "潮粮"){
+        if(this.outContractNo.priceType == '定价收购'){
+            if( this.deptBudgetList.type == '潮粮'){
            this.deptBudgetList.tidalGrainPrice = Number(this.outContractNo.unitContractPrice/1000).toFixed(2)
            this.tidalGrainPrice = Number(this.outContractNo.unitContractPrice/1000).toFixed(2)
             }else{
@@ -3782,7 +3782,7 @@ export default {
               this.deptBudgetList.goodsName = this.outContractNo.goodsName
             this.deptBudgetList.goodsNameKey = this.outContractNo.goodsNameKey
             }else{
-              if(this.deptBudgetList.inOutType!="收购入库"){
+              if(this.deptBudgetList.inOutType!='收购入库'){
                  this.deptBudgetList.goodsName=''
                   this.deptBudgetList.goodsNameKey=''
                   this.$message({
@@ -4081,14 +4081,16 @@ export default {
           //   }
           // }
         })
-      getinspectLookGoods({
-        warehouseId: this.cangid
-      })
+        if(this.serviceManagementType == 3){
+          getinspectLookGoods({
+             warehouseId: this.cangid
+          })
         .toPromise()
         .then((response) => {
           this.goodnameList = response
           this.purchasePriceList = response
         })
+      }
       getshippinginfo({
         compId: localStorage.getItem('ws-pf_compId'),
         warehouseName: this.warehouseName