前端

public/static/aduitprint.html

@@ -132,6 +132,7 @@
             <span v-if="item.inOutTypeKey==3">移库</span>
             <span v-if="item.inOutTypeKey==4">退库并出库</span>
           </div>
+          <div v-if="item.printType==10" class="number">长途加油</div>
           <img v-if="item.currectstatus=='已通过'" class="seal" width="144" height="144" src="../img/ytg.png" alt="">
           <img v-if="item.currectstatus=='审核中'" class="seal" width="144" height="144" src="../img/shz.png" alt="">
           <img v-if="item.currectstatus=='已驳回'" class="seal" width="144" height="144" src="../img/wtg.png" alt="">
@@ -826,6 +827,70 @@
               </tr>
             </tbody>
           </table>
+          <table v-if="item.printType==10" class="table">
+            <thead>
+                <tr class="row">
+                    <th colspan="3" class="col">基本信息</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr class="row">
+                    <td class="col col-bgc">车牌号</td>
+                    <td colspan="2" class="col">{{item.carNo}}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">起点</td>
+                    <td colspan="2" class="col">{{ item.originProvince }}{{ item.originCity }}{{ item.originArea }}{{ item.originAddress }}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">终点</td>
+                    <td colspan="2" class="col">{{ item.destinationProvince }}{{ item.destinationCity }}{{ item.destinationArea }}{{ item.destinationAddress }}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">总油耗(升)</td>
+                    <td  colspan="2" class="col">{{ item.tfc }}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">总金额(元)</td>
+                    <td colspan="2" class="col">{{ item.totalCost }}</td>
+                </tr>
+                <tr class="row" v-for="(item1,index1) in item.fillingDetailInfoList">
+                  <td class="col col-bgc">加油-{{index1+1}}</td>
+                  <td colspan="2" class="col">油耗{{ item.oilConsumption }}升&nbsp;&nbsp;油耗{{ item.currentOilPrice }}元/升&nbsp;&nbsp;油耗{{ item.currentConsumption }}元</td>
+              </tr>
+                <tr class="row">
+                    <td class="col col-bgc">备注</td>
+                    <td style="width:65%;" colspan="2" class="col">{{ item.remark }}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">附件</td>
+                    <!-- <td colspan="2" class="col">{{ item.addressUrlArrayImage.length }}张图片（
+                      <template v-if="item.expensesType==2">
+                        <template v-for="(item1,index) in item.aduitInfo">
+                          {{item1.fileUrls?item1.fileUrls.length:0}} <span v-if="index!=item.aduitInfo.length-1">+</span>
+                        </template>
+                      </template>
+                        ），{{item.addressUrlArrayFilelen}}个文档</td> -->
+                        <td colspan="2" class="col">{{ item.addressUrlArrayImage.length }}张图片（
+                          <template v-for="(item1,index) in item.aduitInfo">
+                            {{index==0?item.addressUrlArray.length:item1.fileUrls&&index!=0?item1.fileUrls.length:0}} <span v-if="index!=item.aduitInfo.length-1">+</span>
+                          </template>
+                          ），{{item.addressUrlArrayFilelen}}个文档</td>
+                </tr>
+            </tbody>
+            <thead>
+                <tr class="row">
+                    <th colspan="3" class="col">审核流</th>
+                </tr>
+            </thead>
+              <tr v-for="(item1,index) in item.aduitInfo" class="row">
+                  <td class="col col-bgc">{{item1.operatorName}}</td>
+                  <td style="width:30%;" class="col">{{ item1.updateDate }}</td>
+                  <td style="text-align:left;padding-left:10px;" v-if="item1.status=='question'" class="col">待审核</td>
+                  <td style="text-align:left;padding-left:10px;" v-if="item1.status=='success'" class="col">{{index!=0?item1.auditMind?'通过：'+item1.auditMind:'通过':item1.desc}}</td>
+                  <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-for="item1 in item.addressUrlArrayImage" class="sfcard-content">
                 <div class="sfcard-title">

src/api/V2/universalityAudit/index.js

@@ -27,4 +27,6 @@ export const API_PRINT_GETFILE ='/appendix/query/getFileList'
 // 审核流打印入库单获取
 export const API_PRINT_DATA ='/warehousingOrder/exportPhoneDataHis'
 // 审核流打印出入库任务
-export const API_GET_PRINT_DATA ='/inOutWarehouseTask/getTask'
+export const API_GET_PRINT_DATA ='/inOutWarehouseTask/getTask'
+// 审核流打印加油
+export const API_GET_PRINT_FILLING_DATA ='/fuelFillingInfo/getFilling'

src/model/universalityAudit/index.js

@@ -16,7 +16,8 @@ import {
     API_PRINT_GETHIS,
     API_PRINT_GETFILE,
     API_PRINT_DATA,
-    API_GET_PRINT_DATA
+    API_GET_PRINT_DATA,
+    API_GET_PRINT_FILLING_DATA
 } from '@/api/V2/universalityAudit'
 // 查看
 export const getaduitinfo = appRx.get(API_GET_AUDITINFO, errorCatcher, errorHandle, filter)
