Parcourir la source

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

achao il y a 1 an
Parent
commit
36dec465d0

+ 163 - 9
public/static/aduitprint.html

@@ -89,15 +89,30 @@
     .sfcard-content .image {
         background-repeat: no-repeat;
         background-size:contain;
-        width:120vw;
-        height:100vh;
-        
-        transform-origin: top top;
-        transform: rotate(90deg);
+        /* width:100vw;
+        height:100vh; */
+        /* transform-origin: center center;
+        transform: rotate(180deg); */
     }
+    .image { page : rotated }
     @media print {
+      @page rotated{
+        size: landscape;
+        orientation:landscape;
+      }
+      table{
+        page-break-after:always;
+      }
     .image{ page-break-inside:avoid;}
+    .sfcard-content .image {
+        background-repeat: no-repeat;
+        background-size:contain;
+        width:160vw;
+        height:100vh;
+        /* transform-origin: center center;
+        transform: rotate(90deg); */
     }
+   }
 </style>
 <body>
     <div id="app">
@@ -111,6 +126,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="">
@@ -160,7 +181,7 @@
                     <td colspan="2" class="col">{{ item.addressUrlArrayImage.length }}张图片(
                       <template v-if="item.expensesType==2">
                         <template v-for="(item1,index) in item.aduitInfo">
-                          {{item1.fileUrls.length}} <span v-if="index!=item.aduitInfo.length-1">+</span>
+                          {{item1.fileUrls?item1.fileUrls.length:0}} <span v-if="index!=item.aduitInfo.length-1">+</span>
                         </template>
                       </template>
                         ),{{item.addressUrlArrayFilelen}}个文档</td>
@@ -347,7 +368,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 +619,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 +695,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.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">
                     <!-- {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}} -->

+ 5 - 3
public/static/payprint1.html

@@ -19,7 +19,9 @@
         .simple {
             height: 120vh !important;
         }
-        
+        .simple2 {
+            height: 99vh !important;
+        }
         .content {
             width: 1000px;
             margin: auto;
@@ -592,7 +594,7 @@
                 </div>
                 <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
             </div> -->
-            <div class="center part1" v-if="isShowPrintType3&&!isShowPrintType6" :class="!selectPrint? 'simple':''">
+            <div class="center part1" v-if="isShowPrintType3&&!isShowPrintType6" :class="printData.extra2? 'simple2':!selectPrint? 'simple':''" >
                 <div class="header1">{{ printData.compName}}结算凭证</div>
                 <div class="line"></div>
                 <div class="line"></div>
@@ -809,7 +811,7 @@
                 </div>
             </div>
 
-            <div class="center part1" v-if="isShowPrintType3&&printData.extra2||isShowPrintType6" :class="!selectPrint? 'simple':''">
+            <div class="center part1" v-if="isShowPrintType3&&printData.extra2||isShowPrintType6"  :class="printData.extra2? 'simple2':!selectPrint? 'simple':''" >
                 <div class="header1">{{ print_company_name_ew}}结算凭证</div>
                 <div class="line"></div>
                 <div class="line"></div>

+ 29 - 16
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: 90vh;
             position: relative;
             margin: auto;
         }
@@ -163,29 +163,38 @@
                       <td class="col" >{{printData.carNo}}</td>
                   </tr>
                   <tr class="row">
-                      <td colspan="3" class="col col-bgc">收货单位</td>
-                      <td class="col" colspan="5">{{print_company_name}}</td>
+                      <td colspan="3" class="col col-bgc">收货仓库</td>
+                      <td class="col" colspan="5" v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'">{{print_company_name}}</td>
+                      <td class="col" colspan="5" v-else>北京天维康油脂调销中心有限公司</td>
                   </tr>
                   <tr class="row">
                       <td class="col col-bgc">货名</td>
                       <td class="col">{{printData.goodsName}}</td>
                       <td class="col col-bgc">类型</td>
                       <td class="col">干粮</td>
-                      <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容量(克/升)' : '蛋白'}}</td>
-                      <td class="col">
+                      <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容重(克/升)' : '蛋白'}}</td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col">
+                      </td>
+                      <td v-else class="col">
+                        685
                       </td>
                       <td class="col col-bgc">不完善粒(%)</td>
-                      <td class="col">
-                          
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col">   
+                      </td>
+                      <td v-else class="col">
+                        6
                       </td>
                   </tr>
                   <tr class="row">
                       <td class="col col-bgc">等级</td>
-                      <td class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-else class="col">三等</td>
                       <td class="col col-bgc">水分(%)</td>
-                      <td class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-else class="col">14.5</td>
                       <td class="col col-bgc">热损伤(%)</td>
-                      <td class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-else class="col">0</td>
                       <td class="col col-bgc">检斤时间</td>
                       <td class="col">
                           {{printData.updateDate}}
@@ -193,13 +202,17 @@
                   </tr>
                   <tr class="row">
                       <td class="col col-bgc">杂质(%)</td>
-                      <td class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-else class="col">1</td>
                       <td class="col col-bgc">霉变粒(%)</td>
-                      <td class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-else class="col">1</td>
                       <td class="col col-bgc">扣杂</td>
-                      <td class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-else class="col">0</td>
                       <td class="col col-bgc">仓位号</td>
-                      <td class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-else class="col">5</td>
                   </tr>
                   <tr class="row">
                       <td class="col col-bgc">毛重(公斤)</td>
@@ -270,7 +283,7 @@
                     <td class="col">{{printData.goodsName}}</td>
                     <td class="col col-bgc">类型</td>
                     <td class="col">干粮</td>
