前端

public/static/aduitprint.html

@@ -891,7 +891,7 @@
                   <td style="text-align:left;padding-left:10px;" v-if="item1.status=='error'" class="col">{{item1.auditMind?'驳回：'+item1.auditMind:'驳回'}}</td>
               </tr>
           </table>
-          <div  v-if="item.printType==1&&item.addressUrlArrayImage.length>0||item.printType==5&&item.addressUrlArrayImage.length>0||item.printType==6&&item.addressUrlArrayImage.length>0||item.printType==7&&item.addressUrlArrayImage.length>0||item.printType==9&&item.addressUrlArrayImage.length>0" class="sfcard" >
+          <div  v-if="item.printType==1&&item.addressUrlArrayImage.length>0||item.printType==5&&item.addressUrlArrayImage.length>0||item.printType==6&&item.addressUrlArrayImage.length>0||item.printType==7&&item.addressUrlArrayImage.length>0||item.printType==9&&item.addressUrlArrayImage.length>0||item.printType==10&&item.addressUrlArrayImage.length>0" class="sfcard" >
             <div v-for="item1 in item.addressUrlArrayImage" class="sfcard-content">
                 <div class="sfcard-title">
                     <!-- {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}} -->

src/views/universalityAudit/auditprint.vue

@@ -461,33 +461,33 @@ export default {
             }
             this.deptBudgetList[0].printType=9
           }
-          // else if(row.type=='长途加油'){
-          //   this.deptBudgetList=[await printfilling({id:row.id}).toPromise()]
-          //   this.deptBudgetList[0].printType=10
-          //   if(this.deptBudgetList[0].fillingDetailInfoList&&this.deptBudgetList[0].fillingDetailInfoList.length>0){
-          //     var arr1=[]
-          //     var data=this.deptBudgetList[0].fillingDetailInfoList
-          //     for (let i = 0; i < data.length; i++) {
-          //       if(data[i].addressUrl){
-          //         var arr2=data[i].addressUrl.split(',')
-          //         for (let q = 0; q < arr2.length; q++) {
-          //           if(arr2[q]){
-          //             arr1.push({'appendixPath':arr2[q]})
-          //           }
-          //         }
-          //       }
-          //     }
-          //     this.$set(this.deptBudgetList[0],'addressUrlArray',arr1)
-          //     this.deptBudgetList[0].addressUrlArrayImage=arr1
-          //     this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArrayImage.length
-          //   }else{
-          //     this.deptBudgetList[0].addressUrlArray=[]
-          //     this.deptBudgetList[0].addressUrlArrayImage=[]
-          //     this.deptBudgetList[0].addressUrlArrayFilelen=0
-          //   }
-          // } 
-          console.log( this.deptBudgetList[0],11111)
-          if(this.deptBudgetList[0].addressUrl&&row.type!='长途加油'){
+          else if(row.type=='长途加油'){
+            this.deptBudgetList=[await printfilling({id:row.id}).toPromise()]
+            this.deptBudgetList[0].printType=10
+            if(this.deptBudgetList[0].fillingDetailInfoList&&this.deptBudgetList[0].fillingDetailInfoList.length>0){
+              var arr3=[]
+              var data=this.deptBudgetList[0].fillingDetailInfoList
+              for (let i = 0; i < data.length; i++) {
+                if(data[i].addressUrl){
+                  var arr2=data[i].addressUrl.split(',')
+                  for (let q = 0; q < arr2.length; q++) {
+                    if(arr2[q]){
+                      arr3.push({'appendixPath':arr2[q]})
+                    }
+                  }
+                }
+              }
+              this.deptBudgetList[0].addressUrlArray = arr3
+              this.deptBudgetList[0].addressUrlArrayImage=arr3
+              this.deptBudgetList[0].addressUrlArrayFilelen=arr3.length-this.deptBudgetList[0].addressUrlArrayImage.length
+            }else{
+              this.deptBudgetList[0].addressUrlArray=[]
+              this.deptBudgetList[0].addressUrlArrayImage=[]
+              this.deptBudgetList[0].addressUrlArrayFilelen=0
+            }
+          } 
+          if(row.type!='长途加油'){
+            if(this.deptBudgetList[0].addressUrl){
             var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
             this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
             this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
@@ -497,6 +497,8 @@ export default {
             this.deptBudgetList[0].addressUrlArrayImage=[]
             this.deptBudgetList[0].addressUrlArrayFilelen=0
           }
+          }
+      
           this.deptBudgetList[0].currectstatus=row.status
           var workflow=await printworkflow({businessCode:row.businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
           if(row.type=='通用审核') {

src/views/warehousenew/dryWarehousing.vue

@@ -346,7 +346,7 @@ export default {
         this.selectWarehouse()
         this.getGoodsList()
         this.isShowBalance = true
-        var data= getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
+        getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
         this.compNameoptions=res
         localStorage.setItem('compNameoptions',JSON.stringify(this.compNameoptions))
         if(this.compNameoptions.length>0){
@@ -795,6 +795,7 @@ export default {
         },
         tabClick(val) {
             this.weighingList = {}
+            
             for (let i = 0; i < this.warehouseList.length; i++) {
                 if (this.warehouseList[i].warehouseName == this.warehouseName) {
                     this.warehouseId = this.warehouseList[i].id
@@ -809,6 +810,8 @@ export default {
                 this.tpyeNo = '1'
                 this.cartips = '手动输入'//用来点称皮重时显示皮重输入框
             } else {
+              this.weighingList.goodsName = this.goodsNameList[0].constValue
+            this.weighingList.goodsNameKey = this.goodsNameList[0].constKey
                 this.tpyeNo = '2'
                 this.information = '毛重'
             }