@@ -47,4 +48,6 @@ export const printgetfile = appRx.get(API_PRINT_GETFILE, errorCatcher, errorHand
 // 审核流打印入库单
 export const printgetdata = appRx.post(API_PRINT_DATA, errorCatcher, errorHandle, filter)
 // 审核流打印出入库任务
-export const printgetout = appRx.get(API_GET_PRINT_DATA, errorCatcher, errorHandle, filter)
+export const printgetout = appRx.get(API_GET_PRINT_DATA, errorCatcher, errorHandle, filter)
+// 审核流打印出入库任务
+export const printfilling = appRx.get(API_GET_PRINT_FILLING_DATA, errorCatcher, errorHandle, filter)

src/views/universalityAudit/auditprint.vue

@@ -81,7 +81,8 @@ import {
   printgethis,
   printgetfile,
   printgetdata,
-  printgetout
+  printgetout,
+  printfilling
 } from '@/model/universalityAudit/index'
 import {lookexenseinfo, getAuditRecord,} from '@/model/profitable/index'
 import { seeCat } from '@/model/transport/index'
@@ -422,7 +423,7 @@ export default {
                 this.deptBudgetList[0].printType=2 
                 this.deptBudgetList[0].aduitInfo=await getAuditRecord({id:row.id}).toPromise()
             }
-        }else if(row.type=='入库单请款'||row.type=='运价审核'||row.type=='通用审核'||row.type=='合同审核'||row.type=='仓库设置'||row.type=='出入库任务'){
+        }else if(row.type=='入库单请款'||row.type=='运价审核'||row.type=='通用审核'||row.type=='合同审核'||row.type=='仓库设置'||row.type=='出入库任务'||row.type=='长途加油'){
           if(row.type=='入库单请款'){
             this.deptBudgetList=[await printgetdata({batchId:row.id}).toPromise()]
             this.deptBudgetList[0].printType=3
@@ -460,7 +461,33 @@ export default {
             }
             this.deptBudgetList[0].printType=9
           }
-          if(this.deptBudgetList[0].addressUrl){
+          // 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!='长途加油'){
             var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
             this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
             this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
@@ -520,9 +547,6 @@ export default {
     imagefilter(arr){
         var arr1=[]
         for (let i = 0; i < arr.length; i++) {
-          // var value=await this.getImageSize(arr[i].appendixPath)
-          // arr[i].width=value.width
-          // arr[i].height=value.height
             if(arr[i].appendixName.indexOf('jpg')!=-1||arr[i].appendixName.indexOf('jpeg')!=-1||arr[i].appendixName.indexOf('png')!=-1){
                     arr1.push(arr[i])
             }

src/views/warehousenew/dryWarehousing.vue

@@ -208,6 +208,9 @@
 import {
     selectWarehouseSelf,
 } from '@/model/outboundManagement/index'
+import {
+    getcomp
+  } from '@/model/indexRx'
 import {
     pullDown,
     carXiala,
@@ -335,16 +338,18 @@ export default {
         dialogDataList:[],
         printData:{
             warehouseName:''
-        }
-        }
+        },compNameoptions:[]
+        } 
     },
     mounted() { },
     activated() {
         this.selectWarehouse()
         this.getGoodsList()
         this.isShowBalance = true
-        console.log(localStorage.getItem('compNameoptions'))
-        if(localStorage.getItem('compNameoptions')){
+        var data= 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){
         var company=JSON.parse(localStorage.getItem('compNameoptions'))
         
         var extra=company.filter((item)=>{
@@ -358,7 +363,6 @@ export default {
           &&item!='黑龙江益储益运粮食贸易有限公司'
           &&item!='黑龙江启兴粮食贸易有限公司'
         })
-        console.log(extra,1111111111111111)
         if(extra.length>0){
           this.companyNameOptions=[
           {
@@ -477,6 +481,8 @@ export default {
           }
         }
       }
+      })
+        
         this.openPort()
         
     },

src/views/warehousenew/warehousingOrder.vue

@@ -994,7 +994,6 @@ export default {
         if (this.options[i].binNumber == e) {
           this.fieldrationsList.beforePositionId = this.options[i].id
         }
-
       }
     },
     warehouseweightfocus(){
@@ -1502,7 +1501,6 @@ export default {
     },
     cancel(item) {
       item.payshow = true
-
       for (let i = 0; i < this.multipleSelection1[item.id].length; i++) {
         if (item.warehouseName == this.multipleSelection1[item.id][i].warehouseName) {
           this.multipleSelection1[item.id][i].select = false
@@ -1725,6 +1723,14 @@ export default {
             // this.fieldrationsList.beforeBinNo = ''
             // this.fieldrationsList.afterBinNo = ''
             this.fieldrationsshow = false
+            selectWarehouseSelf({
+              compId: localStorage.getItem('ws-pf_compId'),
+            })
+              .toPromise()
+              .then((response) => {
+                this.warehouseList = response
+                this.warehouseNameChange(this.warehouseName)
+              })
             this.getList()
           }).catch((response) => {
             if (response.code == null) {