-                    <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容(克/升)' : '蛋白'}}</td>
+                    <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容(克/升)' : '蛋白'}}</td>
                     <td class="col">
                     </td>
                     <td class="col col-bgc">不完善粒(%)</td>

+ 3 - 1
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'

+ 1 - 1
src/components/balanceAlert.vue

@@ -26,7 +26,7 @@ export default {
   },
   activated() {},
   mounted() {
-    console.log('11111111111111111111111111111111111')
+
     console.log(this.deptBudgetList)
     this.openPort()
   },

+ 5 - 2
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)

+ 13 - 6
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1130,16 +1130,20 @@ export default {
       if (this.deptBudgetList.goodsName && type != 'water') {
         if (this.deptBudgetList.goodsName.indexOf('潮粮') != -1) {
           this.deptBudgetList.type = '潮粮'
-          this.deptBudgetList.grade = this.gradeList[1].constValue
-				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+          if(!this.deptBudgetList.grade){
+            this.deptBudgetList.grade = this.gradeList[1].constValue
+				    this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+          }
           this.deptBudgetList.imperfectGrain=8
 					this.deptBudgetList.impurity=1
 					this.deptBudgetList.mildewGrain=2
 					this.deptBudgetList.jiaorenli=0
         } else {
           this.deptBudgetList.type = '干粮'
-          this.deptBudgetList.grade = this.gradeList[1].constValue
-				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+          if(!this.deptBudgetList.grade){
+            this.deptBudgetList.grade = this.gradeList[1].constValue
+				    this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+          }
           this.deptBudgetList.imperfectGrain=8
 					this.deptBudgetList.impurity=1
 					this.deptBudgetList.mildewGrain=2
@@ -1179,7 +1183,7 @@ export default {
         })
           .toPromise()
           .then((response) => {
-            debugger
+            // debugger
             if (this.deptBudgetList.paramType == '1') {
               if(this.deptBudgetList.buckleMiscellaneous){
                 this.deptBudgetList.tidalGrainPrice = parseFloat(parseFloat(response) - parseFloat(this.deptBudgetList
@@ -4029,9 +4033,12 @@ export default {
       }
     },
     selectpackingMethod(e) {
+      this.$set( this.deptBudgetList,'grade',e)
+      console.log(e,this.deptBudgetList)
       for (var i = 0; i < this.gradeList.length; i++) {
         if (this.gradeList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+          console.log(11111)
+          this.$set( this.deptBudgetList,'gradeKey',this.gradeList[i].constKey)
         }
       }
       this.waterContentChange()

+ 12 - 5
src/views/personnelManagement/checkWorkList.vue

@@ -39,7 +39,8 @@
       label="日期"
       width="180">
       <template slot-scope="scope">
-        <span style="margin-left: 10px">{{ scope.row.createDate.split(" ")[0] }}</span>
+        <span v-if="!scope.row.leaveType" style="margin-left: 10px">{{ scope.row.createDate.split(" ")[0] }}</span>
+        <span v-else style="margin-left: 10px">{{ scope.row.clockDay }}</span>
       </template>
 
     </el-table-column>
@@ -48,12 +49,19 @@
       label="上班打卡时间"
       width="180">
       <template slot-scope="scope">
-        <span style="margin-left: 10px">{{ scope.row.toClockDate.split(" ")[1] }}</span>
+        <span v-if="scope.row.toClockDate" style="margin-left: 10px">{{ scope.row.toClockDate.split(" ")[1] }}</span>
+        <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='1'" style="margin-left: 10px;">已补卡</span>
+        <span v-else-if="scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
       </template>
     </el-table-column>
     <el-table-column
       prop="offClockDate"
       label="下班打卡时间">
+      <template slot-scope="scope">
+        <span v-if="scope.row.offClockDate" style="margin-left: 10px">{{ scope.row.offClockDate.split(" ")[1] }}</span>
+        <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='3'" style="margin-left: 10px;">已补卡</span>
+        <span v-else-if="scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
+      </template>
     </el-table-column>
   </el-table>
         <!-- <el-form label-position="left" inline class="demo-table-expand">
@@ -96,9 +104,8 @@
   </el-table>
 </div>
 <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" :page-size="pageSize"  layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"></el-pagination>
-   
+        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" :page-size="pageSize"  layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        <!-- :total="deptBudgetTotal" -->
   <!-- <div class="content">
     <div v-for="(item,index) in tableData">
       <div class="row">

+ 5 - 4
src/views/profitable/fixedAssets.vue

@@ -49,8 +49,9 @@
                         :type="searchType == '' ? 'primary' : ''">全部</el-button>
                     <el-button @click="statusChange(1)" :type="searchType == 1 ? 'primary' : ''">在用</el-button>
                     <el-button @click="statusChange(3)" :type="searchType == 3 ? 'primary' : ''">闲置</el-button>
-                    <el-button @click="statusChange(5)" :type="searchType == 5 ? 'primary' : ''">报废</el-button>
-                    <el-button @click="statusChange(7)" :type="searchType == 7 ? 'primary' : ''">转卖</el-button>
+                    <el-button @click="statusChange(7)" :type="searchType == 7 ? 'primary' : ''">报废</el-button>
+                    <el-button @click="statusChange(5)" :type="searchType == 5 ? 'primary' : ''">转卖</el-button>
+                    <el-button @click="statusChange(9)" :type="searchType == 9 ? 'primary' : ''">其他</el-button>
                 </el-col>
                 <el-col style="text-align: right" :span="30">
                     <span>合计:{{ allTotalPrice }} 元</span>
@@ -312,11 +313,11 @@ export default {
                 },
                 {
                     value: '报废',
-                    type: 5
+                    type: 7
                 },
                 {
                     value: '转卖',
-                    type: 7
+                    type: 5
                 },
             ],
             typeList: [

+ 1 - 1
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -1412,7 +1412,7 @@ export default {
         this.dataList.taskTypeKey == 3 ||
         this.dataList.taskTypeKey == 4
       ) {
-        this.dataList1.moveTaskNo=this.dataList1.contractNo
+        // this.dataList1.moveTaskNo=this.dataList1.contractNo
         if (!this.dataList.warehouseName) {
           this.$message({
             message: '出库仓库名不能为空!',

+ 1 - 1
src/views/universalityAudit/audit.vue

@@ -133,7 +133,7 @@
     </el-dialog>
     <el-dialog title="审核流详情" :visible.sync="show" width="30%" :before-close="handleClose1">
       <div v-for="item in blocks">
-        <div style="margin:10px 0;" v-show="item.title !='分公司日常汇报'">{{ item.title }}</div>
+        <div style="margin:10px 0;font-weight:600;" v-show="item.title !='分公司日常汇报'">{{ item.title }}</div>
         <div style="display:inline-block;" v-for="(item1, index) in item.subBlocks" :key="index" v-show="item.title !='分公司日常汇报'"><span
             v-if="item1.desc != '_PLACEHOLDER_'">{{ item1.desc }}</span> <span
             v-if="item1.desc != '_PLACEHOLDER_' && index != item.subBlocks.length - 1">----></span> </div>

+ 235 - 13
src/views/universalityAudit/auditprint.vue

@@ -21,7 +21,7 @@
           
         </el-col>
         <el-col style="text-align:right;" :span="10">
-          <el-button style="margin-right:10px" @click="addlist" type="primary">批量打印</el-button>
+          <el-button style="margin-right:10px" @click="printlist" type="primary">批量打印</el-button>
         </el-col>
       </el-row>
       <div class="fromdata">
@@ -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
@@ -145,6 +149,195 @@ export default {
     this.getList()
   },
   methods: {
+    async printlist(){
+      for (let m = 0; m <  this.multipleSelection.length; m++) {
+        if(this.multipleSelection[m].type=='费用审核'||this.multipleSelection[m].type=='运费结算'){
+            this.deptBudgetList[m]=await lookexenseinfo({id:this.multipleSelection[m].id}).toPromise()
+            this.deptBudgetList[m].currectstatus=this.multipleSelection[m].status
+            if(this.deptBudgetList[m].addressUrl){
+                var arr1=await printgetfile({appendixIds:this.deptBudgetList[m].addressUrl}).toPromise()
+                this.deptBudgetList[m].addressUrlArray=this.imagefilter(arr1)
+                this.deptBudgetList[m].addressUrlArrayImage=this.imagefilter(arr1)
+                this.deptBudgetList[m].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[m].addressUrlArrayImage.length
+            }else{
+                this.deptBudgetList[m].addressUrlArray=[]
+                this.deptBudgetList[m].addressUrlArrayImage=[]
+                this.deptBudgetList[m].addressUrlArrayFilelen=0
+            }
+            if(this.deptBudgetList[m].expensesType!=1){
+                if(this.multipleSelection[m].type=='费用审核'){
+                  this.deptBudgetList[m].printType=1
+                }else if(this.multipleSelection[m].type=='运费结算'){
+                  this.deptBudgetList[m].printType=7
+                  if (this.deptBudgetList[m].tranTaskInfoList.length > 0) {
+                    var num = 0
+                    for (var i = 0; i < this.deptBudgetList[m].tranTaskInfoList.length; i++) {
+                      if (this.deptBudgetList[m].tranTaskInfoList[i].tranSettlementReportList) {
+                        var data = this.deptBudgetList[m].tranTaskInfoList[i].tranSettlementReportList
+                        for (var q = 0; q < data.length; q++) {
+                          if (data[q].totalPayable) {
+                            this.num += data[q].totalPayable
+                          }
+                        }
+                      }
+                    }
+                  }
+                  this.deptBudgetList[m].num=num.toFixed(2)
+                }
+                var workflow=await printworkflow({businessCode:this.multipleSelection[m].businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
+                this.deptBudgetList[m].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:this.multipleSelection[m].id,branch:this.deptBudgetList[m].jointVentureParties?this.deptBudgetList[m].jointVentureParties:'zt'}).toPromise()
+                for (let i = 0; i < this.deptBudgetList[m].aduitInfo.length; i++) {
+                    var arr=this.deptBudgetList[m].aduitInfo[i]
+                    if(arr.workflowHistoricTasks&&arr.workflowHistoricTasks.length>0){
+                      console.log(arr.workflowHistoricTasks)
+                        var len =arr.workflowHistoricTasks.length-1
+                        if(arr.workflowHistoricTasks[len].approved){
+                            this.$set(arr,'status','success')
+                        }else{
+                            this.$set(arr,'status','error')
+                        }
+                        arr.operatorName=arr.workflowHistoricTasks[len].operatorName
+                        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.fileUrls = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+                            for (let q = 0; q < arr.fileUrls.length; q++) {
+                              this.deptBudgetList[m].addressUrlArrayImage.push({appendixPath:arr.fileUrls[q]})
+                            }
+                        }else{
+                            arr.auditMind = arr.workflowHistoricTasks[len].auditMind
+                        }
+                    }else{
+                        this.$set(arr,'status','question')
+                        arr.operatorName=arr.desc
+                        arr.updateDate=arr.updateDate
+                        arr.auditMind =''
+                    }
+                }
+                this.deptBudgetList[m].aduitInfo.unshift({
+                operatorName:this.multipleSelection[m].creater,
+                updateDate:this.multipleSelection[m].createDate,
+                auditMind:'',
+                desc:'发起',
+                workflowHistoricTasks:[],
+                status:'success'
+                })
+            }else{
+                this.deptBudgetList[m].printType=2 
+                this.deptBudgetList[m].aduitInfo=await getAuditRecord({id:this.multipleSelection[m].id}).toPromise()
+            }
+        }else if(this.multipleSelection[m].type=='入库单请款'||this.multipleSelection[m].type=='运价审核'||this.multipleSelection[m].type=='通用审核'||this.multipleSelection[m].type=='合同审核'||this.multipleSelection[m].type=='仓库设置'||this.multipleSelection[m].type=='出入库任务'){
+          if(this.multipleSelection[m].type=='入库单请款'){
+            this.deptBudgetList[m]=await printgetdata({batchId:this.multipleSelection[m].id}).toPromise()
+            this.deptBudgetList[m].printType=3
+          }else if(this.multipleSelection[m].type=='运价审核'){
+            this.deptBudgetList[m]=await seeCat({id:this.multipleSelection[m].id}).toPromise()
+            this.deptBudgetList[m].printType=4
+          }else if(this.multipleSelection[m].type=='通用审核'){
+            this.deptBudgetList[m]=await getaduitinfo({id:this.multipleSelection[m].id}).toPromise()
+            this.deptBudgetList[m].printType=5
+          }else if(this.multipleSelection[m].type=='合同审核'){
+            this.deptBudgetList[m]=await examineList({id:this.multipleSelection[m].id}).toPromise()
+            this.deptBudgetList[m].printType=6
+          }else if(this.multipleSelection[m].type=='仓库设置'){
+            this.deptBudgetList[m]=await purchasePriceLook({id:this.multipleSelection[m].id}).toPromise()
+            this.deptBudgetList[m].printType=8
+          }else if(this.multipleSelection[m].type=='出入库任务'){
+            var relevance=await printgetout({id:this.multipleSelection[m].id}).toPromise()
+            this.deptBudgetList[m]={data:await outexamine({relevanceId:relevance.relevanceId}).toPromise()}
+            for (let i = 0; i < this.deptBudgetList[m].data.length; i++) {
+                this.deptBudgetList[m].inOutTypeKey=this.deptBudgetList[m].data[i].inOutTypeKey
+							if (this.deptBudgetList[m].data[i].inOutType == "移库出库" || 
+              this.deptBudgetList[m].data[i].inOutType == "贸易服务出库" || 
+              this.deptBudgetList[m].data[i].inOutType == "销售出库" ||
+              this.deptBudgetList[m].data[i].inOutType == "暂存出库") {
+                this.deptBudgetList[m].OutList = this.deptBudgetList[m].data[i]
+							} else if (this.deptBudgetList[m].data[i].inOutType == "移库入库" || 
+              this.deptBudgetList[m].data[i].inOutType == "暂存入库" || 
+              this.deptBudgetList[m].data[i].inOutType == "采购入库" || 
+              this.deptBudgetList[m].data[i].inOutType =="贸易服务入库"|| 
+              this.deptBudgetList[m].data[i].inOutType =="收购入库") {
+                this.deptBudgetList[m].EnterList = this.deptBudgetList[m].data[i]
+							} else if (this.deptBudgetList[m].data[i].inOutType == "退库") {
+								this.deptBudgetList[m].retreatList = this.deptBudgetList[m].data[i]
+							}
+            }
+            this.deptBudgetList[m].printType=9
+          }
+          if(this.deptBudgetList[m].addressUrl){
+            var arr1=await printgetfile({appendixIds:this.deptBudgetList[m].addressUrl}).toPromise()
+            this.deptBudgetList[m].addressUrlArray=this.imagefilter(arr1)
+            this.deptBudgetList[m].addressUrlArrayImage=this.imagefilter(arr1)
+            this.deptBudgetList[m].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[m].addressUrlArrayImage.length
+          }else{
+            this.deptBudgetList[m].addressUrlArray=[]
+            this.deptBudgetList[m].addressUrlArrayImage=[]
+            this.deptBudgetList[m].addressUrlArrayFilelen=0
+          }
+          this.deptBudgetList[m].currectstatus=this.deptBudgetList[m].status
+          var workflow=await printworkflow({businessCode:this.multipleSelection[m].businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
+          if(this.deptBudgetList[m].type=='通用审核') {
+            this.deptBudgetList[m].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:this.multipleSelection[m].id,branch:this.deptBudgetList[m].businessType?this.deptBudgetList[m].businessType:'zt'}).toPromise()
+          }else{
+            this.deptBudgetList[m].aduitInfo=await printgethis({workflowId:workflow[0].id,businessKey:this.multipleSelection[m].id,branch:this.deptBudgetList[m].jointVentureParties?this.deptBudgetList[m].jointVentureParties:'zt'}).toPromise()
+          }
+                for (let i = 0; i < this.deptBudgetList[m].aduitInfo.length; i++) {
+                    var arr=this.deptBudgetList[m].aduitInfo[i]
+                    if(arr.workflowHistoricTasks&&arr.workflowHistoricTasks.length>0){
+                        var len =arr.workflowHistoricTasks.length-1
+                        if(arr.workflowHistoricTasks[len].approved){
+                            this.$set(arr,'status','success')
+                        }else{
+                            this.$set(arr,'status','error')
+                        }
+                        arr.operatorName=arr.workflowHistoricTasks[len].operatorName
+                        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.fileUrls = arr.workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+                            for (let q = 0; q < arr.fileUrls.length; q++) {
+                              this.deptBudgetList[m].addressUrlArrayImage.push({appendixPath:arr.fileUrls[q]})
+                            }
+                        }else{
+                            arr.auditMind = arr.workflowHistoricTasks[len].auditMind
+                        }
+                    }else{
+                        this.$set(arr,'status','question')
+                        arr.operatorName=arr.desc
+                        arr.updateDate=arr.updateDate
+                        arr.auditMind =''
+                    }
+                }
+                this.deptBudgetList[m].aduitInfo.unshift({
+                operatorName:this.multipleSelection[m].creater,
+                updateDate:this.multipleSelection[m].createDate,
+                auditMind:'',
+                desc:'发起',
+                workflowHistoricTasks:[],
+                status:'success'
+                })
+                
+        }
+        
+        
+      }
+      localStorage.setItem('aduitprintdata',JSON.stringify(this.deptBudgetList))
+        window.open('../../../static/aduitprint.html')
+    },
+    getImageSize(url) {
+    return new Promise((resolve) => {
+      const img = new Image()
+      img.src = url
+      if (img.complete) {
+        // 如果图片被缓存,则直接返回缓存数据
+        resolve({ width: img.width, height: img.height })
+      } else {
+        img.onload = () => {
+          resolve({ width: img.width, height: img.height })
+        }
+      }
+    })
+  },
     async printItem(row){
         if(row.type=='费用审核'||row.type=='运费结算'){
             this.deptBudgetList=[await lookexenseinfo({id:row.id}).toPromise()]
@@ -153,11 +346,11 @@ export default {
                 var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
                 this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
                 this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
-                this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArray.length
+                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
+                this.deptBudgetList[0].addressUrlArrayFilelen=0
             }
             if(this.deptBudgetList[0].expensesType!=1){
                 if(row.type=='费用审核'){
@@ -195,7 +388,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 +414,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,20 +430,45 @@ 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()
             this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
             this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
-            this.deptBudgetList[0].addressUrlArrayFilelen=arr1.length-this.deptBudgetList[0].addressUrlArray.length
+            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
+            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()
-                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 +483,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
                         }
@@ -293,9 +512,12 @@ 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])
-            }       
+            }
         }
         return arr1
     },

+ 15 - 15
src/views/universalityAudit/component/routers/route.js

@@ -28,21 +28,21 @@ const profitableRouter = {
           // module: 'procurement.sparepart.applDetail'
         }
       }, 
-      // {
-      //   path: 'auditprint',
-      //   component: () =>
-      //     import(/* webpackChunkName: "applDetail" */ '@/views/universalityAudit/auditprint'),
-      //   name: 'auditprint',
-      //   meta: {
-      //     title: 'auditprint',
-      //     shortcutEntrance: 'profitable',
-      //     module: 'generalAudit',
-      //     permissicon: [],
-      //     keepAlive: true,
-      //     _title:'审核流打印'
-      //     // module: 'procurement.sparepart.applDetail'
-      //   }
-      // }, 
+      {
+        path: 'auditprint',
+        component: () =>
+          import(/* webpackChunkName: "applDetail" */ '@/views/universalityAudit/auditprint'),
+        name: 'auditprint',
+        meta: {
+          title: 'auditprint',
+          shortcutEntrance: 'profitable',
+          module: 'generalAudit',
+          permissicon: [],
+          keepAlive: true,
+          _title:'审核流打印'
+          // module: 'procurement.sparepart.applDetail'
+        }
+      }, 
     
   ],
 

+ 0 - 28
src/views/warehousenew/addCar.vue

@@ -67,12 +67,6 @@
                                                 <ws-input v-model="weighingList.carNo" placeholder="请输入车牌号"
                                                     maxlength="7" size="small" />
                                             </ws-form-item>
-                                            <ws-form-item label="皮重(KG)" span="1" prop="tare">
-                                                <ws-input type="number" @mousewheel.native.prevent
-                                                    v-model="weighingList.tare" @input="calculation" placeholder="自动获取"
-                                                    maxlength="20" size="small" :disabled="disabled" />
-                                                <el-button @click="openPort">重新获取</el-button>
-                                            </ws-form-item>
                                         </ws-info-table>
                                         <div class="but">
                                             <el-button @click="submit" type="primary">提交</el-button>
@@ -265,28 +259,6 @@ export default {
                 })
                 return
             }
-            if (!this.weighingList.tare) {
-                this.$message({
-                    message: '皮重不能为空',
-                    type: 'warning',
-                })
-                return
-            }
-            if (
-                isNaN(this.weighingList.tare) ||
-                (String(this.weighingList.tare).indexOf('.') != -1 &&
-                    String(this.weighingList.tare).length -
-                    (String(this.weighingList.tare).indexOf('.') + 1) >
-                    1) ||
-                this.weighingList.tare < 1 ||
-                this.weighingList.tare > 120000
-            ) {
-                this.$message({
-                    message: '皮重输入错误!',
-                    type: 'warning',
-                })
-                return
-            }
             this.weighingList.warehouseName = this.warehouseName
             this.weighingList.baseId = this.warehouseId
             this.$confirm('确定保存车辆信息?', '提示', {

+ 2 - 1
src/views/warehousenew/dryRecord.vue

@@ -50,13 +50,14 @@
                 <el-table-column prop="dryNumber" label="业务编号"></el-table-column>
                 <el-table-column prop="carNo" label="车牌号" width="130"></el-table-column>
                 <el-table-column prop="goodsName" label="货名"></el-table-column>
+                <el-table-column prop="binNumber" label="仓位号"></el-table-column>
                 <el-table-column prop="weigher" label="检斤员"></el-table-column>
                 <el-table-column prop="grossWeight" label="毛重(公斤)" width="100"></el-table-column>
                 <el-table-column prop="tare" label="皮重(公斤)" width="100"></el-table-column>
                 <el-table-column prop="netWeight" label="净重(公斤)" width="100"></el-table-column>
                 <el-table-column prop="status" label="状态"></el-table-column>
                 <el-table-column prop="updateDate" label="检斤时间"></el-table-column>
-                <el-table-column label="操作">
+                <el-table-column label="操作"  width="200">
                     <template scope="scope">
                         <el-button @click="printInfo(scope.row)" >打印</el-button>
                         <el-button @click="deleteInfo(scope.row)" v-if="scope.row.status == '待称皮重'">删除</el-button>

+ 47 - 46
src/views/warehousenew/dryWarehousing.vue

@@ -92,6 +92,13 @@
                                                 <el-button @click="carNoTypechange" v-if="tpyeNo == 2">{{ cartips }}
                                                 </el-button>
                                             </ws-form-item>
+                                            <ws-form-item v-if="tpyeNo == 2 && warehouseType == 1" label="仓位号" span="1" prop="inOutTaskNo">
+                                              <el-select @change="binNumberchange" filterable clearable
+                                                v-model="weighingList.binNumber" placeholder="请选择仓位号" class="typeselect">
+                                                <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber"
+                                                  :value="item.binNumber" />
+                                              </el-select>
+                                            </ws-form-item>
                                             <ws-form-item label="毛重(KG)" span="1" prop="grossWeight">
                                                 <ws-input type="number" @mousewheel.native.prevent
                                                     v-model="weighingList.grossWeight" @input="calculation"
@@ -100,14 +107,14 @@
                                                 <el-button v-if="tpyeNo == 2" @click="openPort">
                                                     重新获取</el-button>
                                             </ws-form-item>
-                                            <ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="cartips == '手动输入'">
+                                            <ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="tpyeNo == 1">
                                                 <ws-input type="number" @mousewheel.native.prevent
                                                     v-model="weighingList.tare" @input="calculation" placeholder="自动获取"
                                                     maxlength="100" size="small" :disabled="disabled" />
                                                 <el-button v-if="tpyeNo == 1" @click="openPort">
                                                     重新获取</el-button>
                                             </ws-form-item>
-                                            <ws-form-item label="净重(KG)" span="1" prop="tare" v-if="cartips == '手动输入'">
+                                            <ws-form-item label="净重(KG)" span="1" prop="tare" v-if="tpyeNo == 1">
                                                 <ws-input type="number" @mousewheel.native.prevent
                                                     v-model="weighingList.netWeight" @input="calculation"
                                                     placeholder="自动计算" maxlength="100" size="small" disabled />
@@ -225,7 +232,7 @@ export default {
             warehouseName: '',
             currentPage: 1,
             pageSize: 10,
-            disabled: true,
+            disabled: false,
             tpyeNo: 2,
             information: '毛重',
             carChange1: '手动填写',
@@ -237,6 +244,7 @@ export default {
                 tare: '',
                 netWeight: 0
             },
+            positionInfos:[],
             deptBudgetList: {},
             warehouseList: [],
             goodsNameList: [],
@@ -335,7 +343,7 @@ export default {
         this.selectWarehouse()
         this.getGoodsList()
         this.isShowBalance = true
-        this.openPort()
+        console.log(localStorage.getItem('compNameoptions'))
         if(localStorage.getItem('compNameoptions')){
         var company=JSON.parse(localStorage.getItem('compNameoptions'))
         
@@ -350,6 +358,7 @@ export default {
           &&item!='黑龙江益储益运粮食贸易有限公司'
           &&item!='黑龙江启兴粮食贸易有限公司'
         })
+        console.log(extra,1111111111111111)
         if(extra.length>0){
           this.companyNameOptions=[
           {
@@ -460,6 +469,7 @@ export default {
           }else{
             this.ewCustomer=extra[0]
           }
+          
           for (let i = 0; i < extra.length; i++) {
             this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
             this.companyNameOptions.push({value: extra[i],label:extra[i]})
@@ -467,8 +477,17 @@ export default {
           }
         }
       }
+        this.openPort()
+        
     },
     methods: {
+      binNumberchange(e) {
+        for (let i = 0; i < this.positionInfos.length; i++) {
+          if (this.positionInfos[i].binNumber == e) {
+            this.weighingList.positionId = this.positionInfos[i].id
+          }
+        }
+      },
         changeEw(e) {
         this.ddchecked = false
         if (e) {
@@ -599,12 +618,10 @@ export default {
             this.getList()
         },
         setVal(data) {
-            debugger
-            data = 1000
             if (this.information == '毛重') {
                 this.weighingList.grossWeight = data
-                this.weighingList.netWeight =
-                    Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
+                // this.weighingList.netWeight =
+                //     Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
             } else {
                 this.weighingList.tare = data
                 this.weighingList.netWeight =
@@ -618,6 +635,7 @@ export default {
         listclick(row) {
             this.weighingList = row
             this.information = '皮重'
+            this.index=0
             this.cartips = '手动输入'
             this.tpyeNo = '1'
         },
@@ -688,38 +706,6 @@ export default {
                     })
                     return
                 }
-                if (this.cartips == '手动输入') {
-                    this.weighingList.statusFlag = 3
-                    if (!this.weighingList.tare) {
-                        this.$message({
-                            message: '皮重不能为空',
-                            type: 'warning',
-                        })
-                        return
-                    }
-                    if (
-                        isNaN(this.weighingList.tare) ||
-                        (String(this.weighingList.tare).indexOf('.') != -1 &&
-                            String(this.weighingList.tare).length -
-                            (String(this.weighingList.tare).indexOf('.') + 1) >
-                            1) ||
-                        this.weighingList.tare < 1 ||
-                        this.weighingList.tare > 100000
-                    ) {
-                        this.$message({
-                            message: '皮重输入错误!',
-                            type: 'warning',
-                        })
-                        return
-                    }
-                    if (this.weighingList.netWeight < 0) {
-                        this.$message({
-                            message: '净重不能为负',
-                            type: 'warning',
-                        })
-                        return
-                    }
-                }
             }
             if (this.tpyeNo == 1) { //称皮重
                 this.weighingList.statusFlag = 3
@@ -788,10 +774,10 @@ export default {
                                 this.weighingList.netWeight = ''
                                 getdrylist({id:this.weighingList.id}).toPromise()
                                 .then((response) => {
-                                    console.log(1111111111)
                                     this.printData=response
                                     this.isShowPrintTypeBills=true
                                 })
+                                console.log(this.weighingList)
                                 this.getList()
                             })
                     }
@@ -803,6 +789,14 @@ 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
+                    this.weighingList.baseId = this.warehouseList[i].id
+                    this.weighingList.warehouseNo = this.warehouseList[i].commonWarehouseNo
+                    this.positionInfos =  this.warehouseList[i].positionInfos
+                }
+            }
             this.index = val
             if (val == 0) {
                 this.information = '皮重'
@@ -820,11 +814,12 @@ export default {
                     this.warehouseId = this.warehouseList[i].id
                     this.weighingList.baseId = this.warehouseList[i].id
                     this.weighingList.warehouseNo = this.warehouseList[i].commonWarehouseNo
-                    if (this.warehouseList[i].allowEdit == 1) {
-                        this.disabled = false
-                    } else {
-                        this.disabled = true
-                    }
+                    this.positionInfos =  this.warehouseList[i].positionInfos
+                    // if (this.warehouseList[i].allowEdit == 1) {
+                    //     this.disabled = false
+                    // } else {
+                    //     this.disabled = true
+                    // }
                 }
             }
             this.getList()
@@ -864,11 +859,16 @@ export default {
                         this.weighingList.warehouseNo = obj.No
                         this.getCarXiaLa()
                         this.getList()
+                        for (let i = 0; i < response.length; i++) {
+                          this.positionInfos = response[i].positionInfos
+                          
+                        }
                     } else {
                         this.warehouseName = response[0].warehouseName
                         this.weighingList.baseId = response[0].id
                         this.warehouseId = response[0].id
                         this.weighingList.warehouseNo = response[0].commonWarehouseNo
+                        this.positionInfos = response[0].positionInfos
                         if (response[0].allowEdit == 1) {
                             this.disabled = false
                         } else {
@@ -878,6 +878,7 @@ export default {
                         this.getList()
                     }
                     this.deptBudgetList.warehouseName = this.warehouseName
+                    
                 })
         },
         getList() {

+ 34 - 23
src/views/warehousenew/inventoryCheck.vue

@@ -1,4 +1,4 @@
-<!--出入库任务-->
+<!--库存盘点-->
 <template>
   <div class="container">
     <BaseHeaderLayout :leftSpan="16">
@@ -48,9 +48,9 @@
             `warehouseManagement.warehousingOrder.View`
           ">盘亏
         </ws-button>
-        <ws-button :type="searchType === '1' ? 'primary' : ''" @click="handle('1')" v-hasPermission="
+        <!-- <ws-button :type="searchType === '1' ? 'primary' : ''" @click="handle('1')" v-hasPermission="
         `warehouseManagement.warehousingOrder.View`">待审核
-        </ws-button>
+        </ws-button> -->
         </el-col>
         <el-col style='text-align:right;' :span="12">
           
@@ -75,8 +75,8 @@
       <el-table class="wenzi" :data="item.warehousingOrderList" style="width: 100%"   >
         <el-table-column  width="40">
           <template scope="scope">
-            <img v-if="!scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange1(index,scope.row)' src="../../../public/img/wxz.png" alt="">
-            <img v-if="scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange(index,scope.row)' src="../../../public/img/xz.png" alt="">
+            <img v-if="!scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange1(index,scope.row,item)' src="../../../public/img/wxz.png" alt="">
+            <img v-if="scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange(index,scope.row,item)' src="../../../public/img/xz.png" alt="">
             <!-- <el-radio @change='radiochange(scope.row)' :name='indexMethod()+index' v-model="scope.row.select" :label="scope.row.id"><span></span></el-radio> -->
              <!-- <el-radio :label="scope.row.id" v-model="scope.row.select" @change.native="radiochange(index,scope.row)">&nbsp;</el-radio> -->
           </template>
@@ -87,8 +87,8 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="goodsSource" label="货源" width="80"></el-table-column>
-        <el-table-column prop="deliveryWarehouse" label="发货库" width="80"></el-table-column>
+        <el-table-column prop="goodsSource" label="货源" width="150"></el-table-column>
+        <el-table-column prop="deliveryWarehouse" label="发货库" width="200"></el-table-column>
         <el-table-column prop="goodsName" label="货名" width="80">
         </el-table-column>
         <el-table-column prop="inWarehouseWeight1"  width="130" class="table_td" label="入库重量(吨)"></el-table-column>
@@ -100,24 +100,22 @@
         </template>
         </el-table-column>
         <el-table-column prop="surplusWeight" width="130" class="table_td" label="剩余重量(吨)"></el-table-column>
-        <el-table-column prop="approveStatus" label="状态" width="90">
+        <!-- <el-table-column prop="approveStatus" label="状态" width="90">
           <template slot-scope="scope">
             <template>
-              <!-- <span v-if='scope.row.approveStatus'>{{ scope.row.approveStatus }}</span> -->
-              <!-- <span v-else>{{ scope.row.inventoryStatus }}</span> -->
               <span>{{ scope.row.inventoryStatus }}</span>
             </template>
             <img v-if="scope.row.taskStatus == '执行中'" width="17" height="18"
               style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
               @click="editClick(scope.row)" alt />
           </template>
-        </el-table-column>
+        </el-table-column> 
         <el-table-column prop="seller" label="操作" width="230">
           <template slot-scope="scope">
              <ws-button type="primary" v-if="scope.row.inventoryStatus == '待审核'" @click="aduit(scope.row)" v-hasPermission="`warehouseManagement.warehousingOrder.adiut`">
               审核</ws-button>
           </template>
-        </el-table-column>
+        </el-table-column>-->
       </el-table>
     </div>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
@@ -307,6 +305,7 @@
         historyList: [],
         aduitshow:false,
         goodsName:'0',
+        reserves:'',
         pickerBeginDateBefore: {
           disabledDate: (time) => {
             return time.getTime() > Date.now()
@@ -338,9 +337,20 @@
         this.currentPage=1
       this.searchType = status
       this.getList()
+    },
+    goodsNameChange(e){
+      if (e == '全部货名' || e == '0') {
+        this.goodsName = '0'
+        this.reserves = ''
+      }else{
+        this.goodsName = this.goodsList[e-1].goodsName
+        this.reserves = this.goodsList[e-1].storage
+      }
+        this.multipleSelection1={}
+        this.getList()
     },
       warehousefocus() {
-      getposition({ baseId: this.form.baseId, flag: 1 }).toPromise()
+      getposition({ baseId: this.form.baseId, flag: 0 }).toPromise()
         .then((response) => {
           // row.weightedit=false
           this.options = response
@@ -432,7 +442,7 @@
         this.flag=status
         this.getList()
       },
-      radiochange(index,row){
+      radiochange(index,row,item){
         console.log(index,row.select)
         var data=this.gainList[index].warehousingOrderList
         for (let i = 0; i < data.length; i++) {
@@ -442,15 +452,15 @@
         
         console.log(this.multipleSelection)
       },
-      radiochange1(index,row){
+      radiochange1(index,row,item){
         console.log(index,row.select)
         var data=this.gainList[index].warehousingOrderList
         for (let i = 0; i < data.length; i++) {
           data[i].select=false
           }
           row.select=!row.select
-        this.multipleSelection[row.id]=row
-        console.log(this.multipleSelection[row.id])
+        this.multipleSelection[item.id]=row
+        console.log(this.multipleSelection[item.id])
       },
        handleCurrentChange(val) {
         this.currentRow = val;
@@ -477,8 +487,9 @@
         }
       },
       lose(ware){
-        if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
-          console.log(this.multipleSelection[ware.id])
+        console.log(ware)
+        if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤' || localStorage.getItem('ws-pf_roleName')=='合同专员'){
+          console.log(this.multipleSelection)
           if(this.multipleSelection[ware.id]){
             this.form.baseId=ware.baseId
             this.form.goodsName=this.multipleSelection[ware.id].goodsName
@@ -513,7 +524,7 @@
         }
       },
       profit(ware){
-        if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
+        if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤' || localStorage.getItem('ws-pf_roleName')=='合同专员'){
           if(this.multipleSelection[ware.id]){
           this.form.baseId=ware.baseId
           this.form.goodsName=this.multipleSelection[ware.id].goodsName
@@ -556,7 +567,7 @@
             return
           }
         if(this.title=='盘盈'){
-          this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(2)
+          this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(3)
           this.form.flag=0
           if(this.form.num<this.form.surplusWeight){
             this.$notify.warning({
@@ -568,7 +579,7 @@
           title='确定提交盘盈数据?'
         }
         if(this.title=='盘亏'){
-          this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(2)
+          this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(3)
           this.form.flag=1
           if(this.form.num>this.form.surplusWeight){
             this.$notify.warning({
@@ -730,7 +741,7 @@
                 //    data[q].surplusWeight=(data[q].inWarehouseWeight/1000)-data[q].outWarehouseWeight+data[q].profitAndLoss
                 // }else{
                   data[q].inWarehouseWeight1=data[q].inWarehouseWeight.toFixed(3)
-                  data[q].surplusWeight=parseInt((data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss)*100)/100
+                  data[q].surplusWeight=(data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss).toFixed(3)
                 // }
                 data[q].select=false
                 data[q].weightedit=false

+ 8 - 1
src/views/warehousenew/warehousingOrder.vue

@@ -384,7 +384,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="折干后重量(吨)">
-            <el-input @input="afterWeightchange" v-model="fieldrationsList.afterWeight" disabled></el-input>
+            <el-input v-model="fieldrationsList.afterWeight"></el-input>
           </el-form-item>
           <!-- <el-form-item label="折干后成本(元/吨)">
               <el-input disabled  placeholder="自动计算,不可编辑" v-model="fieldrationsList.afterCost"></el-input>
@@ -1686,6 +1686,13 @@ export default {
         });
         return
       }
+      if (this.fieldrationsList.afterWeight >this.fieldrationsList.beforeWeight) {
+        this.$message({
+          message: '折干后重量输入错误',
+          type: 'warning'
+        });
+        return
+      }
       if (!this.fieldrationsList.afterBinNo) {
         this.$message({
           message: '折干后仓位不能为空',