前端

public/static/aduitprint.html

@@ -111,6 +111,12 @@
           <div v-if="item.printType==6" class="number">合同审核</div>
           <div v-if="item.printType==7" class="number">运费结算</div>
           <div v-if="item.printType==8" class="number">仓库设置</div>
+          <div v-if="item.printType==9" class="number">出入库任务-
+            <span v-if="item.inOutTypeKey==1">出库</span>
+            <span v-if="item.inOutTypeKey==2">入库</span>
+            <span v-if="item.inOutTypeKey==3">移库</span>
+            <span v-if="item.inOutTypeKey==4">退库并出库</span>
+          </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="">
@@ -347,7 +353,12 @@
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">附件</td>
-                  <td colspan="2" class="col">{{ item.addressUrlArray.length }}张图片，{{item.addressUrlArrayFilelen}}个文档</td>
+                  <!-- <td colspan="2" class="col">{{ item.addressUrlArray.length }}张图片，{{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>
@@ -593,7 +604,11 @@
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">附件</td>
-                  <td colspan="2" class="col">{{ item.addressUrlArray.length }}张图片，{{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>
@@ -665,7 +680,131 @@
                   <td :colspan="item.bulkDensityStandard ==1?1:2" style="text-align:left;padding-left:10px;" v-if="item1.status=='error'" class="col">{{item1.auditMind?'驳回：'+item1.auditMind:'驳回'}}</td>
               </tr>
             </tbody>
-          <div  v-if="item.printType==1||item.printType==5||item.printType==6||item.printType==7" class="sfcard" >
+          </table>
+          <table v-if="item.printType==9" class="table">
+            <thead>
+              <tr class="row">
+                  <th colspan="3" class="col">基本信息</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                  <td class="col col-bgc">编号</td>
+                  <td colspan="2" class="col">入库（{{item.EnterList.inOutTaskNo}})</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                  <td class="col col-bgc">仓库</td>
+                  <td colspan="2" class="col">{{ item.EnterList.warehouseName }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">入库类型</td>
+                <td colspan="2" class="col">{{ item.EnterList.inOutType }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">预计入库日期</td>
+                <td colspan="2" class="col">{{ item.EnterList.predictDate }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">收货人</td>
+                <td colspan="2" class="col">{{ item.EnterList.agent }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==1||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">编号</td>
+                <td colspan="2" class="col">出库（{{item.OutList.inOutTaskNo}})</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==1||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                  <td class="col col-bgc">仓库</td>
+                  <td colspan="2" class="col">{{ item.OutList.warehouseName }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">出库类型</td>
+                <td colspan="2" class="col">{{ item.OutList.inOutType }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">预计出库日期</td>
+                <td colspan="2" class="col">{{ item.OutList.predictDate }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">发货人</td>
+                <td colspan="2" class="col">{{ item.OutList.agent }}</td>
+              </tr>
+              <tr class='row' v-if="item.EnterList.inOutType == '移库入库'">
+                <td class="col col-bgc">移库任务编号</td>
+                <td colspan="2" class="col">{{item.EnterList.moveTaskNo}}</td>
+              </tr>
+              <tr class='row' v-if="item.EnterList.inOutType != '移库入库'">
+                <td class="col col-bgc">合同编号</td>
+                <td colspan="2" class="col">{{item.EnterList.contractNo}}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">货名</td>
+                <td colspan="2" class="col">{{ item.EnterList.goodsName }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==1" class="row">
+                <td class="col col-bgc">货名</td>
+                <td colspan="2" class="col">{{ item.OutList.goodsName }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">重量(吨)</td>
+                <td colspan="2" class="col">{{ item.EnterList.weight }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==1" class="row">
+                <td class="col col-bgc">重量(吨)</td>
+                <td colspan="2" class="col">{{ item.OutList.weight }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==2||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">品级</td>
+                <td colspan="2" class="col">{{ item.EnterList.grade }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==1" class="row">
+                <td class="col col-bgc">品级</td>
+                <td colspan="2" class="col">{{ item.OutList.grade }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==1||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">容重(克/升)>=</td>
+                <td colspan="2" class="col">{{ item.OutList.bulkDensity }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==1||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">水分(%)&lt;=</td>
+                <td colspan="2" class="col">{{ item.OutList.waterContent }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==1||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">单价(元/吨)</td>
+                <td colspan="2" class="col">{{ item.OutList.unitPrice }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==1||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">业务描述</td>
+                <td colspan="2" class="col">{{ item.OutList.businessDescribe }}</td>
+              </tr>
+              <tr v-if="item.inOutTypeKey==1||item.inOutTypeKey==3||item.inOutTypeKey==4" class="row">
+                <td class="col col-bgc">仓位号</td>
+                <td colspan="2" class="col">{{ item.OutList.binNumber }}</td>
+              </tr>
+              <tr  class="row">
+                <td class="col col-bgc">附件</td>
+                <td colspan="2" class="col">{{ item.addressUrlArrayImage.length }}张图片（
+                  <template v-for="(item1,index) in item.aduitInfo">
+                    {{item1.fileUrls?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>
+            <tbody>
+              <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>
+            </tbody>
+          </table>
+          <div  v-if="item.printType==1||item.printType==5||item.printType==6||item.printType==7||item.printType==9" class="sfcard" >
             <div v-for="item1 in item.addressUrlArrayImage" class="sfcard-content">
                 <div class="sfcard-title">
                     <!-- {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}} -->

public/static/printdry.html

@@ -27,8 +27,8 @@
             width: 1000px;
             padding: 30px 20px 20px 20px;
             font-size: 18px;
-            /* height: 630px; */
-            height: 570px;
+            height: 630px;
+            /* height: 570px; */
             position: relative;
             margin: auto;
         }

src/api/V2/universalityAudit/index.js

@@ -25,4 +25,6 @@ export const API_PRINT_GETHIS ='/commonUser/getHis'
 // 审核流打印取附件
 export const API_PRINT_GETFILE ='/appendix/query/getFileList'
 // 审核流打印入库单获取
-export const API_PRINT_DATA ='/warehousingOrder/exportPhoneDataHis'
+export const API_PRINT_DATA ='/warehousingOrder/exportPhoneDataHis'
+// 审核流打印出入库任务
+export const API_GET_PRINT_DATA ='/inOutWarehouseTask/getTask'

src/model/universalityAudit/index.js

@@ -15,7 +15,8 @@ import {
     API_PRINT_WORKFLOW,
     API_PRINT_GETHIS,
     API_PRINT_GETFILE,
-    API_PRINT_DATA
+    API_PRINT_DATA,
+    API_GET_PRINT_DATA
 } from '@/api/V2/universalityAudit'
 // 查看
 export const getaduitinfo = appRx.get(API_GET_AUDITINFO, errorCatcher, errorHandle, filter)
@@ -44,4 +45,6 @@ export const printgethis = appRx.get(API_PRINT_GETHIS, errorCatcher, errorHandle
 // 审核流打印取流程
 export const printgetfile = appRx.get(API_PRINT_GETFILE, errorCatcher, errorHandle, filter)
 // 审核流打印入库单
-export const printgetdata = appRx.post(API_PRINT_DATA, errorCatcher, errorHandle, filter)
+export const printgetdata = appRx.post(API_PRINT_DATA, errorCatcher, errorHandle, filter)
+// 审核流打印出入库任务
+export const printgetout = appRx.get(API_GET_PRINT_DATA, errorCatcher, errorHandle, filter)

src/views/universalityAudit/auditprint.vue

@@ -74,7 +74,8 @@ import {
   printworkflow,
   printgethis,
   printgetfile,
-  printgetdata
+  printgetdata,
+  printgetout
 } from '@/model/universalityAudit/index'
 import {lookexenseinfo, getAuditRecord,} from '@/model/profitable/index'
 import { seeCat } from '@/model/transport/index'
@@ -84,6 +85,9 @@ import {
   import {
     purchasePriceLook,
   } from '@/model/houseSelfCollect/index'
+  import {
+  outexamine,
+} from '@/model/tasksport/index'
 import WsUpload from '@/components/WsUpload'
 import {
   woekflowhandle
@@ -195,7 +199,10 @@ export default {
                         arr.updateDate=arr.workflowHistoricTasks[len].claimTime
                         if (arr.workflowHistoricTasks[len].auditMind && arr.workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
                             arr.auditMind = arr.workflowHistoricTasks[len].auditMind.split("##")[0]
-                            arr.fileUrl = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+                            arr.fileUrls = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+                            for (let q = 0; q < arr.fileUrls.length; q++) {
+                              this.deptBudgetList[0].addressUrlArrayImage.push({appendixPath:arr.fileUrls[q]})
+                            }
                         }else{
                             arr.auditMind = arr.workflowHistoricTasks[len].auditMind
                         }
@@ -218,7 +225,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=='仓库设置'){
+        }else if(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
@@ -234,6 +241,27 @@ export default {
           }else if(row.type=='仓库设置'){
             this.deptBudgetList=[await purchasePriceLook({id:row.id}).toPromise()]
             this.deptBudgetList[0].printType=8
+          }else if(row.type=='出入库任务'){
+            var relevance=await printgetout({id:row.id}).toPromise()
+            this.deptBudgetList=[{data:await outexamine({relevanceId:relevance.relevanceId}).toPromise()}]
+            for (let i = 0; i < this.deptBudgetList[0].data.length; i++) {
+                this.deptBudgetList[0].inOutTypeKey=this.deptBudgetList[0].data[i].inOutTypeKey
+							if (this.deptBudgetList[0].data[i].inOutType == "移库出库" || 
+              this.deptBudgetList[0].data[i].inOutType == "贸易服务出库" || 
+              this.deptBudgetList[0].data[i].inOutType == "销售出库" ||
+              this.deptBudgetList[0].data[i].inOutType == "暂存出库") {
+                this.deptBudgetList[0].OutList = this.deptBudgetList[0].data[i]
+							} else if (this.deptBudgetList[0].data[i].inOutType == "移库入库" || 
+              this.deptBudgetList[0].data[i].inOutType == "暂存入库" || 
+              this.deptBudgetList[0].data[i].inOutType == "采购入库" || 
+              this.deptBudgetList[0].data[i].inOutType =="贸易服务入库"|| 
+              this.deptBudgetList[0].data[i].inOutType =="收购入库") {
+                this.deptBudgetList[0].EnterList = this.deptBudgetList[0].data[i]
+							} else if (this.deptBudgetList[0].data[i].inOutType == "退库") {
+								this.deptBudgetList[0].retreatList = this.deptBudgetList[0].data[i]
+							}
+            }
+            this.deptBudgetList[0].printType=9
           }
           if(this.deptBudgetList[0].addressUrl){
             var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
@@ -247,7 +275,11 @@ export default {
           }
           this.deptBudgetList[0].currectstatus=row.status
           var workflow=await printworkflow({businessCode:row.businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
-                this.deptBudgetList[0].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:row.id,branch:this.deptBudgetList[0].jointVentureParties?this.deptBudgetList[0].jointVentureParties:'zt'}).toPromise()
+          if(row.type=='通用审核') {
+            this.deptBudgetList[0].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:row.id,branch:this.deptBudgetList[0].businessType?this.deptBudgetList[0].businessType:'zt'}).toPromise()
+          }else{
+            this.deptBudgetList[0].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:row.id,branch:this.deptBudgetList[0].jointVentureParties?this.deptBudgetList[0].jointVentureParties:'zt'}).toPromise()
+          }
                 for (let i = 0; i < this.deptBudgetList[0].aduitInfo.length; i++) {
                     var arr=this.deptBudgetList[0].aduitInfo[i]
                     if(arr.workflowHistoricTasks&&arr.workflowHistoricTasks.length>0){
@@ -262,11 +294,9 @@ export default {
                         if (arr.workflowHistoricTasks[len].auditMind && arr.workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
                             arr.auditMind = arr.workflowHistoricTasks[len].auditMind.split("##")[0]
                             arr.fileUrls = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
-                            var arr1=[]
                             for (let q = 0; q < arr.fileUrls.length; q++) {
-                              arr1.push({appendixPath:arr.fileUrls[q]})
+                              this.deptBudgetList[0].addressUrlArrayImage.push({appendixPath:arr.fileUrls[q]})
                             }
-                            this.deptBudgetList[0].addressUrlArrayImage.push(...arr1)
                         }else{
                             arr.auditMind = arr.workflowHistoricTasks[len].auditMind
                         }