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

public/static/payprint1.html

@@ -262,9 +262,8 @@
                             </tr>
                             <tr class="row">
                                 <td class="col col-bgc">收货仓库</td>
-                                <td class="col" colspan="3">
-                                    {{printData1[index].warehouseName}}
-                                </td>
+                                <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                                <td v-if="!pengyuPrint" class="col" colspan="3">{{printData1[index].warehouseName}}</td>
                                 <td class="col col-bgc">地址</td>
                                 <td class="col" colspan="4">
                                     {{printData1[index].identityAuthenticationInfo.compAddress}}
@@ -593,7 +592,7 @@
                 </div>
                 <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
             </div> -->
-            <div class="center part1" v-if="isShowPrintType3" :class="!selectPrint? 'simple':''">
+            <div class="center part1" v-if="isShowPrintType3&&!isShowPrintType6" :class="!selectPrint? 'simple':''">
                 <div class="header1">{{ printData.compName}}结算凭证</div>
                 <div class="line"></div>
                 <div class="line"></div>
@@ -616,28 +615,39 @@
                         <td class="col col-bgc">单位名称</td>
                         <td class="col" colspan="3">{{ printData.compName}}</td>
                         <td rowspan="4" class="col col-bgc">卖方</td>
-                        <td class="col col-bgc">姓名</td>
-                        <td class="col" colspan="4">{{ printData.customerName}}</td>
+                        <td class="col col-bgc" v-if="!printData.extra1">姓名</td>
+                        <td class="col col-bgc" v-else>单位名称</td>
+                        <td class="col" colspan="4" v-if="!printData.extra1">{{ printData.customerName}}</td>
+                        <td class="col" colspan="4" v-else>{{ print_company_name}}</td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">税务登记号</td>
                         <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
-                        <td class="col col-bgc">身份证号</td>
-                        <td class="col" colspan="4">
+                        <td v-if="!printData.extra1" class="col col-bgc">身份证号</td>
+                        <td v-else class="col col-bgc">联系人</td>
+                        <td v-if="!printData.extra1" class="col" colspan="4">
                             {{ printData.identityAuthenticationInfo.customerNumberCard}}
                         </td>
+                        <td v-else class="col" colspan="4">
+                            {{ printData.customerName}}
+                        </td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">业务编号</td>
                         <td class="col" colspan="3">{{ printData.paymentNo}}</td>
-                        <td class="col col-bgc">卡号</td>
-                        <td class="col" colspan="4">
+                        <td v-if="!printData.extra1" class="col col-bgc">卡号</td>
+                        <td v-else class="col col-bgc">联系电话</td>
+                        <td v-if="!printData.extra1" class="col" colspan="4">
                             {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
                         </td>
+                        <td v-else class="col" colspan="4">
+                            {{printData.customerPhone}}
+                        </td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">收货仓库</td>
-                        <td class="col" colspan="3">{{printData.warehouseName}}</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName}}</td>
                         <td class="col col-bgc">地址</td>
                         <td class="col" colspan="4">
                             {{printData.identityAuthenticationInfo.compAddress}}
@@ -799,6 +809,214 @@
                 </div>
             </div>
 
+            <div class="center part1" v-if="isShowPrintType3&&printData.extra2||isShowPrintType6" :class="!selectPrint? 'simple':''">
+                <div class="header1">{{ print_company_name_ew}}结算凭证</div>
+                <div class="line"></div>
+                <div class="line"></div>
+                <div class="header">
+                    <div>单位名称：{{ print_company_name_ew}}</div>
+                    <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
+                </div>
+                <div class="header-top">
+                    <div>单位：公斤/元</div>
+                    <div>No.</div>
+                </div>
+                <div class="header-top">
+                    <div>开票日期：{{printData.createDate}}</div>
+                    <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
+                    <div class="number">{{dealNo(printData.paymentNo)}}</div>
+                </div>
+                <table class="table">
+                        <td rowspan="2" class="col col-bgc">买方</td>
+                        <td class="col col-bgc">单位名称</td>
+                        <td class="col" colspan="3">{{ print_company_name_ew}}</td>
+                        <td rowspan="4" class="col col-bgc">客户</td>
+                        <td class="col col-bgc">姓名</td>
+                        <td class="col" colspan="4" >{{printData.customerName}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">收货仓库</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName=='洮南新友谊兴旺库'?'建发农产品-白城友谊自管仓':printData.warehouseName}}</td>
+                        <td class="col col-bgc">身份证号</td>
+                        <td class="col" colspan="4">
+                           {{ printData.identityAuthenticationInfo.customerNumberCard}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td rowspan="2" class="col col-bgc">卖方</td>
+                        <td class="col col-bgc">单位名称</td>
+                        <td class="col" colspan="3">{{ print_customer_name_ew}}</td>
+                        <td class="col col-bgc">卡号</td>
+                        <td class="col" colspan="4">
+                            {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">联系人</td>
+                        <td class="col" colspan="1"></td>
+                        <td class="col col-bgc">联系电话</td>
+                        <td class="col" colspan="1">&nbsp;</td>
+                        <td class="col col-bgc">地址</td>
+                        <td class="col" colspan="4">{{printData.identityAuthenticationInfo.compAddress}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">货名</td>
+                        <td class="col col-bgc">类型</td>
+                        <td class="col col-bgc">等级</td>
+                        <td class="col col-bgc">水分%</td>
+                        <td class="col col-bgc">杂质%</td>
+                        <td class="col col-bgc">{{printData.goodsName!= '大豆'?'容重':'蛋白'}}</td>
+                        <td class="col col-bgc">毛重</td>
+                        <td class="col col-bgc">皮重</td>
+                        <td class="col col-bgc">扣重</td>
+                        <td class="col col-bgc">净重</td>
+                        <!-- <td class="col col-bgc">出库净重</td> -->
+                        <!-- <td class="col col-bgc">纯重</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col">{{ printData.goodsName}}</td>
+                        <td class="col">{{ printData.type}}</td>
+                        <td class="col">
+                            {{ printData.qualityInspectionManagement.grade}}
+                        </td>
+                        <td class="col">
+                            {{ printData.qualityInspectionManagement.waterContent}}
+                        </td>
+                        <td class="col">
+                            {{ printData.qualityInspectionManagement.impurity}}
+                        </td>
+                        <td class="col">{{printData.qualityInspectionManagement?printData.qualityInspectionManagement.bulkDensity:''}}</td>
+                        <td class="col">{{ printData.grossWeight}}</td>
+                        <td class="col">{{ printData.tare}}</td>
+                        <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
+                        ||  printData.netWeight == null 
+                        ||  printData.pureWeight == null">
+                            {{printData.weighingManagement?printData.weighingManagement.buckleMiscellaneous:''}}
+                        </td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
+                        && printData.netWeight != null 
+                        && printData.pureWeight != null ">{{printData.netWeight-printData.pureWeight}}</td>
+                        <!-- <td class="col">
+                            {{ printData.weighingManagement.buckleMiscellaneous}}
+                        </td> -->
+                        <td class="col">{{ printData.netWeight}}</td>
+                        <!-- <td class="col">{{ printData.pureWeight}}</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">纯重</td>
+                        <td class="col col-bgc">单价</td>
+                        <td class="col col-bgc">扣单价</td>
+                        <td class="col col-bgc">粮款</td>
+                        <td class="col col-bgc">霉变粒</td>
+                        <td class="col col-bgc">热损伤</td>
+                        <td class="col col-bgc">不完善粒</td>
+                        <td class="col col-bgc">扣重比</td>
+                        <td class="col col-bgc">扣量%</td>
+                        <td class="col col-bgc"></td>
+                        <!-- <td class="col col-bgc">1卸车扣款</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col">{{ printData.pureWeight}}</td>
+                        <td class="col " v-if="printData.type == '潮粮' && !pengyuPrint">
+                            {{printData.tidalGrainPrice}}
+                        </td>
+                        <td class="col " v-if="printData.type == '干粮' && !pengyuPrint">
+                            {{printData.qualityInspectionManagement.dryGrainPrice}}
+                        </td>
+                        <td class="col " v-if="pengyuPrint">
+                            {{printData.unitContractPrice/1000}}
+                        </td>
+                        <td class="col ">{{ printData.unitDeduction}}</td>
+                        <td class="col " v-if="pengyuPrint">
+                            {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
+                        </td>
+                        <td class="col " v-if="!pengyuPrint">
+                            {{printData.grainMoney}}
+                        </td>
+                        <td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
+                        <td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
+                        <td class="col "> {{printData.qualityInspectionManagement.imperfectGrain}}</td>
+                        <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                        <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></td>
+                        <td class="col "></td>
+                        <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">卸车扣款</td>
+                        <td class="col col-bgc">质量扣款</td>
+                        <td class="col col-bgc">其他扣款</td>
+                        <!-- <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                            纯重单价
+                        </td> -->
+                        <td class="col col-bgc">合计应付</td>
+                        <td class="col col-bgc">购粮性质</td>
+                        <td class="col col-bgc">车牌号</td>
+                        <td class="col col-bgc" colspan="4">记事</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col ">{{ printData.unloadDeduction}}</td>
+                        <td class="col ">{{ printData.qualityDeduction}}</td>
+                        <td class="col ">{{ printData.otherDeduction}}</td>
+                        <!-- <td class="col " v-if="printData.type == '潮粮'">
+                            {{ printData.solidGrainPrice}}
+                        </td> -->
+                        <td class="col " v-if="pengyuPrint">
+                            {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
+                        </td>
+                        <td class="col " v-if="!pengyuPrint">
+                            {{printData.calculationPayable}}
+                        </td>
+                        <td class="col ">
+                            {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
+                        </td>
+                        <td class="col ">{{ printData.carNo}}</td>
+                        <td class="col " colspan="4">{{ printData.remarks}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">实付金额</td>
+                        <td class="col " colspan="2"></td>
+                        <td class="col col-bgc" colspan="3">人民币（大写）</td>
+                        <td class="col " v-if="!pengyuPrint" colspan="4">
+                            {{printData.capitalize}}
+                        </td>
+                        <td class="col " v-if="pengyuPrint" colspan="4">
+                            
+                        </td>
+                    </tr>
+                </table>
+                <div class="bottom">
+                    <div class="bottom-row1">
+                        <div>
+                            质检：{{ printData.qualityInspectionManagement.qualityInspector}}
+                        </div>
+                        <div>
+                            毛检：{{ printData.weighingManagement.secretaryWeigher}}
+                        </div>
+                        <div>皮检：{{ printData.weighingManagement.skinInspector}}</div>
+                        <div>结算：{{ printData.settlementClerk}}</div>
+                        <div>付款：{{ printData.cashier}}</div>
+                        <div>复点：{{ }}</div>
+                        <div></div>
+                    </div>
+                    <div class="bottom-row2">
+                        <!-- <div class="left">
+               <img src="../../../../public/img/add.png" alt="" />
+             </div> -->
+                        <div class="config">收货单位签名或盖章</div>
+                        <div class="config">客户签名</div>
+                        <div class="">司机签名</div>
+                    </div>
+                    <!-- <div class="bottom-row3">扫一扫</div> -->
+                    <!-- <div class="bottom-row4">
+             <el-button type="primary">关闭</el-button>
+              <el-button type="primary" @click="printSmall">打印小票</el-button>
+              <el-button type="primary" @click="printBig">打印单据</el-button>
+           </div> -->
+                </div>
+            </div>
+
             <div v-if="isShowPrintType4" class="part2">
                 <div>
 
@@ -1130,6 +1348,7 @@
             isShowPrintType3: false,
             isShowPrintType4: false,
             isShowPrintType5: false,
+            isShowPrintType6:false,
             showType: [],
             printData: {},
             printData1: [],
@@ -1149,6 +1368,9 @@
             onlyShowPz: false,
             tableData: [],
             compId: '',
+            print_company_name:'',
+            print_company_name_ew:'',
+            print_customer_name_ew:'',
             pengyuPrint:'false'
         },
         computed: {},
@@ -1183,7 +1405,15 @@
         },
         mounted() {
             this.pengyuPrint = localStorage.getItem('pengyuPrint')
-            debugger
+            if(localStorage.getItem('print_company_name')){
+                this.print_company_name=localStorage.getItem('print_company_name')
+            }
+            if(localStorage.getItem('print_company_name_ew')){
+                this.print_company_name_ew=localStorage.getItem('print_company_name_ew')
+            }
+            if(localStorage.getItem('print_customer_name_ew')){
+                this.print_customer_name_ew=localStorage.getItem('print_customer_name_ew')
+            }
             if(this.pengyuPrint == 'true'){
                 this.pengyuPrint = true
             }
@@ -1192,6 +1422,10 @@
             }
             //公司id
             this.compId = localStorage.getItem('ws-pf_compId')
+            if(this.compId == '5d164edcef03476dba6630f86dc96496'){
+                this.compId = '6a713699e08c4cbc97a87f7648a95e3d'
+            }
+            
             this.date = new Date().toLocaleString()
                 // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
             let _data = {}
@@ -1315,6 +1549,9 @@
             } else {
                 this.isShowPrintType3 = true
             }
+            if(localStorage.getItem('print_alone_extra')=='true'){
+                this.isShowPrintType6=true
+            }
             if (_type == 2) {
                 this.bigContent = true
                 this.smallContent = false

public/static/payprint3.html

@@ -0,0 +1,1340 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
+    <title></title>
+    <style>
+        table tr td {
+            border: 2px solid #333333;
+            padding: 5px 0;
+        }
+        
+        #app {
+            height: 88vh;
+            position: relative;
+        }
+        
+        .simple {
+            height: 120vh !important;
+        }
+        
+        .content {
+            width: 1000px;
+            margin: auto;
+            display: flex;
+        }
+        
+        table {
+            width: 100%;
+            text-align: center;
+            border-collapse: collapse;
+        }
+        
+        .col-bgc {
+            background: #f6f7fb;
+        }
+        
+        .bottom-row1 {
+            display: flex;
+            justify-content: space-between;
+            margin: 20px 0;
+        }
+        
+        .bottom-row2 {
+            display: flex;
+            margin: 10px 0;
+        }
+        
+        img {
+            width: 80px;
+            height: 80px;
+            /* margin-right: 118px; */
+        }
+        
+        .leftimg {
+            width: 80px;
+            height: 80px;
+            position: absolute;
+            right: 20px;
+            top: 3px;
+        }
+        
+        .config {
+            margin-right: 240px;
+        }
+        
+        .bottom-row3 {
+            margin: 10px 0;
+        }
+        
+        .title {
+            text-align: center;
+            font-size: 24px;
+        }
+        
+        .number {
+            text-align: right;
+            margin-bottom: 10px;
+        }
+        
+        .number1 {
+            text-align: right;
+            margin-bottom: 10px;
+            margin-top: 60px;
+        }
+        
+        .small-row {
+            display: flex;
+        }
+        
+        .small-content {
+            width: 400px;
+            margin: 0 auto;
+            border: 1px solid #ccc;
+            padding: 20px 20px 160px 20px;
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            margin: auto;
+            height: 650px;
+        }
+        
+        .small-title {
+            text-align: center;
+            font-size: 18px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+        
+        .small-row {
+            display: flex;
+            justify-content: space-between;
+            margin: 10px;
+        }
+        
+        .small-img {
+            margin-right: 0;
+        }
+        
+        .sign {
+            margin-right: 100px;
+        }
+        
+        .header {
+            display: flex;
+            justify-content: space-between;
+            font-size: 16px;
+            margin: 10px 0;
+        }
+        
+        .header1 {
+            font-size: 24px;
+            /* margin: 30px 60px 10px 60px; */
+            display: flex;
+            justify-content: center;
+        }
+        
+        .line {
+            height: 2px;
+            width: 410px;
+            margin: 3px auto;
+            background: black;
+        }
+        
+        .line:nth-of-type(3) {
+            margin-bottom: 30px;
+        }
+        
+        .header-top {
+            display: flex;
+            justify-content: space-between;
+        }
+        
+        .sfcard {
+            background: red;
+        }
+        
+        .sfcard-content {
+            /*        display: flex;
+        align-items: center;
+        justify-content: space-evenly; */
+        }
+        
+        .sfcard-content img {
+            width: 50vw;
+            height: 110vh;
+        }
+        
+        .sfcard-title {
+            font-size: 24px;
+            text-align: center;
+        }
+        
+        .center {
+            height: 99.5vh;
+        }
+        
+        .part2 {
+            /* background: red; */
+        }
+        
+        .part5 {
+            width: 100%
+        }
+        
+        .paymentScreenshot {
+            width: 100%;
+            height: 130vh
+        }
+        /* .onlypz-center{
+        height: 130vh;
+      } */
+    </style>
+</head>
+
+<body>
+    <div id="app">
+        <div v-if="selectPrint">
+            <div v-for="(item,index) in printData1" :key="index">
+                <div class="content">
+                    <!-- <div class="part5" v-if="isShowPrintType5">
+                        <div class="header1">
+                            付款回执单
+                        </div>
+                        <img :src="printData1[index].codeUrl" class="paymentScreenshot" />
+                    </div> -->
+                    <div class="center" v-if="isShowPrintType3">
+                        <div class="header1">{{ printData1[index].compName}}结算凭证</div>
+                        <div class="line"></div>
+                        <div class="line"></div>
+                        <div class="header">
+                            <div>单位名称：{{ printData1[index].compName}}</div>
+                            <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
+                        </div>
+                        <div class="header-top">
+                            <div>单位：公斤/元</div>
+                            <div>No.</div>
+                        </div>
+                        <div class="header-top">
+                            <div>开票日期：{{printData1[index].createDate}}</div>
+                            <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
+                            <div class="number">
+                                {{dealNo(printData1[index].paymentNo)}}
+                            </div>
+                        </div>
+                        <table class="table">
+                            <tr class="row">
+                                <td rowspan="4" class="col col-bgc">买方</td>
+                                <td class="col col-bgc">单位名称</td>
+                                <td class="col" colspan="3">
+                                    {{ printData1[index].compName}}
+                                </td>
+                                <td rowspan="4" class="col col-bgc">卖方</td>
+                                <td class="col col-bgc">姓名</td>
+                                <td class="col" colspan="4">
+                                    {{ printData1[index].customerName}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">税务登记号</td>
+                                <td class="col" colspan="3">
+                                    {{ printData1[index].taxRegistrationNo}}
+                                </td>
+                                <td class="col col-bgc">身份证号</td>
+                                <td class="col" colspan="4">
+                                    {{ printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">业务编号</td>
+                                <td class="col" colspan="3">
+                                    {{ printData1[index].paymentNo}}
+                                </td>
+                                <td class="col col-bgc">卡号</td>
+                                <td class="col" colspan="4">
+                                    {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">收货仓库</td>
+                                <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                                <td v-if="!pengyuPrint" class="col" colspan="3">{{printData1[index].warehouseName}}</td>
+                                <td class="col col-bgc">地址</td>
+                                <td class="col" colspan="4">
+                                    {{printData1[index].identityAuthenticationInfo.compAddress}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">货名</td>
+                                <td class="col col-bgc">类型</td>
+                                <td class="col col-bgc">等级</td>
+                                <td class="col col-bgc">水分%</td>
+                                <td class="col col-bgc">杂质%</td>
+                                <td class="col col-bgc">{{printData1[index].goodsName != '大豆'?'容重':'蛋白'}}</td>
+                                <td class="col col-bgc">毛重</td>
+                                <td class="col col-bgc">皮重</td>
+                                <td class="col col-bgc">扣重</td>
+                                <td class="col col-bgc">净重</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col">{{ printData1[index].goodsName}}</td>
+                                <td class="col">{{ printData1[index].type}}</td>
+                                <td class="col">
+                                    {{ printData1[index].qualityInspectionManagement.grade}}
+                                </td>
+                                <td class="col">
+                                    {{ printData1[index].qualityInspectionManagement.waterContent}}
+                                </td>
+                                <td class="col">
+                                    {{ printData1[index].qualityInspectionManagement.impurity}}
+                                </td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
+                                </td>
+                                <td class="col">{{ printData1[index].grossWeight}}</td>
+                                <td class="col">{{ printData1[index].tare}}</td>
+                                <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
+                                ||  printData1[index].netWeight == null 
+                                ||  printData1[index].pureWeight == null">
+                                    {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
+                                </td>
+                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
+                                && printData1[index].netWeight != null 
+                                && printData1[index].pureWeight != null ">{{printData1[index].netWeight-printData1[index].pureWeight}}</td>
+                                <td class="col">{{ printData1[index].netWeight}}</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">纯重</td>
+                                <td class="col col-bgc">
+                                    单价
+                                </td>
+                                <td class="col col-bgc">扣单价</td>
+                                <td class="col col-bgc">粮款</td>
+                                <td class="col col-bgc">霉变粒</td>
+                                <td class="col col-bgc">热损伤</td>
+                                <td class="col col-bgc">不完善粒</td>
+                                <td class="col col-bgc">扣重比</td>
+                                <td class="col col-bgc">扣量%</td>
+                                <td class="col col-bgc"></td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col">{{ printData1[index].pureWeight}}</td>
+                                <td class="col " v-if="printData1[index].type == '潮粮' && !pengyuPrint">
+                                    {{printData1[index].tidalGrainPrice}}
+                                </td>
+                                <td class="col " v-if="printData1[index].type == '干粮' && !pengyuPrint">
+                                    {{printData1[index].qualityInspectionManagement.dryGrainPrice}}
+                                </td>
+                                <td class="col " v-if="pengyuPrint">
+                                    {{printData1[index].unitContractPrice/1000}}
+                                </td>
+                                <td class="col ">{{ printData1[index].unitDeduction}}</td>
+                                <td class="col " v-if="pengyuPrint">
+                                    {{Number(printData1[index].unitContractPrice/1000*printData1[index].pureWeight).toFixed(2)}}
+                                </td>
+                                <td class="col " v-if="!pengyuPrint">
+                                    {{printData1[index].grainMoney}}
+                                </td>
+                                <td class="col "> {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.mildewGrain:''}}</td>
+                                <td class="col "> {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.jiaorenli:''}}</td>
+                                <td class="col "> {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}</td>
+                                <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData1[index].buckleWeightRatio}}</td>
+                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                                <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></td>
+                                <td class="col "></td>
+                                <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">卸车扣款</td>
+                                <td class="col col-bgc">质量扣款</td>
+                                <td class="col col-bgc">其他扣款</td>
+                                <!-- <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                                    纯重单价
+                                </td> -->
+                                <td class="col col-bgc">合计应付</td>
+                                <td class="col col-bgc">购粮性质</td>
+                                <td class="col col-bgc">车牌号</td>
+                                <td class="col col-bgc" colspan="4">记事</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col ">{{ printData1[index].unloadDeduction}}</td>
+                                <td class="col ">{{ printData1[index].qualityDeduction}}</td>
+                                <td class="col ">{{ printData1[index].otherDeduction}}</td>
+                                <!-- <td class="col " v-if="printData1[index].type == '潮粮'">
+                                    {{ printData1[index].solidGrainPrice}}
+                                </td> -->
+                                <td class="col " v-if="pengyuPrint">
+                                    {{Number(printData1[index].unitContractPrice/1000*printData1[index].pureWeight).toFixed(2)}}
+                                </td>
+                                <td class="col " v-if="!pengyuPrint">
+                                    {{printData1[index].calculationPayable}}
+                                </td>
+                                <td class="col ">
+                                    {{ printData1[index].qualityInspectionManagement.natureOfGrainPurchase}}
+                                </td>
+                                <td class="col ">{{ printData1[index].carNo}}</td>
+                                <td class="col " colspan="4">
+                                    {{ printData1[index].remarks}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">实付金额</td>
+                                <td class="col " colspan="2">
+
+                                </td>
+                                <td class="col col-bgc" colspan="3">人民币（大写）</td>
+                                <td class="col " v-if="!pengyuPrint" colspan="4">
+                                    {{printData1[index].capitalize}}
+                                </td>
+                                <td class="col " v-if="pengyuPrint" colspan="4">
+
+                                </td>
+                            </tr>
+                        </table>
+
+                        <div class="bottom">
+                            <div class="bottom-row1">
+                                <div>
+                                    质检：{{ printData1[index].qualityInspectionManagement.qualityInspector}}
+                                </div>
+                                <div>
+                                    毛检：{{ printData1[index].weighingManagement.secretaryWeigher}}
+                                </div>
+                                <div>
+                                    皮检：{{ printData1[index].weighingManagement.skinInspector}}
+                                </div>
+                                <div>结算：{{ printData1[index].settlementClerk}}</div>
+                                <div>付款：{{ printData1[index].cashier}}</div>
+                                <div>复点：{{ }}</div>
+                                <div></div>
+                            </div>
+                            <div class="bottom-row2">
+                                <!-- <div class="left">
+                   <img src="../../../../public/img/add.png" alt="" />
+                 </div> -->
+                                <div class="config">收货单位签名或盖章</div>
+                                <div class="">客户签名</div>
+                            </div>
+                            <!-- <div class="bottom-row3">扫一扫</div> -->
+                            <!-- <div class="bottom-row4">
+                 <el-button type="primary">关闭</el-button>
+                  <el-button type="primary" @click="printSmall">打印小票</el-button>
+                  <el-button type="primary" @click="printBig">打印单据</el-button>
+               </div> -->
+                        </div>
+                    </div>
+                    <div v-if="isShowPrintType4" class="part2">
+                        <div style="height: 120px;">
+
+                            <div class="title">入库检斤单</div>
+                            <!-- <div class="leftimg">
+                                <img :src="printData1[index].weighingManagement.codeUrl" alt="">
+                            </div> -->
+                            <div class="number1">{{printData1[index].weighingManagement.number}}</div>
+                        </div>
+
+                        <table class="table">
+                            <tr class="row">
+                                <td class="col col-bgc">客户姓名</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.customer}}</td>
+                                <td class="col col-bgc">客户电话</td>
+                                <td class="col">{{printData1[index].weighingManagement.customerPhone}}</td>
+                                <td class="col col-bgc">车牌号</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.carNumber}}</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">收货单位</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.compName}}</td>
+                                <td class="col col-bgc">联系人</td>
+                                <td class="col">{{printData1[index].weighingManagement.person}}</td>
+                                <td class="col col-bgc">联系电话</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.personPhone}}</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">货名</td>
+                                <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
+                                <td class="col col-bgc">类型</td>
+                                <td class="col">{{printData1[index].weighingManagement.type}}</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
+                                </td>
+                                <td class="col col-bgc">不完善粒（%）</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">等级</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.grade:''}}
+                                </td>
+                                <td class="col col-bgc">水分（%）</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.waterContent:''}}
+                                </td>
+                                <td class="col col-bgc">热损伤（%）</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.jiaorenli:''}}
+                                </td>
+                                <td class="col col-bgc">质检时间</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.qualityDate:''}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">杂质（%）</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.impurity:''}}
+                                </td>
+                                <td class="col col-bgc">霉变粒（%）</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.mildewGrain:''}}
+                                </td>
+                                <td class="col col-bgc">扣杂</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.buckleMiscellaneous:''}}
+                                </td>
+                                <td class="col " colspan="2"></td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">毛重（公斤）</td>
+                                <td class="col">{{printData1[index].weighingManagement.grossWeight}}</td>
+                                <td class="col col-bgc">皮重（公斤）</td>
+                                <td class="col">{{printData1[index].weighingManagement.tare}}</td>
+                                <td class="col col-bgc">扣重（公斤）</td>
+                                <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
+                                ||  printData1[index].netWeight == null 
+                                ||  printData1[index].pureWeight == null">
+                                    {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
+                                </td>
+                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
+                                && printData1[index].netWeight != null 
+                                && printData1[index].pureWeight != null ">{{printData1[index].netWeight-printData1[index].pureWeight}}</td>
+                                <!-- <td class="col">{{printData1[index].weighingManagement.buckleMiscellaneous}}</td> -->
+                                <td class="col col-bgc">净重（公斤）</td>
+                                <td class="col">{{printData1[index].weighingManagement.netWeight}}</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.grossDate}}</td>
+                                <td class="col col-bgc" colspan="2">皮重检斤时间</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.tareDate}}</td>
+                            </tr>
+                        </table>
+
+                        <div class="bottom">
+                            <div class="bottom-row1">
+                                <div>毛检：{{printData1[index].weighingManagement.secretaryWeigher}}</div>
+                                <div style="margin-left:60px">
+                                    皮检：{{printData1[index].weighingManagement.skinInspector}}
+                                </div>
+                                <!-- <div>{{tableData.qualityDate}}</div> -->
+                            </div>
+                            <div class="bottom-row2">
+                                <!-- <div class="leftimg">
+                    <img src="../img/add.png" alt="">
+                  </div> -->
+                                <div class="config">收货单位签名或盖章：</div>
+                                <div class="autograph">客户签名：</div>
+                            </div>
+                            <!-- <div class="bottom-row3">扫一扫</div> -->
+                        </div>
+                    </div>
+
+                    <div class="part1" v-if="isShowPrintType1">
+                        <div class="sfcard-content">
+                            <div class="sfcard-title">
+                                {{ printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                            </div>
+                            <img :src="customerList1[index].imgURl.imageUrl1" class="avatar" />
+                        </div>
+                        <!--     <div class="sfcard-content">
+                <div class="sfcard-title">
+                  {{
+                  printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl2" class="avatar" />
+              </div> -->
+                    </div>
+                    <div class="bankcard" v-if="isShowPrintType2">
+
+                        <div class="sfcard-content part2">
+                            <div class="sfcard-title">
+                                {{printData1[index].bankDeposit}}{{printData1[index].bankCard}}
+                            </div>
+                            <!-- <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" /> -->
+                            <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl3" class="avatar" />
+                            <!-- <img v-else class="avatar" /> -->
+                            <!-- <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl4" class="avatar" />
+                            <img v-else class="avatar" /> -->
+
+                        </div>
+                        <!--          <div class="sfcard-content part2">
+                <div class="sfcard-title">
+                  {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl4" class="avatar" />
+              </div> -->
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="content" v-else>
+            <!-- <div class="part5" v-if="isShowPrintType5">
+                <div class="header1">
+                    付款回执单
+                </div>
+                <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
+            </div> -->
+            <div class="center part1" v-if="isShowPrintType3" :class="!selectPrint? 'simple':''">
+                <div class="header1">{{ printData.compName}}结算凭证</div>
+                <div class="line"></div>
+                <div class="line"></div>
+                <div class="header">
+                    <div>单位名称：{{ printData.compName}}</div>
+                    <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
+                </div>
+                <div class="header-top">
+                    <div>单位：公斤/元</div>
+                    <div>No.</div>
+                </div>
+                <div class="header-top">
+                    <div>开票日期：{{printData.createDate}}</div>
+                    <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
+                    <div class="number">{{dealNo(printData.paymentNo)}}</div>
+                </div>
+                <table class="table">
+                    <tr class="row">
+                        <td rowspan="4" class="col col-bgc">买方</td>
+                        <td class="col col-bgc">单位名称</td>
+                        <td class="col" colspan="3">{{ printData.compName}}</td>
+                        <td rowspan="4" class="col col-bgc">卖方</td>
+                        <td class="col col-bgc">姓名</td>
+                        <td class="col" colspan="4">{{ printData.customerName}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">税务登记号</td>
+                        <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
+                        <td class="col col-bgc">身份证号</td>
+                        <td class="col" colspan="4">
+                            {{ printData.identityAuthenticationInfo.customerNumberCard}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">业务编号</td>
+                        <td class="col" colspan="3">{{ printData.paymentNo}}</td>
+                        <td class="col col-bgc">卡号</td>
+                        <td class="col" colspan="4">
+                            {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">收货仓库</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName}}</td>
+                        <td class="col col-bgc">地址</td>
+                        <td class="col" colspan="4">
+                            {{printData.identityAuthenticationInfo.compAddress}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">货名</td>
+                        <td class="col col-bgc">类型</td>
+                        <td class="col col-bgc">等级</td>
+                        <td class="col col-bgc">水分%</td>
+                        <td class="col col-bgc">杂质%</td>
+                        <td class="col col-bgc">{{printData.goodsName!= '大豆'?'容重':'蛋白'}}</td>
+                        <td class="col col-bgc">毛重</td>
+                        <td class="col col-bgc">皮重</td>
+                        <td class="col col-bgc">扣重</td>
+                        <td class="col col-bgc">净重</td>
+                        <!-- <td class="col col-bgc">出库净重</td> -->
+                        <!-- <td class="col col-bgc">纯重</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col">{{ printData.goodsName}}</td>
+                        <td class="col">{{ printData.type}}</td>
+                        <td class="col">
+                            {{ printData.qualityInspectionManagement.grade}}
+                        </td>
+                        <td class="col">
+                            {{ printData.qualityInspectionManagement.waterContent}}
+                        </td>
+                        <td class="col">
+                            {{ printData.qualityInspectionManagement.impurity}}
+                        </td>
+                        <td class="col">{{printData.qualityInspectionManagement?printData.qualityInspectionManagement.bulkDensity:''}}</td>
+                        <td class="col">{{ printData.grossWeight}}</td>
+                        <td class="col">{{ printData.tare}}</td>
+                        <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
+                        ||  printData.netWeight == null 
+                        ||  printData.pureWeight == null">
+                            {{printData.weighingManagement?printData.weighingManagement.buckleMiscellaneous:''}}
+                        </td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
+                        && printData.netWeight != null 
+                        && printData.pureWeight != null ">{{printData.netWeight-printData.pureWeight}}</td>
+                        <!-- <td class="col">
+                            {{ printData.weighingManagement.buckleMiscellaneous}}
+                        </td> -->
+                        <td class="col">{{ printData.netWeight}}</td>
+                        <!-- <td class="col">{{ printData.pureWeight}}</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">纯重</td>
+                        <td class="col col-bgc">单价</td>
+                        <td class="col col-bgc">扣单价</td>
+                        <td class="col col-bgc">粮款</td>
+                        <td class="col col-bgc">霉变粒</td>
+                        <td class="col col-bgc">热损伤</td>
+                        <td class="col col-bgc">不完善粒</td>
+                        <td class="col col-bgc">扣重比</td>
+                        <td class="col col-bgc">扣量%</td>
+                        <td class="col col-bgc"></td>
+                        <!-- <td class="col col-bgc">1卸车扣款</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col">{{ printData.pureWeight}}</td>
+                        <td class="col " v-if="printData.type == '潮粮' && !pengyuPrint">
+                            {{printData.tidalGrainPrice}}
+                        </td>
+                        <td class="col " v-if="printData.type == '干粮' && !pengyuPrint">
+                            {{printData.qualityInspectionManagement.dryGrainPrice}}
+                        </td>
+                        <td class="col " v-if="pengyuPrint">
+                            {{printData.unitContractPrice/1000}}
+                        </td>
+                        <td class="col ">{{ printData.unitDeduction}}</td>
+                        <td class="col " v-if="pengyuPrint">
+                            {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
+                        </td>
+                        <td class="col " v-if="!pengyuPrint">
+                            {{printData.grainMoney}}
+                        </td>
+                        <td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
+                        <td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
+                        <td class="col "> {{printData.qualityInspectionManagement.imperfectGrain}}</td>
+                        <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                        <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></td>
+                        <td class="col "></td>
+                        <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">卸车扣款</td>
+                        <td class="col col-bgc">质量扣款</td>
+                        <td class="col col-bgc">其他扣款</td>
+                        <!-- <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                            纯重单价
+                        </td> -->
+                        <td class="col col-bgc">合计应付</td>
+                        <td class="col col-bgc">购粮性质</td>
+                        <td class="col col-bgc">车牌号</td>
+                        <td class="col col-bgc" colspan="4">记事</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col ">{{ printData.unloadDeduction}}</td>
+                        <td class="col ">{{ printData.qualityDeduction}}</td>
+                        <td class="col ">{{ printData.otherDeduction}}</td>
+                        <!-- <td class="col " v-if="printData.type == '潮粮'">
+                            {{ printData.solidGrainPrice}}
+                        </td> -->
+                        <td class="col " v-if="pengyuPrint">
+                            {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
+                        </td>
+                        <td class="col " v-if="!pengyuPrint">
+                            {{printData.calculationPayable}}
+                        </td>
+                        <td class="col ">
+                            {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
+                        </td>
+                        <td class="col ">{{ printData.carNo}}</td>
+                        <td class="col " colspan="4">{{ printData.remarks}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">实付金额</td>
+                        <td class="col " colspan="2"></td>
+                        <td class="col col-bgc" colspan="3">人民币（大写）</td>
+                        <td class="col " v-if="!pengyuPrint" colspan="4">
+                            {{printData.capitalize}}
+                        </td>
+                        <td class="col " v-if="pengyuPrint" colspan="4">
+
+                        </td>
+                    </tr>
+                </table>
+                <div class="bottom">
+                    <div class="bottom-row1">
+                        <div>
+                            质检：{{ printData.qualityInspectionManagement.qualityInspector}}
+                        </div>
+                        <div>
+                            毛检：{{ printData.weighingManagement.secretaryWeigher}}
+                        </div>
+                        <div>皮检：{{ printData.weighingManagement.skinInspector}}</div>
+                        <div>结算：{{ printData.settlementClerk}}</div>
+                        <div>付款：{{ printData.cashier}}</div>
+                        <div>复点：{{ }}</div>
+                        <div></div>
+                    </div>
+                    <div class="bottom-row2">
+                        <!-- <div class="left">
+               <img src="../../../../public/img/add.png" alt="" />
+             </div> -->
+                        <div class="config">收货单位签名或盖章</div>
+                        <div class="">客户签名</div>
+                    </div>
+                    <!-- <div class="bottom-row3">扫一扫</div> -->
+                    <!-- <div class="bottom-row4">
+             <el-button type="primary">关闭</el-button>
+              <el-button type="primary" @click="printSmall">打印小票</el-button>
+              <el-button type="primary" @click="printBig">打印单据</el-button>
+           </div> -->
+                </div>
+            </div>
+
+            <div v-if="isShowPrintType4" class="part2">
+                <div>
+
+                    <div class="title">入库检斤单</div>
+                    <!-- <div class="leftimg">
+                        <img :src="tableData.codeUrl" alt="">
+                    </div> -->
+                    <div class="number1">{{tableData.number}}</div>
+                </div>
+                <table class="table">
+                    <tr class="row">
+                        <td class="col col-bgc">客户姓名</td>
+                        <td class="col" colspan="2">{{tableData.customer}}</td>
+                        <td class="col col-bgc">客户电话</td>
+                        <td class="col">{{tableData.customerPhone}}</td>
+                        <td class="col col-bgc">车牌号</td>
+                        <td class="col" colspan="2">{{tableData.carNumber}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">收货单位</td>
+                        <td class="col" colspan="2">{{tableData.compName}}</td>
+                        <td class="col col-bgc">联系人</td>
+                        <td class="col">{{tableData.person}}</td>
+                        <td class="col col-bgc">联系电话</td>
+                        <td class="col" colspan="2">{{tableData.personPhone}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">货名</td>
+                        <td class="col">{{tableData.goodsName}}</td>
+                        <td class="col col-bgc">类型</td>
+                        <td class="col">{{tableData.type}}</td>
+                        <td class="col col-bgc">{{tableData.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
+                        </td>
+                        <td class="col col-bgc">不完善粒（%）</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">等级</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.grade:''}}
+                        </td>
+                        <td class="col col-bgc">水分（%）</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.waterContent:''}}
+                        </td>
+                        <td class="col col-bgc">热损伤（%）</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.jiaorenli:''}}
+                        </td>
+                        <td class="col col-bgc">质检时间</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.qualityDate:''}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">杂质（%）</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.impurity:''}}
+                        </td>
+                        <td class="col col-bgc">霉变粒（%）</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.mildewGrain:''}}
+                        </td>
+                        <td class="col col-bgc">扣杂</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.buckleMiscellaneous:''}}
+                        </td>
+                        <td class="col " colspan="2"></td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">毛重（公斤）</td>
+                        <td class="col">{{tableData.grossWeight}}</td>
+                        <td class="col col-bgc">皮重（公斤）</td>
+                        <td class="col">{{tableData.tare}}</td>
+                        <td class="col col-bgc">扣重（公斤）</td>
+                        <td class="col">{{tableData.buckleMiscellaneous}}</td>
+                        <td class="col col-bgc">净重（公斤）</td>
+                        <td class="col">{{tableData.netWeight}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                        <td class="col" colspan="2">{{tableData.grossDate}}</td>
+                        <td class="col col-bgc" colspan="2">皮重检斤时间</td>
+                        <td class="col" colspan="2">{{tableData.tareDate}}</td>
+                    </tr>
+                </table>
+
+                <div class="bottom">
+                    <div class="bottom-row1">
+                        <div>毛检：{{tableData.secretaryWeigher}}</div>
+                        <div style="margin-left:60px">
+                            皮检：{{tableData.skinInspector}}
+                        </div>
+                        <!-- <div>{{tableData.qualityDate}}</div> -->
+                    </div>
+                    <div class="bottom-row2">
+                        <!-- <div class="left">
+                <img src="../img/add.png" alt="">
+              </div> -->
+                        <div class="config">收货单位签名或盖章：</div>
+                        <div class="autograph">客户签名：</div>
+                    </div>
+                    <!-- <div class="bottom-row3">扫一扫</div> -->
+                </div>
+            </div>
+
+            <div class="sfcard part3" v-if="isShowPrintType1">
+                <div class="sfcard-content">
+                    <div class="sfcard-title">
+                        {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}}
+                    </div>
+                    <img :src="imageUrl1" class="avatar" />
+                </div>
+                <!-- <div class="sfcard-content">
+                    <div class="sfcard-title">
+                        {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}}
+                    </div>
+                    <img :src="imageUrl2" class="avatar" />
+                </div> -->
+            </div>
+
+            <div class="bankcard part4" v-if="isShowPrintType2">
+                <div class="sfcard-content">
+                    <div class="sfcard-title">
+                        {{printData.bankDeposit}}{{printData.bankCard}}
+                    </div>
+                    <img :src="imageUrl3" class="avatar" />
+                </div>
+                <!-- <div class="sfcard-content">
+                    <div class="sfcard-title">
+                        {{printData.bankDeposit}}{{printData.bankCard}}
+                    </div>
+                    <img :src="imageUrl4" class="avatar" />
+                </div> -->
+
+            </div>
+        </div>
+
+        <div class="small-content" v-if="smallContent">
+            <div class="small-title">
+                <div>
+                    {{printData.compName}}结算凭证
+                </div>
+                <img class="small-img" src="../img/add.png" alt="" />
+            </div>
+            <div class="small-row">
+                <div>开票日期</div>
+                <div>{{printData.createDate}}</div>
+            </div>
+            <div class="small-row">
+                <div>买方单位名称</div>
+                <div>{{printData.compName}}</div>
+            </div>
+            <div class="small-row">
+                <div>买方姓名</div>
+                <div>{{printData.customerName}}</div>
+            </div>
+            <div class="small-row">
+                <div>税务登记号</div>
+                <div>{{printData.taxRegistrationNo}}</div>
+            </div>
+            <div class="small-row">
+                <div>身份证号</div>
+                <div>{{printData.customerNumberCard}}</div>
+            </div>
+            <div class="small-row">
+                <div>化验单号</div>
+                <div>{{printData.paymentNo}}</div>
+            </div>
+            <div class="small-row">
+                <div>卡号</div>
+                <div>{{printData.bankCard}}</div>
+            </div>
+            <div class="small-row">
+                <div>收货仓库</div>
+                <div>{{printData.warehouseName}}</div>
+            </div>
+            <div class="small-row">
+                <div>货名</div>
+                <div>{{printData.goodsName}}</div>
+            </div>
+            <div class="small-row">
+                <div>类型</div>
+                <div>{{printData.type}}</div>
+            </div>
+            <div class="small-row">
+                <div>等级</div>
+                <div>{{printData.grade}}</div>
+            </div>
+            <div class="small-row">
+                <div>水分%</div>
+                <div>{{printData.waterContent}}</div>
+            </div>
+            <div class="small-row">
+                <div>杂质%</div>
+                <div>{{printData.impurity}}</div>
+            </div>
+            <div class="small-row">
+                <div>毛重</div>
+                <div>{{printData.grossWeight}}</div>
+            </div>
+            <div class="small-row">
+                <div>皮重</div>
+                <div>{{printData.tare}}</div>
+            </div>
+            <div class="small-row">
+                <div>扣杂重</div>
+                <div>{{printData.weighingManagement.buckleMiscellaneous}}</div>
+            </div>
+            <div class="small-row">
+                <div>净重</div>
+                <div>{{printData.netWeight}}</div>
+            </div>
+            <div class="small-row">
+                <div>纯重</div>
+                <div>{{printData.pureWeight}}</div>
+            </div>
+            <div class="small-row">
+                <div>净重单价</div>
+                <div>{{printData.tidalGrainPrice}}</div>
+            </div>
+            <div class="small-row">
+                <div>粮款</div>
+                <div>{{printData.grainMoney}}</div>
+            </div>
+            <div class="small-row">
+                <div>称重补助</div>
+                <div>{{printData.weighingSubsidy}}</div>
+            </div>
+            <div class="small-row">
+                <div>运费补助</div>
+                <div>{{printData.freightSubsidy}}</div>
+            </div>
+            <div class="small-row">
+                <div>卸车补助</div>
+                <div>{{printData.unloadSubsidy}}</div>
+            </div>
+            <div class="small-row">
+                <div>其他补助</div>
+                <div>{{printData.otherSubsidy}}</div>
+            </div>
+            <div class="small-row">
+                <div>称重扣款</div>
+                <div>{{printData.weighingDeduction}}</div>
+            </div>
+            <div class="small-row">
+                <div>运费扣款</div>
+                <div>{{printData.freightDeduction}}</div>
+            </div>
+            <div class="small-row">
+                <div>卸车扣款</div>
+                <div>{{printData.unloadDeduction}}</div>
+            </div>
+            <div class="small-row">
+                <div>质量扣款</div>
+                <div>{{printData.qualityDeduction}}</div>
+            </div>
+            <div class="small-row">
+                <div>其他扣款</div>
+                <div>{{printData.otherDeduction}}</div>
+            </div>
+            <div class="small-row">
+                <div>纯重单价</div>
+                <div>{{printData.solidGrainPrice}}</div>
+            </div>
+            <div class="small-row">
+                <div>合计应付</div>
+                <div>{{printData.calculationPayable}}</div>
+            </div>
+            <div class="small-row">
+                <div>购粮性质</div>
+                <div>{{printData.natureOfGrainPurchase}}</div>
+            </div>
+            <div class="small-row">
+                <div>车牌号</div>
+                <div>{{printData.carNo}}</div>
+            </div>
+            <div class="small-row">
+                <div>记事</div>
+                <div>{{printData.remarks}}</div>
+            </div>
+            <div class="small-row">
+                <div>实付金额</div>
+                <div>{{printData.actualPayment}}</div>
+            </div>
+            <div class="small-row">
+                <div>人民币（大写）</div>
+                <div>{{printData.capitalize}}</div>
+            </div>
+            <div class="small-row">
+                <div>质检</div>
+                <div>{{printData.qualityInspector}}</div>
+            </div>
+            <div class="small-row">
+                <div>毛检</div>
+                <div>{{printData.secretaryWeigher}}</div>
+            </div>
+            <div class="small-row">
+                <div>皮检</div>
+                <div>{{printData.skinInspector}}</div>
+            </div>
+            <div class="small-row">
+                <div>结算</div>
+                <div>{{printData.settlementClerk}}</div>
+            </div>
+            <div class="small-row">
+                <div>付款</div>
+                <div>{{printData.actualPayment}}</div>
+            </div>
+            <div class="small-row">
+                <div>复点</div>
+                <div>&nbsp;&nbsp;&nbsp;</div>
+            </div>
+        </div>
+    </div>
+</body>
+<script src="../cdn/vue/2.6.10/vue.min.js"></script>
+<script src="../cdn/element-ui/2.13.2/index.js"></script>
+<script type="text/javascript">
+    new Vue({
+        el: '#app',
+        data: {
+            isShowPrintType1: false,
+            isShowPrintType2: false,
+            isShowPrintType3: false,
+            isShowPrintType4: false,
+            isShowPrintType5: false,
+            showType: [],
+            printData: {},
+            printData1: [],
+            customerList: {},
+            customerList1: [],
+            name: '',
+            bigContent: false,
+            smallContent: false,
+            date: '',
+            imageUrl1: '',
+            imageUrl2: '',
+            imageUrl3: '',
+            imageUrl4: '',
+            identity: [],
+            bank: [],
+            selectPrint: false,
+            onlyShowPz: false,
+            tableData: [],
+            compId: '',
+            pengyuPrint: 'false'
+        },
+        computed: {},
+        methods: {
+            dealNo(str) {
+                return str.slice(4)
+            },
+            tableRowClassName({
+                row,
+                rowIndex
+            }) {
+                if (rowIndex === 1) {
+                    return 'warning-row'
+                } else if (rowIndex === 3) {
+                    return 'success-row'
+                }
+                return ''
+            },
+            getQueryVariable(variable) {
+                var query = window.location.search.substring(1)
+                var vars = query.split('&')
+                for (var i = 0; i < vars.length; i++) {
+                    var pair = vars[i].split('=')
+                    if (pair[0] == variable) {
+                        return pair[1]
+                    }
+                }
+                return false
+            },
+            printSmall() {},
+            printBig() {}
+        },
+        mounted() {
+            this.pengyuPrint = localStorage.getItem('pengyuPrint')
+            debugger
+            if (this.pengyuPrint == 'true') {
+                this.pengyuPrint = true
+            } else {
+                this.pengyuPrint = false
+            }
+            //公司id
+            this.compId = localStorage.getItem('ws-pf_compId')
+            if(this.compId == '5d164edcef03476dba6630f86dc96496'){
+                this.compId = '6a713699e08c4cbc97a87f7648a95e3d'
+            }
+            this.date = new Date().toLocaleString()
+                // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
+            let _data = {}
+            if (localStorage.getItem('print_pay_data')) {
+                _data = localStorage.getItem('print_pay_data')
+            } else {
+                _data = decodeURIComponent(this.getQueryVariable("dataList"))
+            }
+            if (!_data || _data == 'false') {
+                this.selectPrint = true
+                this.printData1 = JSON.parse(
+                    localStorage.getItem('selectPrint_selectPrintList')
+                )
+                console.log("对象", this.printData1)
+                console.log("对象", this.printData)
+                for (let i = 0; i < this.printData1.length; i++) {
+                    if (!this.printData1[i].identityAuthenticationInfo.compAddress) this.printData1[i]
+                        .identityAuthenticationInfo.compAddress = ''
+                    if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 24) {
+                        this.printData1[i].identityAuthenticationInfo.compAddress = this.printData1[i]
+                            .identityAuthenticationInfo
+                            .compAddress.substring(0, 24)
+                    }
+                }
+            } else {
+                debugger
+                this.printData = JSON.parse(_data)
+                    //地址过长截取
+                if (this.printData.identityAuthenticationInfo && this.printData.identityAuthenticationInfo.compAddress.length > 24) {
+                    this.printData.identityAuthenticationInfo.compAddress = this.printData.identityAuthenticationInfo
+                        .compAddress.substring(0, 24)
+                }
+                this.selectPrint = false
+            }
+            let _type = decodeURIComponent(this.getQueryVariable('type'))
+            this.showType = decodeURIComponent(
+                    this.getQueryVariable('printTypeList')
+                )
+                // this.pzList = this.showType.split(',')
+                // if((this.showType.indexOf('打印结算凭证')>-1)&&this.pzList.length==1){
+                //   this.onlyShowPz = true
+                // }
+                // this.pageType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+            let _data1 = decodeURIComponent(this.getQueryVariable('customerList'))
+
+            var cwprint = localStorage.getItem('cwprint')
+            if (!_data1) {
+                this.customerList1 = JSON.parse(
+                    localStorage.getItem('selectPrint_selectCustomerList')
+                )
+            } else {
+                debugger
+                if (cwprint == 'true') {
+                    this.customerList = JSON.parse(localStorage.getItem('printData1'))
+                }
+
+            }
+            console.log(this.customerList)
+            console.log('cwprint', localStorage.getItem('cwprint'))
+            if (cwprint == 'true') {
+                if (this.selectPrint) {
+                    for (let i = 0; i < this.customerList1.length; i++) {
+                        let _url1 = this.customerList1[i].identityAuthenticationInfo.cardAddressUrl.split(',')
+                            // let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
+                        this.customerList1[i].imgURl = {
+                            imageUrl1: _url1[0],
+                            imageUrl2: _url1[1],
+                            // imageUrl3: _url2[0],
+                            // imageUrl4: _url2[0]
+                        }
+                    }
+                    for (let i = 0; i < this.printData1.length; i++) {
+                        if (this.printData1[i].payeeAddressUrl) {
+                            let _url2 = this.printData1[i].payeeAddressUrl.split(',')
+                            this.printData1[i].imgURl = {
+                                imageUrl3: _url2[0],
+                                imageUrl4: _url2[1]
+                            }
+                        }
+
+                    }
+                } else {
+                    if (this.customerList.identityAuthenticationInfo.cardAddressUrl) {
+                        this.identity = this.customerList.identityAuthenticationInfo.cardAddressUrl.split(',')
+                        this.imageUrl1 = this.identity[0]
+                        this.imageUrl2 = this.identity[1]
+                    }
+                    if (this.customerList.payeeAddressUrl) {
+                        this.bank = this.customerList.payeeAddressUrl.split(',')
+                        this.imageUrl3 = this.bank[0]
+                        this.imageUrl4 = this.bank[1]
+                    }
+                    if (this.printData.payeeAddressUrl) {
+                        this.bank = this.printData.payeeAddressUrl.split(',')
+                        this.imageUrl3 = this.bank[0]
+                        this.imageUrl4 = this.bank[1]
+                    }
+
+                    this.tableData = this.printData.weighingManagement
+                }
+                let _lsit = this.showType.split(',')
+                for (let i = 0; i < _lsit.length; i++) {
+                    switch (_lsit[i]) {
+                        case '打印身份证':
+                            this.isShowPrintType1 = !this.isShowPrintType1
+                            break
+                        case '打印银行卡':
+                            this.isShowPrintType2 = !this.isShowPrintType2
+                            break
+                        case '打印结算凭证':
+                            this.isShowPrintType3 = !this.isShowPrintType3
+                            break
+                        case '打印检斤单':
+                            this.isShowPrintType4 = !this.isShowPrintType4
+                            break
+                        case '打印回执单':
+                            this.isShowPrintType5 = !this.isShowPrintType5
+                            break
+                    }
+                }
+            } else {
+                this.isShowPrintType3 = true
+            }
+            if (_type == 2) {
+                this.bigContent = true
+                this.smallContent = false
+            } else {
+                this.smallContent = true
+                this.bigContent = false
+            }
+            if (this.printData.compName == undefined) this.printData.compName = ''
+            document.title = this.printData.compName + '结算凭证'
+            window.print()
+                // sessionStorage.removeItem('selectPrint_selectPrintList');
+                // sessionStorage.removeItem('selectPrint_selectCustomerList');
+            window.onafterprint = function(event) {
+                window.history.back(-1)
+            }
+        },
+        watch: {}
+    })
+</script>
+
+</html>

public/static/weightCheckOutNew.html

@@ -291,7 +291,7 @@
                             <td class="col col-bgc">发货单位</td>
                             <td class="col" colspan="2">{{item.customer}}</td>
                             <td class="col col-bgc">联系电话</td>
-                            <td class="col">{{kehu}}</td>
+                            <td class="col">{{kehuphone}}</td>
                             <!-- <td class="col">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td> -->
                             <td class="col col-bgc">货名</td>
                             <td class="col" colspan="2">{{item.goodsName}}</td>

src/api/V2/houseSelfCollect/index.js

@@ -122,4 +122,8 @@ export const API_GET_CONTRACT ='/contractManagementInfo/getInContract'
 export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
 // 获取仓库id
 export const API_GET_BASEID ='/qualityInspectionManagement/selectBaseId'
+// 换任务号
+export const API_POST_TASK_NO = `/weighingManagement/api/changeTaskNo`
+// 丹东港生成入库单
+export const API_POST_DANDONG_ORDER = `/paymentManagement/api/generateOrder`
 

src/api/V2/notice/index.js

@@ -22,7 +22,7 @@ export const API_GET_NOTICEOVERDUE_NOTICEOVERDUES = `${baseUrl}/noticeOverdue/qu
 export const API_GET_NOTICENEWS_BUSINESSTYPEAMOUNT = `${baseUrl}/noticeNews/query/businessTypeAmount`
 
 // 消息列表数据查询
-export const API_GET_NOTICENEWS_NOTICENEWS = `${baseUrl}/noticeNews/query/noticeNews`
+export const API_GET_NOTICENEWS_NOTICENEWS = `${baseUrl}/commonUser/query/noticeNewsInfoList`
 
 // 修改 - 消息 - 改为已读
 export const API_GET_NOTICENEWS_NOTICENEW = `${baseUrl}/noticeNews/query/noticeNew`

src/api/V2/outboundManagement/index.js

@@ -51,4 +51,6 @@ export const API_GAT_INFO = '/commonSysParameter/getInfo'
 // 是否创建运输任务
 export const API_GET_TRANTASK ='/inOutWarehouseTask/tranTaskCount'
 // 查询合同
-export const API_GET_CONTRACT ='/contractManagementInfo/getOutContract'
+export const API_GET_CONTRACT ='/contractManagementInfo/getOutContract'
+// 换任务号
+export const API_POST_TASK_NO = `/weighingManagement/api/changeTaskNo`

src/api/V2/platformaudit/index.js

@@ -46,6 +46,6 @@ export const API_GET_TRANSATION = '/transactionExchangeInfo/selectExchangeInfo'
 export const API_DEL_TRANSATION = '/transactionExchangeInfo/deleteInfo'
 // 交易信息审核
 export const API_ADUIT_TRANSATION = '/transactionExchangeInfo/editInfo'
-// 交易信息用户状态
+// 交易信息用户状态修改
 export const API_EDIT_USER_TRANSATION = '/transactionExchangeInfo/editUser'
 

src/api/V2/profitable/index.js

@@ -20,6 +20,8 @@ export const API_POST_AUDITRECORD = '/billOperateHis/query/commonBillOperateHis'
 export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouse'
 // 费用管理提交
 export const API_POST_SUBMIT = '/feeDetailsInfo/submit'
+// 费用管理编辑附件
+export const API_POST_UPLOADIMAGE = '/expenseInfo/uploadAttachments'
 // 费用管理查看
 export const API_GET_LOOK = '/feeDetailsInfo/selectInfo'
 // 费用管理付款，确认付款
@@ -107,4 +109,6 @@ export const API_GET_WAREHOUSINGORDER_LIST = '/warehousingOrder/selectInfo'
 //费用明细信息
 export const API_POST_EXPORTFILE = '/expenseInfo/exportPc'
 //费用编号
-export const API_GET_CONSTNO = '/expenseInfo/costNoList'
+export const API_GET_CONSTNO = '/expenseInfo/costNoList'
+// 导入
+export const API_IMPORT_FIXED ='/fixedAssetsInfo/api/importFixedAssets'

src/api/V2/universalityAudit/index.js

@@ -13,4 +13,6 @@ export const API_GET_INFO= '/commonSysParameter/getInfo'
 // 审核流1
 export const API_GET_workflow= '/newWorkflow/query/workflowsByBusinessCode'
 // 审核流2
-export const API_GET_HIS= '/newWorkflow/query/workflowInfo'
+export const API_GET_HIS= '/newWorkflow/query/workflowInfo'
+// 发起人撤回
+export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'

src/components/WsUpload/index.vue

@@ -44,12 +44,16 @@
       </template>
       <template v-slot:file="{ file }">
         <div class="thumbnail-group">
-          <img 
-          v-if='getFileClass(file)=="ext png"||getFileClass(file)=="ext jpg"||getFileClass(file)=="ext jpeg"||getFileClass(file)=="ext JPG"'
+          <el-image  v-if='getFileClass(file)=="ext png"||getFileClass(file)=="ext jpg"||getFileClass(file)=="ext jpeg"||getFileClass(file)=="ext JPG"'
           :src='file.url'
-            class="el-upload-list__item-thumbnail"
+  class="el-upload-list__item-thumbnail"
             :class="getFileClass(file)"
-          />
+          :preview-src-list="file.imgurl">
+  </el-image>
+          <!-- <img 
+         
+           
+          /> -->
           <div v-else class="el-upload-list__item-thumbnail"
             :class="getFileClass(file)"></div>
         </div>
@@ -305,6 +309,7 @@ export default {
               appendixId: item.appendixId,
               name: item.appendixName,
               url: this.getFilePath(item.appendixPath),
+              imgurl:[this.getFilePath(item.appendixPath)],
               uid: uuid(),
             }
           })

src/components/balanceAlert.vue

@@ -64,7 +64,9 @@ export default {
             this.param = 1200
           } else if (this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
             this.param = 2400
-          }  else {
+          } else if(this.deptBudgetList.warehouseName == '大庆朝阳沟库' ){
+            this.param = 4800
+          } else {
             this.param = 9600
           }
           console.log(this.param)
@@ -196,7 +198,8 @@ export default {
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '顺诚粮库' ||
-              this.deptBudgetList.warehouseName == '鲅鱼圈金信库')
+              this.deptBudgetList.warehouseName == '鲅鱼圈金信库'|
+              this.deptBudgetList.warehouseName == '大庆朝阳沟库')
           ) {
             for (var i = value.length - 1; i >= 0; i--) {
               var tmp = String.fromCharCode(value[i])

src/lang/zh.js

@@ -1102,6 +1102,7 @@ export default {
     warehouseprofits: '库点利润',
     expensemanagement: '费用管理',
     inOutDetailed: '收支明细',
+    fixedAssets:'固定资产',
 
     //出库管理
     outboundManagement: '出库管理',

src/layout/index/top/index.vue

@@ -44,6 +44,8 @@
               <el-button v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`" 
                 v-if="btnStatus.status5" @click="goToPage(6)" class="btn_css">去称皮重
               </el-button>
+              <!-- <el-button @click="goToPage(6)" class="btn_css">去称皮重
+              </el-button> -->
               <el-button v-hasPermission="`acquisitionManagement.acquisitionPay.add`" v-if="btnStatus.status6"
                 @click="goToPage(5)" class="btn_css">去结算</el-button>
               
@@ -606,7 +608,7 @@
       async getQRCodeData(tmp) {
         await getQRCodeData(tmp)
           .toPromise()
-          .then((response) => { 
+          .then((response) => { debugger
             this.toPageData = response
             // 处理按钮显示状态
             // this.btnStatus 
@@ -631,9 +633,10 @@
             if ( this.toPageData.qualityInspectionManagement.confirm != '0' &&  (_status1 == '已称毛重' || _status1 == '已称皮重') && _status3 == '') {
               this.btnStatus.status5 = true
             } 
-            if ( this.toPageData.qualityInspectionManagement.confirm != '0' &&   _status1 == '已称皮重' && _status3 == '待结算')  {
+            if (this.toPageData.qualityInspectionManagement.confirm != '0' &&   _status1 == '已称皮重' && _status3 == '待结算')  {
               this.btnStatus.status6 = true
             }
+           
             if (_status3 == '已结算') {
               this.$message.error('业务已完结');
             } else {
@@ -691,6 +694,8 @@
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
            _saomadata.number = this.toPageData.number
+           //入库状态
+           
             localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
              this.$router.push({
             name: 'newWeighingManagement',query: {  id:this.index++ }
@@ -709,9 +714,11 @@
            _saomadata.monitorUrl1 = this.toPageData.warehouseBaseInfo.monitorUrl1
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
+           _saomadata.number = this.toPageData.number
             localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
            this.$router.push({
-            name: 'newWeighingManagement',
+            name: 'newWeighingManagement'
+            ,query: {  id:this.index++ }
           })
         }
         this.smAlert = false

src/model/houseSelfCollect/index.js

@@ -60,6 +60,8 @@ import {
   API_POST_RETURN,
   API_POST_SUBMIT,
   API_POST_CHANE_NO,
+  API_POST_TASK_NO,
+  API_POST_DANDONG_ORDER,
   API_POST_DELETE,
   API_GET_CONTRACT,
   API_SPONSOR_WITHDRAW,
@@ -191,3 +193,7 @@ export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle
 export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)
 // 获取仓库id
 export const getBaseId = appRx.get(API_GET_BASEID, errorCatcher, errorHandle, filter)
+// 换任务号
+export const changeTaskNo = appRx.post(API_POST_TASK_NO, errorCatcher, errorHandle, filter)
+// 丹东港生成入库单
+export const dandongOrder = appRx.post(API_POST_DANDONG_ORDER, errorCatcher, errorHandle, filter)

src/model/outboundManagement/index.js

@@ -23,6 +23,7 @@ import {
     API_GET_INSPECT_CONTRANCLISTWEIGHING,
     API_POST_NEW_SUBMIT,
     API_POST_CHANE_NO,
+    API_POST_TASK_NO,
     API_POST_IMPORT_SALE,
     API_POST_IMPORT_YK,
     API_POST_GO_BACK,
@@ -85,4 +86,6 @@ export const getInfo = appRx.get(API_GAT_INFO, errorCatcher, errorHandle, filter
 // 是否创建运输任务
 export const gettask = appRx.get(API_GET_TRANTASK, errorCatcher, errorHandle, filter)
 // 获取合同
-export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
+export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
+// 换任务号
+export const changeTaskNo = appRx.post(API_POST_TASK_NO, errorCatcher, errorHandle, filter)

src/model/profitable/index.js

@@ -56,6 +56,7 @@ import {
   API_POST_EXPORTFILE,
   API_GET_CONSTNO,
   API_IMPORT_FIXED,
+  API_POST_UPLOADIMAGE
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -79,6 +80,8 @@ export const getAuditRecord = appRx.get(API_POST_AUDITRECORD, errorCatcher, erro
 export const getwarehouse= appRx.get(API_GET_WAREHOUSE, errorCatcher, errorHandle, filter)
 // 费用管理提交
 export const setexpense = appRx.post(API_POST_SUBMIT, errorCatcher, errorHandle, filter)
+// 费用管理编辑附件
+export const editfujian = appRx.post(API_POST_UPLOADIMAGE, errorCatcher, errorHandle, filter)
 // 合同编号下拉
 export const getcontract = appRx.get(API_GET_WAREHOUSE_NO, errorCatcher, errorHandle, filter)
 // 费用管理提交

src/model/universalityAudit/index.js

@@ -9,12 +9,13 @@ import {
     API_LIST_AUDITINFO,
     API_GET_INFO,
     API_GET_workflow,
-    API_GET_HIS
+    API_GET_HIS,
+    API_SPONSOR_WITHDRAW
 } from '@/api/V2/universalityAudit'
 // 查看
 export const getaduitinfo = appRx.get(API_GET_AUDITINFO, errorCatcher, errorHandle, filter)
 // 编辑
-export const editaduitinfo = appRx.get(API_EDIT_AUDITINFO, errorCatcher, errorHandle, filter)
+export const editaduitinfo = appRx.post(API_EDIT_AUDITINFO, errorCatcher, errorHandle, filter)
 // 删除
 export const deladuitinfo = appRx.post(API_DEL_AUDITINFO, errorCatcher, errorHandle, filter)
 // 添加
@@ -26,4 +27,6 @@ export const xiala = appRx.get(API_GET_INFO, errorCatcher, errorHandle, filter)
 // 审核流1
 export const workflow = appRx.get(API_GET_workflow, errorCatcher, errorHandle, filter)
 // 审核流2
-export const gethis = appRx.get(API_GET_HIS, errorCatcher, errorHandle, filter)
+export const gethis = appRx.get(API_GET_HIS, errorCatcher, errorHandle, filter)
+// 发起人撤回
+export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContract.vue

@@ -201,11 +201,9 @@
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
-            <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+            <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
               <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
-                @click="withdraw(scope.row)" v-hasPermission="
-                            `contractManagement.buyContract.buyContractInfo.edit`
-                          " alt="" />
+                @click="withdraw(scope.row)" v-hasPermission="`contractManagement.buyContract.buyContractInfo.edit`" alt="" />
             </div>
             <!-- <ws-button v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" type="primary" @click="withdraw(scope.row)" >撤回</ws-button> -->
         </template>
@@ -282,6 +280,7 @@
         showType: true,
         // 年
         year: '',
+        showFlag:false,
         deliver_type: 1,
         deptBudgetTotal: 0,
         currentPage: 1,
@@ -531,6 +530,7 @@
             goodsType: this.goodsType,
             currentPage: this.currentPage,
             pageSize: this.pageSize,
+            agreementType: '收购合同',
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
             startDate: this.startDate,
@@ -541,6 +541,9 @@
           .toPromise()
           .then((response) => {
             for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               if(response.records[i].status){
                 response.records[i].currectstatus=response.records[i].status
               }

src/views/contractManagement/collectionContract.vue

@@ -144,7 +144,7 @@
             v-hasPermission="
                 `contractManagement.dsContract.dsContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
-              <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
                 <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
                   @click="withdraw(scope.row)" v-hasPermission="`contractManagement.dsContract.dsContractInfo.edit`" alt="" />
               </div>
@@ -211,6 +211,7 @@
         // showType: true,
         // 年
         year: '',
+        showFlag:false,
         deliver_type: 1,
         deptBudgetTotal: 0,
         currentPage: 1,
@@ -219,7 +220,7 @@
         searchType: 1,
         searchTypeText: '未完成',
         searchKeyWord: '',
-        contractType: 1,
+        contractType: 3,
         goodsType: 1,
         startDate: null,
         endDate: null,
@@ -421,7 +422,9 @@
               if (response.records[i].completedQuantity) {
                 response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
               }
-
+              if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               if (response.records[i].addressUrl != null) {
                 if (response.records[i].addressUrl) {
                   response.records[i].addressUrlArray =

src/views/contractManagement/inspectInfo.vue

@@ -113,8 +113,8 @@
             </ws-form-item>
           </ws-info-table>
 
-          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; </div>
-          <!-- <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div> -->
+          <!-- <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; </div> -->
+          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div>
           <ws-info-table>
             <ws-form-item label="等级" span="1" prop="grade">
               <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect" :disabled="disabled"

src/views/contractManagement/purchaseContract.vue

@@ -215,7 +215,7 @@
             src="../../../public/img/shanchu.png" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
-                         <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+                         <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
               <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
                 @click="withdraw(scope.row)" v-hasPermission="
                             `contractManagement.buyContract.buyContractInfo.edit`
@@ -334,6 +334,7 @@ export default {
       goodsType: 1,
       startDate: null,
       endDate: null,
+      showFlag:false,
       addressUrls: [],
       accesscard: false,
       // 提交类型
@@ -692,6 +693,9 @@ export default {
             } else {
               response.records[i].addressUrlArray = []
             }
+            if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+              response.records[i].showFlag = true
+              }
           }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size

src/views/contractManagement/purchaseContractEdit.vue

@@ -778,7 +778,7 @@
           })
       },
       submit() {
-        this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.toString()
+        
         if(this.deptBudgetList.transactionSubject == '合营'){
           if (!this.deptBudgetList.jointVentureParties) {
           this.$message({
@@ -1319,6 +1319,7 @@
               if (valid) {
                 this.deptBudgetList.compId = this.compId
                 this.deptBudgetList.contractType = 2
+                this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.toString()
                 editInfo(this.deptBudgetList)
                   .toPromise()
                   .then((response) => {
@@ -1328,6 +1329,7 @@
                     })
                   })
               } else {
+                this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.split(',')
                 EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
                 return false
               }

src/views/contractManagement/salesContract.vue

@@ -219,14 +219,10 @@
             src="../../../public/img/shanchu.png" v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
-                        <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
-              <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
-                @click="withdraw(scope.row)" v-hasPermission="
-                            `contractManagement.buyContract.buyContractInfo.edit`
-                          " alt="" />
+            <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+                <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
+                   @click="withdraw(scope.row)" v-hasPermission="`contractManagement.buyContract.buyContractInfo.edit`" alt="" />
             </div>
-            <!-- <ws-button v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" type="primary" @click="withdraw(scope.row)" >撤回</ws-button> -->
-            <!-- v-hasPermission="`contractManagement.salesContract.salesContractInfo.add`" -->
         </template>
       </el-table-column>
     </el-table>
@@ -353,7 +349,7 @@ export default {
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
-      size: 10,
+      showFlag:false,
       appendixIdss: [],
       compId: localStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -710,9 +706,9 @@ export default {
             } else {
               response.records[i].datestatus = false
             }
-
-
-
+            if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
             if (response.records[i].completedQuantity) {
               response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
             }

src/views/contractManagement/storageContract.vue

@@ -145,7 +145,7 @@
             v-hasPermission="
                 `contractManagement.dcContract.dcContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
-              <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <div v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
               <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
                 @click="withdraw(scope.row)" v-hasPermission="
                             `contractManagement.dcContract.dcContractInfo.edit`
@@ -221,6 +221,7 @@
         endDate: null,
         addressUrls: [],
         deptCircularPage: {},
+        showFlag:false,
         date: {
           year: dayjs().format('YYYY'),
           month: dayjs().format('MM'),
@@ -404,6 +405,9 @@
           .toPromise()
           .then((response) => {
             for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].creator == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               if (response.records[i].completedQuantity) {
                 response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
               }

src/views/home/right-top.vue

@@ -31,7 +31,7 @@ export default {
     };
   },
   watch:{
-    crklistData(res){
+    crklistData(res){debugger
       console.log('rightyop')
       console.log(res)
       this.pageflag = true;
@@ -49,12 +49,12 @@ export default {
       let numList =[]
       let numList2 =[]
       for(let i = 0;i<res.ck.length;i++){
-        if(i>ct) break
+        // if(i>ct) break
         dateList.push(res.ck[i].name)
         numList.push(Number(res.ck[i].count))
       }
       for(let i = 0;i<res.rk.length;i++){
-        if(i>ct) break
+        // if(i>ct) break
         numList2.push(Number(res.rk[i].count))
       }
        this.init(dateList, numList,numList2)

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -52,7 +52,7 @@
       <el-table-column label="操作" width="500">
         <template slot-scope="scope">
           <el-button size="mini" @click="newAcquisition(scope.$index, scope.row,'查看')">查看</el-button>
-          <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回'" size="mini" @click="withdraw(scope.row)">撤回</el-button>
+          <el-button v-show="scope.row.showFlag" v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回'" size="mini" @click="withdraw(scope.row)">撤回</el-button>
           <el-button v-if="scope.row.status!='审核中' || scope.row.approveStatus =='发起人撤回' " size="mini" @click="newAcquisition(scope.$index, scope.row,'编辑')"
             v-hasPermission=" `acquisitionManagement.acquisitionCustomer.edit`">编辑</el-button>
           <el-button v-if="scope.row.status=='审核中'" size="mini" :disabled="!scope.row.taskId"
@@ -97,6 +97,7 @@
         compId: '',
         accountName: '',
         tableData: [],
+        showFlag:false,
         selectVal: '',
         goodsNameList: [],
         warehouseList: [],
@@ -258,6 +259,9 @@
           .then(response => {
             for (let i = 0; i < response.records.length; i++) {
               this.goodsNameList.push(response.records[i].goodsName)
+              if(response.records[i].createUserId == localStorage.getItem('ws-pf_userId')){
+                response.records[i].showFlag = true
+              }
             }
             this.tableData = response.records
             this.deptBudgetTotal = response.total

src/views/houseSelfCollect/component/routers/route.js

@@ -1,245 +1,245 @@
 import Layout from '@/layout/index';
 
 const houseSelfCollectRouter = {
-  path: '/houseSelfCollect',
-  component: Layout,
-  redirect: '/houseSelfCollect',
-  name: 'houseSelfCollect',
-  alwaysShow: true, // will always show the root menu
-  meta: {
-    title: 'houseSelfCollect',
-    module: 'acquisitionManagement',
-    icon: '-a-4-shougoubeifen'
-  },
-  children: [
-    // 客户管理
-    {
-      path: 'customerManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagement'),
-      name: 'customerManagement',
-      meta: {
-        title: 'customerManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionCustomer.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'入库管理客户管理'
-      }
+    path: '/houseSelfCollect',
+    component: Layout,
+    redirect: '/houseSelfCollect',
+    name: 'houseSelfCollect',
+    alwaysShow: true, // will always show the root menu
+    meta: {
+        title: 'houseSelfCollect',
+        module: 'acquisitionManagement',
+        icon: '-a-4-shougoubeifen'
     },
+    children: [
+        // 客户管理
+        {
+            path: 'customerManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagement'),
+            name: 'customerManagement',
+            meta: {
+                title: 'customerManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionCustomer.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '入库管理客户管理'
+            }
+        },
         //客户管理添加
         {
-          path: 'customerManagementAdd',
-          component: () =>
-            import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagementAdd'),
-          name: 'customerManagementAdd',
-          meta: {
-            title: 'customerManagementAdd',
-            shortcutEntrance: 'houseSelfCollect',
-            module: 'acquisitionManagement.acquisitionCustomer.add',
-            permissicon: [],
-            keepAlive: true,
-            _title:'客户管理添加'
-          },
-          hidden: true
+            path: 'customerManagementAdd',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagementAdd'),
+            name: 'customerManagementAdd',
+            meta: {
+                title: 'customerManagementAdd',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionCustomer.add',
+                permissicon: [],
+                keepAlive: true,
+                _title: '客户管理添加'
+            },
+            hidden: true
+        },
+        //收购管理
+        {
+            path: 'acquisitionManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagement'),
+            name: 'acquisitionManagement',
+            meta: {
+                title: 'acquisitionManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisition.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '入库管理仓库设置'
+            }
+        },
+        //收购新增
+        {
+            path: 'acquisitionManagementAdd',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagementAdd'),
+            name: 'acquisitionManagementAdd',
+            meta: {
+                title: 'acquisitionManagementAdd',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisition.add',
+                permissicon: [],
+                keepAlive: true,
+                _title: '收购管理新增'
+            },
+            hidden: true
+        },
+        // // 质检管理
+        // {
+        //   path: 'inspectionManagement',
+        //   component: () =>
+        //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagement'),
+        //   name: 'inspectionManagement',
+        //   meta: {
+        //     title: 'inspectionManagement',
+        //     shortcutEntrance: 'houseSelfCollect',
+        //     module: 'acquisitionManagement.acquisitionQuality.view',
+        //     permissicon: [],
+        //     keepAlive: true
+        //   }
+        // },
+        // // 质检管理记录
+        {
+            path: 'inspectionManagementrecord',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementrecord'),
+            name: 'inspectionManagementrecord',
+            meta: {
+                title: 'inspectionManagementrecord',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                _title: '质检管理记录'
+                    // keepAlive:true
+            },
+            hidden: true
+        },
+        {
+            path: 'inspectionManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementNew'),
+            name: 'inspectionManagementNew',
+            meta: {
+                title: 'inspectionManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                _title: '入库管理质检管理'
+                    // keepAlive:true
+            }
+        },
+        // // 检斤管理
+        // {
+        //   path: 'weighingManagement',
+        //   component: () =>
+        //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weighingManagement'),
+        //   name: 'weighingManagement',
+        //   meta: {
+        //     title: 'weighingManagement',
+        //     shortcutEntrance: 'houseSelfCollect',
+        //     module: 'acquisitionManagement.acquisitionWeight.view',
+        //     permissicon: [],
+        //     keepAlive: true
+        //   }
+        // },
+        // 新检斤管理
+        {
+            path: 'newWeighingManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/newWeighingManagement'),
+            name: 'newWeighingManagement',
+            meta: {
+                title: 'newWeighingManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionWeight.view',
+                permissicon: [],
+                _title: '入库管理检斤管理',
+                keepAlive: false
+            }
+        },
+        // 付款管理
+        {
+            path: 'paymentManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/paymentManagement'),
+            name: 'paymentManagement',
+            meta: {
+                title: 'paymentManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionPay',
+                permissicon: [],
+                _title: '付款管理'
+                    // keepAlive: true
+            }
+        },
+        {
+            path: 'settlement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/settlement'),
+            name: 'settlement',
+            meta: {
+                title: 'settlement',
+                shortcutEntrance: 'settlement',
+                module: 'acquisitionManagement.acquisitionPay.view',
+                permissicon: [],
+                keepAlive: false,
+                _title: '入库管理结算'
+            },
+            hidden: true
+        },
+        {
+            path: 'inspectInfolook',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfoLook'),
+            name: 'inspectInfo',
+            meta: {
+                title: 'inspectInfo',
+                shortcutEntrance: 'inspectInfo',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '查看质检信息'
+            },
+            hidden: true
+        },
+        {
+            path: 'inspectInfo',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfo'),
+            name: 'inspectInfo',
+            meta: {
+                title: 'inspectInfo',
+                shortcutEntrance: 'inspectInfo',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '质检信息'
+            },
+            hidden: true
+        },
+        {
+            path: 'weightCheck',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheck'),
+            name: 'weightCheck',
+            meta: {
+                title: 'weightCheck',
+                shortcutEntrance: 'weightCheck',
+                module: 'acquisitionManagement.acquisitionWeight.view',
+                permissicon: [],
+                keepAlive: true
+            },
+            hidden: true
         },
-    //收购管理
-    {
-      path: 'acquisitionManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagement'),
-      name: 'acquisitionManagement',
-      meta: {
-        title: 'acquisitionManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisition.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'入库管理仓库设置'
-      }
-    },
-    //收购新增
-    {
-      path: 'acquisitionManagementAdd',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagementAdd'),
-      name: 'acquisitionManagementAdd',
-      meta: {
-        title: 'acquisitionManagementAdd',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisition.add',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购管理新增'
-      },
-        hidden: true
-    },
-    // // 质检管理
-    // {
-    //   path: 'inspectionManagement',
-    //   component: () =>
-    //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagement'),
-    //   name: 'inspectionManagement',
-    //   meta: {
-    //     title: 'inspectionManagement',
-    //     shortcutEntrance: 'houseSelfCollect',
-    //     module: 'acquisitionManagement.acquisitionQuality.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //   }
-    // },
-    // // 质检管理记录
-    {
-      path: 'inspectionManagementrecord',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementrecord'),
-      name: 'inspectionManagementrecord',
-      meta: {
-        title: 'inspectionManagementrecord',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        _title:'质检管理记录'
-        // keepAlive:true
-      },
-      hidden: true
-    },
-    {
-      path: 'inspectionManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementNew'),
-      name: 'inspectionManagementNew',
-      meta: {
-        title: 'inspectionManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        _title:'入库管理质检管理'
-        // keepAlive:true
-      }
-    },
-    // // 检斤管理
-    // {
-    //   path: 'weighingManagement',
-    //   component: () =>
-    //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weighingManagement'),
-    //   name: 'weighingManagement',
-    //   meta: {
-    //     title: 'weighingManagement',
-    //     shortcutEntrance: 'houseSelfCollect',
-    //     module: 'acquisitionManagement.acquisitionWeight.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //   }
-    // },
-     // 新检斤管理
-     {
-      path: 'newWeighingManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/newWeighingManagement'),
-      name: 'newWeighingManagement',
-      meta: {
-        title: 'newWeighingManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionWeight.view',
-        permissicon: [],
-        _title:'入库管理检斤管理'
-        // keepAlive: true
-      }
-    },
-    // 付款管理
-    {
-      path: 'paymentManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/paymentManagement'),
-      name: 'paymentManagement',
-      meta: {
-        title: 'paymentManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionPay',
-        permissicon: [],
-        _title:'付款管理'
-        // keepAlive: true
-      }
-    },
-    {
-      path: 'settlement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/settlement'),
-      name: 'settlement',
-      meta: {
-        title: 'settlement',
-        shortcutEntrance: 'settlement',
-        module: 'acquisitionManagement.acquisitionPay.view',
-        permissicon: [],
-        keepAlive: false,
-        _title:'入库管理结算'
-      },
-      hidden: true
-    },
-    {
-      path: 'inspectInfolook',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfoLook'),
-      name: 'inspectInfo',
-      meta: {
-        title: 'inspectInfo',
-        shortcutEntrance: 'inspectInfo',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'查看质检信息'
-      },
-      hidden: true
-    },
-    {
-      path: 'inspectInfo',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfo'),
-      name: 'inspectInfo',
-      meta: {
-        title: 'inspectInfo',
-        shortcutEntrance: 'inspectInfo',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'质检信息'
-      },
-      hidden: true
-    },
-    {
-      path: 'weightCheck',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheck'),
-      name: 'weightCheck',
-      meta: {
-        title: 'weightCheck',
-        shortcutEntrance: 'weightCheck',
-        module: 'acquisitionManagement.acquisitionWeight.view',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden: true
-    },
 
-    // 记录
-    {
-      path: 'weightCheckRecord',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheckRecord'),
-      name: 'weightCheckRecord',
-      meta: {
-        title: 'weightCheckRecord',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionWeight.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'检斤管理记录'
-      },
-      hidden: true
-    },
-  ],
+        // 记录
+        {
+            path: 'weightCheckRecord',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheckRecord'),
+            name: 'weightCheckRecord',
+            meta: {
+                title: 'weightCheckRecord',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionWeight.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '检斤管理记录'
+            },
+            hidden: true
+        },
+    ],
 
 };
 
-export default houseSelfCollectRouter;
+export default houseSelfCollectRouter;

src/views/houseSelfCollect/inspectInfo.vue

@@ -113,8 +113,8 @@
             </ws-form-item>
           </ws-info-table>
 
-          <!-- <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div> -->
-          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; </div>
+          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div>
+          <!-- <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; </div> -->
           <ws-info-table>
             <ws-form-item label="等级" span="1" prop="grade">
               <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect" :disabled="disabled"

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -364,12 +364,12 @@
 
               </ws-info-table>
 
-              <!-- <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 <span class="bulu">补录：</span>
+              <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 <span class="bulu">补录：</span>
                 <el-switch v-model="value1"></el-switch>
-              </div> -->
-              <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 
-               
               </div>
+              <!-- <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据  -->
+               
+              <!-- </div> -->
               <ws-info-table v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">
                 <ws-form-item label="等级" span="1" prop="outType">
                   <ws-select v-if='statusTypetext != "复检"' v-model="deptBudgetList.grade"
@@ -1669,6 +1669,78 @@ export default {
     },
     //确认初检信息
     checkOk() {
+      // this.deptBudgetList.warehouseInOutDetail.reWaterContent =
+      //       this.deptBudgetList.reWaterContent
+      //     if (!this.deptBudgetList.reWaterContent) {
+      //       this.$message({
+      //         message: '请输入水分',
+      //         type: 'warning',
+      //       })
+      //       return
+      //     }
+      //     if (isNaN(this.deptBudgetList.reWaterContent)) {
+      //       this.$message({
+      //         message: '水分（%）非数字!',
+      //         type: 'warning',
+      //       })
+      //       return
+      //     }
+      //     if (
+      //       this.deptBudgetList.reWaterContent < 0 ||
+      //       this.deptBudgetList.reWaterContent > 40 ||
+      //       (String(this.deptBudgetList.reWaterContent).indexOf('.') != -1 &&
+      //         String(this.deptBudgetList.reWaterContent).length -
+      //         (String(this.deptBudgetList.reWaterContent).indexOf('.') + 1) >
+      //         2)
+      //     ) {
+      //       this.$message({
+      //         message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
+      //         type: 'warning',
+      //       })
+      //       return
+      //     }
+      //     if(!this.deptBudgetList.waterContent){
+      //       this.deptBudgetList.waterContent =this.deptBudgetList.reWaterContent
+      //        this.deptBudgetList.warehouseInOutDetail.waterContent =this.deptBudgetList.reWaterContent
+      //     }
+      //     //容重
+      //     this.deptBudgetList.warehouseInOutDetail.reBulkDensity =
+      //       this.deptBudgetList.reBulkDensity
+      //     if (!this.deptBudgetList.reBulkDensity) {
+      //       if(this.deptBudgetList.goodsName!='大豆'){
+      //         this.$message({
+      //           message: '请输入容重!',
+      //           type: 'warning',
+      //         })
+      //         return
+      //       }else{
+      //         this.$message({
+      //           message: '请输入蛋白!',
+      //           type: 'warning',
+      //         })
+      //         return
+      //       }
+            
+      //     }
+      //     if (isNaN(this.deptBudgetList.reBulkDensity)) {
+      //       if(this.deptBudgetList.goodsName!='大豆'){
+      //         this.$message({
+      //         message: '容重(克/升)非数字!',
+      //         type: 'warning',
+      //       })
+      //       return
+      //       }else{
+      //         this.$message({
+      //         message: '蛋白非数字!',
+      //         type: 'warning',
+      //       })
+      //       return
+      //       }
+      //     }
+      //     if(!this.deptBudgetList.bulkDensity){
+      //       this.deptBudgetList.bulkDensity =this.deptBudgetList.reBulkDensity
+      //       this.deptBudgetList.warehouseInOutDetail.bulkDensity =this.deptBudgetList.reBulkDensity
+      //     }
       if (!this.deptBudgetList.binNumber) {
         this.$message({
           message: '请选择仓位号',

src/views/houseSelfCollect/paymentManagement.vue

@@ -74,6 +74,13 @@
           v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
         <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出
         </ws-button>
+         <ws-button type="primary" v-show='warehouseName=="丹东港"' @click="generateClick()">生成入库单</ws-button>
+          <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
+          :on-change="importClick" :show-file-list="false"
+          accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+          :auto-upload="false">
+          <ws-button type="primary">导入</ws-button>
+        </el-upload>
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <!-- <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款 -->
         <!-- </ws-button> -->
@@ -84,24 +91,22 @@
         <ws-button type="primary" @click="selectPrint(2)"
           v-hasPermission="`acquisitionManagement.acquisitionPay.yeda`">业务批量打印
         </ws-button>
+        <ws-button type="primary" @click="selectPrint(3)"
+          v-hasPermission="`acquisitionManagement.acquisitionPay.yeda`">身份证银行卡打印
+        </ws-button>
         <ws-button type="primary" @click="agreementPrint()"
           v-hasPermission="`acquisitionManagement.acquisitionPay.dow`">下载结算单
         </ws-button>
         <!-- <el-upload :on-change="importClick" action="" :show-file-list="false" accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" :auto-upload="false"
           v-hasPermission="`acquisitionManagement.acquisitionPay.dow`"><el-button type="primary">导入</el-button>
         </el-upload> -->
-        <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
-          :on-change="importClick" :show-file-list="false"
-          accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-          :auto-upload="false">
-          <ws-button type="primary">导入</ws-button>
-        </el-upload>
         <el-link
           href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E6%94%B6%E8%B4%AD%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF%EF%BC%88%E6%96%B0%EF%BC%89.xlsx"
           style="margin-left: 8px"
         >
           <el-button type="primary">模板下载</el-button>
         </el-link>
+       
       </template>
       <template slot="right"></template>
     </BaseHeaderLayout>
@@ -180,7 +185,7 @@
             " @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">打印</el-button>
           <el-button v-show="
               (scope.row.approveStatus ||
-              (scope.row.status != '待结算' && !scope.row.approveStatus))&&compId=='6a713699e08c4cbc97a87f7648a95e3d'
+              (scope.row.status != '待结算' && !scope.row.approveStatus))&&(compId=='6a713699e08c4cbc97a87f7648a95e3d'||compId=='5d164edcef03476dba6630f86dc96496')
             " @click="printPY(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">三方打印</el-button>
           <el-button v-show="
               scope.row.approveStatus ||
@@ -281,6 +286,7 @@
           <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
           <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
           <el-button type="primary" @click="printBig">打印单据</el-button>
+          <el-button type="primary" @click="printExtra">打印额外单据</el-button>
         </div>
       </el-dialog>
     </div>
@@ -363,6 +369,56 @@
         <el-button type="primary" @click="invoicingconfirm">确 定</el-button>
       </span>
     </el-dialog>
+    <div class="mask1" v-show="isShowPrintType1"></div>
+    <div class="print-type1" v-show="isShowPrintType1">
+      <div class="print-type-content">
+        <div class="print-type-title">请选择打印纸张类型</div>
+        <div class="print-type-checkbox">
+          <!-- <el-radio-group v-model="radio">
+            <el-radio label="A4" class="label-width" @change="selectType">A4</el-radio>
+            <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
+          </el-radio-group> -->
+        </div>
+
+        <div class="shdw-style1" v-if="checked||(!ddchecked&&!checked)">
+          <div>收货单位：</div>
+          <!-- <div>{{companyName}}</div> -->
+          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
+            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="warehouseName1=='鲅鱼圈金信库'||warehouseName1=='白城内陆港'||warehouseName1=='杜尔伯特家禾库'||warehouseName1=='洮南新友谊兴旺库'||warehouseName1=='甘南宏旗库'||warehouseName1=='哈尔滨依兰库'||warehouseName1=='山东园丰库'">
+          <div class="print-type-ew">
+            <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
+            <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
+          </div>
+          <div class="ew-print" v-if="printSeparately">
+            <div class="row">
+              <div>额外客户姓名：</div>
+              <!-- <div>{{companyName}}</div> -->
+              <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <div class="row">
+              <div>额外收货单位：</div>
+              <!-- <div>{{companyNameEW}}</div> -->
+              <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bottom-btn">
+        <el-button @click="printBig1">确定</el-button>
+        <el-button @click="typePrintCannelClick1">取消</el-button>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -383,13 +439,14 @@
     getpaymentexamine,
     getCustomerLook,
     paymentCommit,
-    getJurisdiction,
+    dandongOrder,
     invoicing,
     export1,
     settlementEdit,
     workflowcontent,
     suspendinstance,
     importWord,
+    getPrint,
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle,
@@ -448,6 +505,7 @@
         },
         row: {},
         isShowPrintType: false,
+        isShowPrintType1:false,
         customerList: {
           customerName: '',
           customerNumberCard: '',
@@ -470,6 +528,7 @@
         warehouseList: [],
         warehouseNameKey: '',
         warehouseName: '',
+        warehouseName1:'',
         isShowPrint: false,
         invoicingshow: false,
         printData: {},
@@ -503,7 +562,84 @@
         goodNames: [],
         goodsName: '',
         printTips:'',
-        compId:''
+        compId:'',
+        ddchecked: false,
+        checked: false,
+        ewCustomerOptions: [{
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '厦门建发物产有限公司',
+          label: '厦门建发物产有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        }, {
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        }, {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }],
+        companyNameOptions: [{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        }, {
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        }, {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }],
+        companyNameEWOptions: [{
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '厦门建发物产有限公司',
+          label: '厦门建发物产有限公司'
+        }],
+        companyName: '黑龙江中天昊元贸易有限公司',
+        companyNameEW: '厦门建发物产有限公司',
+        ewCustomer: '黑龙江利润元粮食贸易有限公司',
+        printSeparately:false,
+        onePrint:false,
+        dialogDataList:[]
       }
     },
     mounted() {
@@ -515,6 +651,137 @@
       this.getWarehouse()
       this.compId=localStorage.getItem('ws-pf_compId')
       localStorage.setItem('pengyuPrint', false)
+      if(localStorage.getItem('compNameoptions')){
+        var company=JSON.parse(localStorage.getItem('compNameoptions'))
+        
+        var extra=company.filter((item)=>{
+          return item!='黑龙江中天昊元贸易有限公司'
+          &&item!='黑龙江利润元粮食贸易有限公司'
+          &&item!= '黑龙江众利合粮食贸易有限公司'
+          &&item!='黑龙江鑫满仓粮食贸易有限公司'
+          &&item!='黑龙江谷香粮食贸易有限公司'
+          &&item!='黑龙江秋收有限公司'
+          &&item!= '黑龙江欣洋粮食贸易有限公司'
+          &&item!='黑龙江益储益运粮食贸易有限公司'
+          &&item!='黑龙江启兴粮食贸易有限公司'
+        })
+        if(extra.length>0){
+          this.companyNameOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+        
+          this.ewCustomerOptions= [
+          {
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+          this.companyNameEWOptions=[
+          {
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+           if(localStorage.getItem('print_company_name')){
+            this.companyName=localStorage.getItem('print_company_name')
+          }else{
+            this.companyName=extra[0]
+          }
+          if(localStorage.getItem('print_company_name_ew')){
+            this.companyNameEW=localStorage.getItem('print_company_name_ew')
+          }else{
+            this.companyNameEW=extra[0]
+          }
+          if(localStorage.getItem('print_customer_name_ew')){
+            this.ewCustomer=localStorage.getItem('print_customer_name_ew')
+          }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]})
+            this.companyNameEWOptions.push({value: extra[i],label:extra[i]})
+          }
+        }
+      }
     },
     // activated() {
     //   this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
@@ -530,6 +797,82 @@
       })
     },
     methods: {
+      changeEw(e) {
+        this.ddchecked = false
+        if (e) {
+          this.printSeparately = true
+        } else {
+          this.printSeparately = false
+        }
+      },
+      changeEwDD(e) {
+        this.checked = false
+        if (e) {
+          this.printSeparately = true
+        } else {
+          this.printSeparately = false
+        }
+      },
+      makeEWjjSelectPrintList() {
+        let _selectPrint_EWjjSelectPrintList = JSON.parse(JSON.stringify(this.jjSelectPrintList));
+        for (let i = 0; i < _selectPrint_EWjjSelectPrintList.length; i++) {
+          let _data = _selectPrint_EWjjSelectPrintList[i];
+          _data.compName = this.companyNameEW;
+          _data.customer = this.ewCustomer
+        }
+        localStorage.setItem('selectPrint_EWjjSelectPrintList', JSON.stringify(_selectPrint_EWjjSelectPrintList))
+      },
+      printBig1(type, radioType) {
+        this.printData.extra1=true
+        localStorage.setItem('print_company_name',this.companyName)
+        localStorage.setItem('print_company_name_ew',this.companyNameEW)
+        localStorage.setItem('print_customer_name_ew',this.ewCustomer)
+           localStorage.removeItem('print_in_data')
+        // 打印额外
+        if (this.checked || this.ddchecked) {
+          this.printData.extra2=true
+          if(this.ddchecked){
+            localStorage.setItem('print_alone_extra',true)
+          }else{
+            localStorage.setItem('print_alone_extra',false)
+          }
+          //  this.selectEW = true;
+        }else{
+          this.printData.extra2=false
+        }
+        let _list1 = []
+        let _list2 = []
+        
+          localStorage.setItem('printData1',_list1)
+          _list1 = JSON.stringify(this.printData)
+          _list2 = JSON.stringify(this.customerList)
+          localStorage.setItem('print_pay_data',_list1)
+            window.open(
+              '../../../../../static/payprint1.html?type=2&customerList=' +
+              _list2 +
+              '&printTypeList=' +
+              this.ruleForm.type,
+              '结算凭证'
+            )
+        // if (type == 1) {
+        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
+        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
+        //     .checked + '&selectEWDD=' + this.ddchecked)
+        // } else if (type == 2) {
+        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
+        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
+        // } else {
+        //   console.log(this.dialogDataList)
+          
+        //   localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+        //   // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+        //   window.open('../../../../static/weightCheck.html?type=2&tableData=' )
+        // }
+      },
+      typePrintCannelClick1() {
+        this.dialogDataList = [] //打个打印取消时数组至空
+        this.isShowPrintType1= false
+      },
       goodsNameChange(e) {
         if(e.indexOf('全部货名')!=-1){
           this.multipleLimit=1
@@ -736,10 +1079,32 @@
       selectPrint(num) {
         if(num == 2){
           this.printTips = 2
+        }else if(num==3){
+          this.printTips = 3
         }
         this.printType = 1
         this.isShowPrintType = true
       },
+      generateClick() {
+          this.$confirm(`确定生成入库单？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+              dandongOrder({}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '生成入库单成功',
+                })
+                this.getList()
+						})
+          })
+          .catch(() => {
+            return false
+          })
+      },
       agreementPrint() {
         var arr = []
         for (let i = 0; i < this.modification.length; i++) {
@@ -1055,45 +1420,52 @@
               // })
           }
         } else {
-          let _url1 = process.env.VUE_APP_BASE_API + '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo'
-          let _url2 = process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo'
-          this.$axios.all([
-            this.$axios.get(_url1, {
-              params: {
-                id: this.rowData.identityId,
-                authenticationStatusKey: 7,
-              }
-            }).then(res => res.data),
-            this.$axios.get(_url2, {
-              params: {
-                id: this.rowData.id
-              }
-            }).then(res => res.data)
-          ]).then(
-            this.$axios.spread((val1, val2) => {
-              // val 是数组中每个接口返回的值 res.data
-              console.log('两个接口全部加载完成', val1, val2);
-              this.printData = val2.data
-              console.log(this.printData)
-              if (val2.data.compName == '黑龙江秋收有限公司') {
-                this.printData.compName = '黑龙江中天昊元贸易有限公司'
-              }
-              this.isShowPrint = true
-              // if(this.printData.solidGrainPrice){
-              //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
-              // }
-              let date = new Date()
-              this.printData.currentTime =
-                date.getFullYear() +
-                '年' +
-                Number(date.getMonth() + 1) +
-                '月' +
-                date.getDate() +
-                '日'
-            })
-          ).catch(err => {
-            console.log(err);
-          })
+          await getpaymentexamine({
+                    id: this.rowData.id,
+                  })
+                  .toPromise()
+                  .then((response) => {
+                    this.printData = response
+                    console.log(this.printData)
+                    if (response.compName == '黑龙江秋收有限公司') {
+                      this.printData.compName = '黑龙江中天昊元贸易有限公司'
+                    }
+                    this.isShowPrint = true
+                    // if(this.printData.solidGrainPrice){
+                    //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
+                    // }
+                    let date = new Date()
+                    this.printData.currentTime =
+                      date.getFullYear() +
+                      '年' +
+                      Number(date.getMonth() + 1) +
+                      '月' +
+                      date.getDate() +
+                      '日'
+                  })
+          // let _url1 = process.env.VUE_APP_BASE_API + '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo'
+          // let _url2 = process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo'
+          // this.$axios.all([
+          //   this.$axios.get(_url1, {
+          //     params: {
+          //       id: this.rowData.identityId,
+          //       authenticationStatusKey: 7,
+          //     }
+          //   }).then(res => res.data),
+          //   this.$axios.get(_url2, {
+          //     params: {
+          //       id: this.rowData.id
+          //     }
+          //   }).then(res => res.data)
+          // ]).then(
+          //   this.$axios.spread((val1, val2) => {
+          //     // val 是数组中每个接口返回的值 res.data
+          //     console.log('两个接口全部加载完成', val1, val2);
+              
+            // })
+          // ).catch(err => {
+          //   console.log(err);
+          // })
           // getCustomerLook({
           //     id: this.rowData.identityId,
           //     authenticationStatusKey: 7,
@@ -1258,6 +1630,10 @@
           JSON.stringify(this.printData)
         )
       },
+      printExtra(){
+        this.isShowPrint=false
+        this.isShowPrintType1=true
+      },
       printBig() {
         let _list1 = []
         let _list2 = []
@@ -1319,7 +1695,15 @@
               this.ruleForm.type,
               '结算凭证'
             )
-          }else{
+          } else if(this.printTips == 3){
+            window.open(
+              '../../../../../static/payprint3.html?type=2&customerList=' +
+              _list2 +
+              '&printTypeList=' +
+              this.ruleForm.type,
+              '结算凭证'
+            )
+          } else{
             window.open(
               '../../../../../static/payprint1.html?type=2&customerList=' +
               _list2 +
@@ -1659,6 +2043,7 @@
         localStorage.setItem('cwprint', true)
       },
       print(row) {
+        this.warehouseName1=row.warehouseName
       localStorage.setItem('pengyuPrint', false)
         this.printType = 2
         localStorage.setItem('cwprint', false)
@@ -2016,4 +2401,72 @@
     border-top-right-radius: 0px;
     border-bottom-right-radius: 0px;
   }
+  .mask1 {
+    background: black;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    z-index: 1001;
+    opacity: 0.3;
+  }
+
+  .print-type-title1 {
+    text-align: center;
+    font-size: 18px;
+    margin: 20px;
+  }
+
+
+  .print-type-checkbox1 {
+    // padding-left: 20px;
+  }
+
+  .print-type1 {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 440px;
+    height: 320px;
+    background: white;
+    border-radius: 10px;
+    z-index: 1001;
+  }
+  .shdw-style1 {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+    margin-top: 20px;
+  }
+  .print-type-ew {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 20px;
+
+    /deep/.el-radio__label {
+      font-size: 14px;
+    }
+
+    margin-top: 10px;
+  }
+  .ew-print {
+    padding: 0 20px;
+    margin-top: 10px;
+
+    // display: flex;
+    // justify-content: space-between;
+    // align-content: center;
+    .row {
+      display: flex;
+      margin-top: 10px;
+      align-items: center;
+    }
+  }
+  // /deep/.el-select-dropdown{
+  //   z-index:2036;
+  // }
 </style>

src/views/houseSelfCollect/settlement.vue

@@ -383,11 +383,11 @@
         })
       },
       printSmall() {
-        window.open('../../../../../static/payprint.html?type=1&dataList=' + JSON.stringify(this.printData))
+        window.open('../../../../../static/payprint1.html?type=1&dataList=' + JSON.stringify(this.printData))
       },
       printBig() {
         localStorage.setItem('print_pay_data',JSON.stringify(this.printData))
-        window.open('../../../../../static/payprint.html?type=2')
+        window.open('../../../../../static/payprint1.html?type=2')
       },
       getList() {
         getpaymentexamine({
@@ -397,21 +397,24 @@
           if (!this.paymentList.unitDeduction) {
             this.paymentList.unitDeduction = 0
           }
+          if(this.paymentList.warehouseName =='杜尔伯特家禾库' && this.types == 1){
+            this.paymentList.unloadDeduction = (Number(this.paymentList.netWeight)/1000*5).toFixed(0)
+          }
           let compIdTmp  = localStorage.getItem('ws-pf_compId')
-          //白城市鹏羽粮食贸易有限公司 扣重比1.25 干粮水分15
-          if(compIdTmp == '6a713699e08c4cbc97a87f7648a95e3d'){
+          //白城市鹏羽粮食贸易有限公司 扣重比1.25 干粮水分14.5
+          if(compIdTmp == '6a713699e08c4cbc97a87f7648a95e3d' || compIdTmp == '5d164edcef03476dba6630f86dc96496'){
             // this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
             this.paymentList.buckleWeightRatio = 1.25
             this.ganwater = 14.5
             this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
             if (this.paymentList.qualityInspectionManagement.paramType == '2') {
               this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList
-                  .qualityInspectionManagement.waterContent - 15) *
+                  .qualityInspectionManagement.waterContent - this.ganwater) *
                 this.paymentList.buckleWeightRatio
               this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList
-                .qualityInspectionManagement.weightDeduction.toFixed(2)
+                .qualityInspectionManagement.weightDeduction.toFixed(5)
               this.paymentList.base = (100 - this.paymentList.qualityInspectionManagement.weightDeduction) / 100
-              this.paymentList.base = this.paymentList.base.toFixed(3)
+              this.paymentList.base = this.paymentList.base.toFixed(5)
               if (this.paymentList.type == '潮粮') {
                 if(this.paymentList.base > 1){
                   this.paymentList.base = 1

src/views/houseSelfCollect/weighingManagement.vue

@@ -136,7 +136,7 @@
         <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
           <div>收货单位：</div>
           <!-- <div>{{companyName}}</div> -->
-          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;" v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;" v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
             <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
           <el-select v-model="companyName1" placeholder="请选择" style="width: 75%;" v-else>
@@ -144,7 +144,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -550,7 +550,7 @@
                 this.dialogDataList.push(_datas)
              }else{
               // this.dialogData.compName = this.companyName
-               if(this.warehouseName == '白城内陆港' || this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库'){
+               if(this.warehouseName == '白城内陆港' || this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库'|| this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库'){
                  this.dialogData.companyName = this.companyName
                }else{
                  this.dialogData.companyName = this.companyName1

src/views/houseSelfCollect/weightCheck.vue

@@ -200,7 +200,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||this.warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='哈尔滨依兰库'||this.warehouseName=='山东园丰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -74,12 +74,13 @@
         <el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
         <el-table-column prop="grossDate" label="检斤时间"></el-table-column>
         <el-table-column prop="status" label="状态"></el-table-column>
-        <el-table-column label="操作" min-width="170">
+        <el-table-column label="操作" min-width="300">
           <template scope="scope">
             <!-- <el-button size="small" @click="print(scope.row)">打印</el-button> -->
             <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' || scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
             <el-button @click="backInfo(scope.row)" v-if="scope.row.status == '已称皮重'">退回</el-button>
             <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称毛重'">换仓</el-button>
+            <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeNo(scope.row)" v-if="scope.row.status == '已称毛重'">换任务号</el-button>
             <el-button @click="deleteInfo(scope.row)" v-if="scope.row.status == '已称毛重'">删除</el-button>
           </template>
         </el-table-column>
@@ -110,7 +111,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -166,6 +167,31 @@
             <el-button type="primary" @click="dialogVisibleconfirm">确 定</el-button>
           </span>
         </el-dialog>
+         <el-dialog
+          title="提示"
+          :visible.sync="dialogVisible1"
+          width="30%"
+          :before-close="handleClose1">
+          <div style="text-align:center">
+            <el-form ref="form" label-width="110px">
+              <el-form-item label="任务编号">
+             <el-select filterable clearable v-model="inOutTaskNo" placeholder="请选择任务号" class="typeselect"
+              @change="taskNoChange">
+              <el-option v-for="item in taskNolist" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
+                :value="item.inOutTaskNo" />
+            </el-select>
+            </el-form-item>
+           <el-form-item label="合同编号">
+            <el-input v-model="contractNo" placeholder="合同编号" :disabled="disabled" maxlength="15">
+            </el-input>
+             </el-form-item>
+         </el-form>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible1 = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisibleconfirm1">确 定</el-button>
+          </span>
+        </el-dialog>
   </div>
 </template>
 <script>
@@ -175,9 +201,13 @@
     getPrint,
     returnInfo,
     changeNo,
+    changeTaskNo,
     importWordYk,
     getweighingDelete
   } from '@/model/houseSelfCollect/index'
+   import {
+    getReceiptTaskNo,
+  } from '@/model/warehouse/index'
   import {
     getcomp
   } from '@/model/indexRx'
@@ -254,8 +284,13 @@
         isShowPrint: false,
         dialogData: {},
         title: '',
+        disabled: true,
+        taskflag:2,
         modification: [],
         ewCustomerOptions: [{
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
           value: '黑龙江中天昊元贸易有限公司',
           label: '黑龙江中天昊元贸易有限公司'
         }, {
@@ -315,6 +350,9 @@
           label: '黑龙江启兴粮食贸易有限公司'
         }],
         companyNameEWOptions: [{
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         }],
@@ -332,9 +370,14 @@
         startDate:'',
         endDate:'',
         dialogVisible:false,
+        dialogVisible1:false,
         binNumber:'',
         binnumberList:[],
+        taskNolist:[],
         cangweiNum:'',
+        contractNum:'',
+        inOutTaskNo:'',
+        contractNo:'',
         positionId:'',
         warehouseInOutDetail:{},
       }
@@ -344,6 +387,7 @@
       console.log(localStorage.getItem('compNameoptions'))
       if(localStorage.getItem('compNameoptions')){
         var company=JSON.parse(localStorage.getItem('compNameoptions'))
+        
         var extra=company.filter((item)=>{
           return item!='黑龙江中天昊元贸易有限公司'
           &&item!='黑龙江利润元粮食贸易有限公司'
@@ -356,12 +400,114 @@
           &&item!='黑龙江启兴粮食贸易有限公司'
         })
         if(extra.length>0){
-          this.ewCustomerOptions=[]
-          this.companyNameOptions=[]
-          this.companyNameEWOptions=[]
-          this.companyName=extra[0]
-          this.companyNameEW=extra[0]
-          this.ewCustomer=extra[0]
+          this.companyNameOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+          this.ewCustomerOptions= [
+          {
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+          this.companyNameEWOptions=[
+          {
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+           if(localStorage.getItem('print_company_name')){
+            this.companyName=localStorage.getItem('print_company_name')
+          }else{
+            this.companyName=extra[0]
+          }
+          if(localStorage.getItem('print_company_name_ew')){
+            this.companyNameEW=localStorage.getItem('print_company_name_ew')
+          }else{
+            this.companyNameEW=extra[0]
+          }
+          if(localStorage.getItem('print_customer_name_ew')){
+            this.ewCustomer=localStorage.getItem('print_customer_name_ew')
+          }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]})
@@ -502,9 +648,26 @@
           }
         }
       },
+      taskNoChange(e){
+        this.inOutTaskNo = e
+        for(let i = 0 ; i < this.taskNolist.length ; i++){
+          if(this.inOutTaskNo == this.taskNolist[i].inOutTaskNo){
+            if(this.taskNolist[i].contractNo){
+              this.contractNo = this.taskNolist[i].contractNo
+            }
+            else{
+              this.contractNo = this.taskNolist[i].moveTaskNo
+            }
+          }
+        }
+      },
       handleClose(){
         this.dialogVisible = false
       },
+      handleClose1(){
+        this.inOutTaskNo=''
+        this.dialogVisible1 = false
+      },
       dialogVisibleconfirm(){
         if(this.binNumber == this.cangweiNum){
           this.$message.error('已是该仓位无需修改')
@@ -532,7 +695,32 @@
             return false
           })
       },
-      
+      dialogVisibleconfirm1(){
+        if(this.contractNo == this.contractNum){
+          this.$message.error('已是该任务号无需修改')
+          return
+        }
+        this.$confirm(`确定修改任务号？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+              changeTaskNo({id:this.id,inOutTaskNo:this.inOutTaskNo,contractNo:this.contractNo}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '修改任务号成功',
+                })
+                this.getList()
+                this.inOutTaskNo=''
+                this.dialogVisible1=false
+						})
+          })
+          .catch(() => {
+            return false
+          })
+      },
         exchange(row){
           for(let i = 0 ; i < this.warehouseList.length; i++ ){
             if(this.warehouseName == this.warehouseList[i].warehouseName){
@@ -544,6 +732,25 @@
             this.cangweiNum = row.binNumber
             this.dialogVisible = true
        },
+       exchangeNo(row){
+        if (row.serviceManagementType == 1) {
+            this.taskflag=2
+          } else {
+            this.taskflag=3
+          }
+          getReceiptTaskNo({
+            flag: this.taskflag,
+            warehouseName: this.warehouseName,
+          })
+          .toPromise()
+          .then((response) => {
+            this.taskNolist = response
+          })
+            this.id = row.id
+            this.contractNo = row.contractNo
+            this.contractNum = row.contractNo
+            this.dialogVisible1 = true
+       },
        backInfo(row){
            this.$confirm('确定要退回该信息？', '提示', {
             confirmButtonText: '确定',
@@ -668,6 +875,9 @@
         this.$router.go(-1)
       },
       async typePrintClick(type) {
+        localStorage.setItem('print_company_name',this.companyName)
+        localStorage.setItem('print_company_name_ew',this.companyNameEW)
+        localStorage.setItem('print_customer_name_ew',this.ewCustomer)
         if (this.onePrint) { //判断是否是单个打印
           getPrint({
               id: this.idPrint
@@ -678,6 +888,8 @@
               this.dialogData = response
               if (response.compName == '黑龙江秋收有限公司') {
                 this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+              }else{
+                this.dialogData.compName = this.companyName
               }
               if (this.checked) {
                 if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
@@ -695,7 +907,7 @@
                 _datas.customer = this.ewCustomer
                 this.dialogDataList.push(_datas)
               } else {
-                this.dialogData.companyName = this.companyName
+                this.dialogData.compName = this.companyName
                 if(this.dialogData&&this.dialogData.contractManagement&& this.warehousingType != 3){
                   this.dialogData.customer = this.dialogData.contractManagement.seller
                 }
@@ -770,7 +982,7 @@
             return
           }
           for (let _num = 0; _num < this.modification.length; _num++) {
-            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
               if (this.modification[_num].seller && this.modification[_num].buyer) {
                 let cang = {}
                 cang.value = this.modification[_num].seller
@@ -789,7 +1001,7 @@
           }
           this.isShowPrintType = true
         } else {
-          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
             if (row.seller && row.buyer) {
               let cang = {}
               cang.value = row.seller
@@ -832,7 +1044,8 @@
           console.log(this.dialogDataList)
           
           localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+          // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+          window.open('../../../../static/weightCheck.html?type=2&tableData=' )
         }
       },
       warehouseNameChange() {

src/views/outboundManagement/weighingManagementNew.vue

@@ -347,7 +347,7 @@
             </el-select>
           </div>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -657,9 +657,94 @@
           &&item!='黑龙江启兴粮食贸易有限公司'
         })
         if(extra.length>0){
-          this.ewCustomerOptions=[]
-          this.companyNameOptions=[]
-          this.companyNameEWOptions=[]
+          this.companyNameOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+        
+          this.ewCustomerOptions= [
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+          this.companyNameEWOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
           this.companyName=extra[0]
           this.companyNameEW=extra[0]
           this.ewCustomer=extra[0]
@@ -1177,7 +1262,7 @@
             // this.weighingList.carNo =
               // response.qualityInspectionManagement.carNumber
         this.$set(this.weighingList,'carNo', response.qualityInspectionManagement.carNumber)
-        if(this.weighingList.inOutType=='移库出库'&&this.tpyeNo == 2){
+        if(this.tpyeNo == 2){
           this.options2=[]
           this.options2.push({id:this.weighingList.carId,carNo:this.weighingList.carNo, tranCarNo:this.weighingList.tranCarNo,tranPrice:this.weighingList.freight })
         }
@@ -1584,7 +1669,8 @@
                         this
                         .warehouseName == '哈尔滨依兰库' || this
                         .warehouseName == '白城内陆港'|| this
-                        .warehouseName == '山东园丰库'){
+                        .warehouseName == '山东园丰库'|| this
+                        .warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库'){
                           if(this.weighingList.contractManagement){
                             let cang = {}
                             cang.value = this.weighingList.contractManagement.seller
@@ -1666,7 +1752,8 @@
                         this
                         .warehouseName == '哈尔滨依兰库' || this
                         .warehouseName == '白城内陆港'|| this
-                        .warehouseName == '山东园丰库'){
+                        .warehouseName == '山东园丰库'|| this
+                        .warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库'){
                           this.weighingList = response
                       this.inspect = JSON.parse(
                         JSON.stringify(this.weighingList)

src/views/outboundManagement/weighingManagementrecord.vue

@@ -79,7 +79,7 @@
         </template>
       </el-table-column> -->
       <el-table-column prop="status" label="状态"></el-table-column>
-      <el-table-column width="300" prop="contractNo1" label="操作">
+      <el-table-column width="400" prop="contractNo1" label="操作">
         <template slot-scope="scope">
           <!-- <el-button @click="weighing(scope.row, 1)" v-if="scope.row.status != '已质检'"
             v-hasPermission="`outbound.acquisitionWeightOut.mao`">毛重</el-button>
@@ -90,6 +90,7 @@
           <el-button @click="del(scope.row)" v-if="scope.row.status == '已称皮重'"
             v-hasPermission="`outbound.acquisitionWeightOut.view`">删除</el-button>
              <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称皮重'">换仓</el-button>
+             <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeNo(scope.row)" v-if="scope.row.status == '已称皮重'">换任务号</el-button>
              <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="returnBack(scope.row)" v-if="scope.row.status == '已称毛重'">退回</el-button>
         </template>
       </el-table-column>
@@ -124,7 +125,7 @@
             </el-select>
           </div>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -189,6 +190,31 @@
             <el-button type="primary" @click="dialogVisibleconfirm">确 定</el-button>
           </span>
         </el-dialog>
+        <el-dialog
+          title="提示"
+          :visible.sync="dialogVisible1"
+          width="30%"
+          :before-close="handleClose2">
+          <div style="text-align:center">
+            <el-form ref="form" label-width="110px">
+              <el-form-item label="任务编号">
+             <el-select filterable clearable v-model="inOutTaskNo" placeholder="请选择任务号" class="typeselect"
+              @change="taskNoChange">
+              <el-option v-for="item in taskNolist" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
+                :value="item.inOutTaskNo" />
+            </el-select>
+            </el-form-item>
+           <el-form-item label="合同编号">
+            <el-input v-model="contractNo" placeholder="合同编号" :disabled="disabled" maxlength="15">
+            </el-input>
+             </el-form-item>
+         </el-form>
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible1 = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisibleconfirm1">确 定</el-button>
+          </span>
+        </el-dialog>
   </div>
 </template>
 <script>
@@ -198,10 +224,14 @@
     delelteWeighing,
     getweighing,
     changeNo,
+    changeTaskNo,
     importWordSale,
     importWordYk,
     goBack
   } from '@/model/outboundManagement/index'
+  import {
+    getReceiptTaskNo,
+  } from '@/model/warehouse/index'
   import {
     EventBus
   } from 'base-core-lib'
@@ -240,9 +270,15 @@
         addressUrls: [],
         compId: localStorage.getItem('ws-pf_compId'),
         dialogVisible:false,
+        dialogVisible1:false,
         binNumber:'',
+        inOutTaskNo:'',
+        contractNo:'',
+        disabled: true,
         binnumberList:[],
+        taskNolist:[],
         cangweiNum:'',
+        contractNum:'',
         positionId:'',
         warehouseList1:[],
         
@@ -355,9 +391,94 @@
           &&item!='黑龙江启兴粮食贸易有限公司'
         })
         if(extra.length>0){
-          this.ewCustomerOptions=[]
-          this.companyNameOptions=[]
-          this.companyNameEWOptions=[]
+          this.companyNameOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+        
+          this.ewCustomerOptions= [
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+          this.companyNameEWOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
           this.companyName=extra[0]
           this.companyNameEW=extra[0]
           this.ewCustomer=extra[0]
@@ -470,7 +591,7 @@
             return
           }
           for (let _num = 0; _num < this.modification.length; _num++) {
-            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
               if (this.modification[_num].seller && this.modification[_num].buyer) {
                 let cang = {}
                 cang.value = this.modification[_num].seller
@@ -489,7 +610,7 @@
           }
           this.isShowPrintType = true
         } else {
-          if (row.serviceManagementType == '2' && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+          if (row.serviceManagementType == '2' && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库'|| this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
             if (row.seller && row.buyer) {
               let cang = {}
               cang.value = row.seller
@@ -771,9 +892,26 @@
           }
         }
       },
+      taskNoChange(e){
+        this.inOutTaskNo = e
+        for(let i = 0 ; i < this.taskNolist.length ; i++){
+          if(this.inOutTaskNo == this.taskNolist[i].inOutTaskNo){
+            if(this.taskNolist[i].contractNo){
+              this.contractNo = this.taskNolist[i].contractNo
+            }
+            else{
+              this.contractNo = this.taskNolist[i].moveTaskNo
+            }
+          }
+        }
+      },
       handleClose1(){
         this.dialogVisible = false
       },
+      handleClose2(){
+        this.inOutTaskNo=''
+        this.dialogVisible1 = false
+      },
       exchange(row){
           for(let i = 0 ; i < this.warehouseList1.length; i++ ){
             if(this.warehouseName == this.warehouseList1[i].warehouseName){
@@ -785,6 +923,20 @@
             this.cangweiNum = row.binNumber
             this.dialogVisible = true
        },
+       exchangeNo(row){
+          getReceiptTaskNo({
+            flag: 1,
+            warehouseName: this.warehouseName,
+          })
+          .toPromise()
+          .then((response) => {
+            this.taskNolist = response
+          })
+            this.id = row.id
+            this.contractNo = row.contractNo
+            this.contractNum = row.contractNo
+            this.dialogVisible1 = true
+       },
        dialogVisibleconfirm(){
         if(this.binNumber == this.cangweiNum){
           this.$message.error('已是该仓位无需修改')
@@ -805,6 +957,7 @@
                   message: '修改仓位成功',
                 })
                 this.getList()
+                this.inOutTaskNo=''
                 this.dialogVisible=false
 						})
           })
@@ -812,6 +965,31 @@
             return false
           })
       },
+      dialogVisibleconfirm1(){
+        if(this.contractNo == this.contractNum){
+          this.$message.error('已是该任务号无需修改')
+          return
+        }
+        this.$confirm(`确定修改任务号？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+              changeTaskNo({id:this.id,inOutTaskNo:this.inOutTaskNo,contractNo:this.contractNo}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '修改任务号成功',
+                })
+                this.getList()
+                this.dialogVisible1=false
+						})
+          })
+          .catch(() => {
+            return false
+          })
+      },
       warehouseNameChange(e) {
         // this.warehouseName = e
         console.log(this.warehouseList)

src/views/platformAudit/tradeInformation.vue

@@ -25,19 +25,18 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="publisher" label="昵称">
+        <el-table-column width="120" prop="publisher" label="昵称">
         </el-table-column>
         <el-table-column prop="phone" label="账号">
           <template scope="scope">
             {{scope.row.commonUser?scope.row.commonUser.phone:''}}
           </template>
         </el-table-column>
-        <el-table-column prop="placeDelivery" label="交货地/货源地"> </el-table-column>
-        <el-table-column prop="tranType" label="类型"> </el-table-column>
+        <el-table-column prop="placeDelivery" label="交货地/货源地"></el-table-column>
+        <el-table-column width="80" prop="tranType" label="类型"></el-table-column>
         <el-table-column prop="title" label="用户状态">
           <template slot-scope="scope">
-            <el-select  v-model="scope.row.flag" placeholder="" class="statusselect"
-            @change='selectstatuschange($event,scope.row)'>
+            <el-select  v-model="scope.row.flag" placeholder="" class="statusselect" @change='selectstatuschange($event,scope.row)'>
             <el-option label="自动通过" value="自动通过"
               style="color: #8890b1" />
               <el-option label="需审核" value="需审核"
@@ -97,9 +96,11 @@
 
         <el-form-item label="附件" :label-width="formLabelWidth">
           <div v-if="SettledCompanyDynamicsList.address">
-           <div :key="index" v-for="(item, index) in SettledCompanyDynamicsList.address">
+            <ws-upload ref="upload" :comp-id="compId" :appendix-ids="SettledCompanyDynamicsList.address" :editable="false"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+           <!-- <div :key="index" v-for="(item, index) in SettledCompanyDynamicsList.address">
             <img style="float:left" v-if="item" :src="item" class="avatar">
-          </div> 
+          </div>  -->
           </div>
           <div v-else>暂无附件</div>
         </el-form-item>
@@ -246,7 +247,11 @@
           if (this.searchTypeList[i].value == e) {
             if(e=='全部'){
               this.status =''
-            }else{
+            }
+            else if(e=='已通过'){
+              this.status ='审核通过'
+            }
+            else{
               this.status = this.searchTypeList[i].value
             }
             
@@ -264,7 +269,7 @@
           .then((response) => {
             this.SettledCompanyDynamicsList = response
             if (response.urlImg != null) {
-              this.SettledCompanyDynamicsList.address = response.urlImg.split(',')
+              this.SettledCompanyDynamicsList.address = response.urlImg
             }
             this.id = response.id
           })
@@ -597,4 +602,7 @@
     border-top-right-radius: 0px;
     border-bottom-right-radius: 0px;
   }
+/deep/.statusselect{
+  width:100%;
+}
 </style>

src/views/profitable/component/routers/route.js

@@ -434,6 +434,22 @@ const profitableRouter = {
       },
       hidden:true,
     },
+        // 固定资产
+        {
+          path: 'fixedAssets',
+          component: () =>
+            import(/* webpackChunkName: "applDetail" */ '@/views/profitable/fixedAssets'),
+          name: 'fixedAssets',
+          meta: {
+            title: 'fixedAssets',
+            shortcutEntrance: 'profitable',
+            module: 'lirunhesuan.feiyongguanli.view',
+            permissicon: [],
+            keepAlive: true,
+            _title:'固定资产'
+            // module: 'procurement.sparepart.applDetail'
+          }
+        },
 
       // // 收支明细
       // {

src/views/profitable/contractinventory.vue

@@ -56,7 +56,7 @@
     components: {},
     data() {
       return {
-        value: "",
+        value: '',
         tableData: [],
         deptBudgetTotal: 0,
         contractList:[],
@@ -64,10 +64,10 @@
         pageSize: 10,
         deptCircularPage: {},
         taskTypeList:[],
-        searchType:"",
-        searchKeyWord:"",
-        startDate:"",
-        endDate:"",
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
+        endDate:'',
         name:'',
         outtotal:0,
         intotal:0,
@@ -178,7 +178,8 @@
           .then(response => {
             if(response.records.length){
               for (let i = 0; i < response.records.length; i++) {
-                response.records[i].weight=response.records[i].inStorage-response.records[i].removeStorage-response.records[i].saleStorage-response.records[i].loss-response.records[i].surplus
+                response.records[i].weight=Number(response.records[i].inStorage-
+                    response.records[i].removeStorage-response.records[i].saleStorage-response.records[i].loss-response.records[i].surplus).toFixed(3)
               }
             }
             this.tableData = response.records

src/views/profitable/contractprofitsdetails.vue

@@ -174,7 +174,7 @@
     components: {},
     data() {
       return {
-        value: "",
+        value: '',
         tableData: [],
         show:false,
         correlationshow:false,
@@ -183,12 +183,12 @@
         pageSize: 10,
         agreementType:'',
         deptCircularPage: {},
-        searchType:"",
-        searchKeyWord:"",
-        startDate:"",
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
         searchContractType:'',
         searchTypeCon:'',
-        endDate:"",
+        endDate:'',
         outtotal:0,
         intotal:0,
         contractList:[],
@@ -301,23 +301,34 @@
       cost(row){
         this.$router.push({name:'contractcost',query:{contractNo:row.contractNo,contractType:row.contractType,buyer:row.buyer,seller:row.seller}})
       },
-      getPassYearFormatDate () {
-             var _date = new Date()
-            var year1 = _date.getFullYear()
-            var month1 = _date.getMonth() + 1
-            var strDate1 = _date.getDate()
-            if (month1 >= 1 && month1 <= 9) {
-              month1 = '0' + month1
-            }
-            if (strDate1 >= 0 && strDate1 <= 9) {
-              strDate1 = '0' + strDate1
-            }
-            this.startDate = year1 + '-' + (month1-1) +'-' + strDate1
-            this.endDate = year1 + '-' + month1 +'-' + strDate1
-            this.value=[this.startDate,this.endDate]
-            this.getList()
-          // })
-        },
+      getPassYearFormatDate() {
+        var _date = new Date()
+        var nowDate = new Date()
+        nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        var year = nowDate.getFullYear()
+        var year1 = _date.getFullYear()
+        var month = nowDate.getMonth() + 1
+        var month1 = _date.getMonth() + 1
+        var strDate = nowDate.getDate()
+        var strDate1 = _date.getDate()
+        if (month >= 1 && month <= 9) {
+          month = '0' + month
+        }
+        if (month1 >= 1 && month1 <= 9) {
+          month1 = '0' + month1
+        }
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = '0' + strDate
+        }
+        if (strDate1 >= 0 && strDate1 <= 9) {
+          strDate1 = '0' + strDate1
+        }
+        this.startDate = year + '-' + month + '-' + strDate
+        this.endDate = year1 + '-' + month1 + '-' + strDate1
+        this.value = [this.startDate, this.endDate]
+        this.getList()
+        // })
+      },
       async getList() {
          var response=await getcontractdetails({
             // warehouseType: 1,

src/views/profitable/expensemanagementdetails.vue

@@ -134,6 +134,12 @@
               <div v-else-if="scope.row.expensesPurpose == 2">
                 {{ scope.row.contractNo }}
               </div>
+              <!-- <div v-if="scope.row.expensesPurpose == 4 && scope.row.costType=='油费-长途' ">
+                  {{ scope.row.carNo }}
+              </div>
+              <div v-if="scope.row.expensesPurpose == 4 && scope.row.costType=='油费-短途' ">
+                  {{ scope.row.warehouseName }}
+              </div> -->
             </template>
           </el-table-column>
           <el-table-column prop="expenseName" label="费用名称"></el-table-column>
@@ -185,7 +191,7 @@
                   scope.row.status == '已付款' &&
                   !scope.row.approveStatus)
               " @click="accomplish(scope.row)" type="primary">完成</el-button>
-              <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回' " @click="withdraw(scope.row)" type="primary">撤回</el-button>
+              <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回' " v-show="scope.row.showFlag"  @click="withdraw(scope.row)" type="primary">撤回</el-button>
               <el-button v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'" @click="edit(scope.row)" type="primary">编辑</el-button>
               <el-button v-if="
                 (!scope.row.distributionStatus &&
@@ -206,7 +212,7 @@
                   scope.row.unallocatedAmount > 0)
               " @click="allot(scope.row)" type="primary">分配</el-button>
               <!-- <el-button v-if='scope.row.approveStatus=="已驳回"' @click="del(0,scope.row)" type="primary">删除</el-button> -->
-              <el-button v-if='scope.row.status=="已驳回"' @click="del(0,scope.row)" type="danger">删除</el-button>
+              <el-button v-if='scope.row.status=="已驳回" ||scope.row.approveStatus =="发起人撤回" ' @click="del(0,scope.row)" type="danger">删除</el-button>
               <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待杜大光审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"||scope.row.approveStatus=="待单证中心审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
               <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
@@ -278,7 +284,7 @@
       </div>
     </el-dialog>
     <WinseaContentModal v-model="fujianshow" :title="title" @on-cancel="handleClose">
-      <ws-upload :editable="false" ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
+      <ws-upload ref="upload" @onChange="onChange1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
         :comp-id="compId" :appendix-ids="appendixIdss" :size-limit="size" />
     </WinseaContentModal>
     <el-dialog
@@ -312,7 +318,8 @@ import {
   getXialaList,
   sponsorWithdraw,
   exportFile,
-  getcostNo
+  getcostNo,
+  editfujian
 } from '@/model/profitable/index'
 import { getwarehousName} from '@/model/warehouse/index'
 import {
@@ -330,7 +337,7 @@ export default {
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
-      
+      showFlag:false,
       size: 100,
       expensesPurpose: '',
       recordList: [],
@@ -543,6 +550,23 @@ export default {
             this.$refs.upload1.clearFiles()
           })
       },
+      onChange1() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async (response) => {
+            editfujian({addressUrl:response,id:this.id})
+              .toPromise()
+              .then((response) => {
+                this.fujianshow = false
+                this.$message.success('上传成功')
+                this.getList()
+              })
+          })
+          .catch((res) => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
     handlerecord(row) {
       if (row.expensesType == 1) {
         this.title1 = '收款审核记录'
@@ -566,15 +590,15 @@ export default {
     fujian(row) {
       this.id = row.id
 
-      if (row.addressUrl) {
+      // if (row.addressUrl) {
         this.appendixIdss = row.addressUrl
         this.fujianshow = true
-      } else {
-        this.$message({
-          message: '暂无附件查看!',
-          type: 'warning',
-        })
-      }
+      // } else {
+      //   this.$message({
+      //     message: '暂无附件查看!',
+      //     type: 'warning',
+      //   })
+      // }
     },
     look(row) {
       this.$router.push({
@@ -870,6 +894,9 @@ export default {
                 response.records[i].addressUrlArray =
                   response.records[i].addressUrl.split(',')
               }
+              if (response.records[i].agent == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
             }
           }
           this.tableData = response.records
@@ -884,7 +911,6 @@ export default {
               Number(this.tableData[0].outWarehouseMoney) +
               Number(this.tableData[0].outManageMoney)
           }
-
           this.deptBudgetTotal = response.total
         })
     },

src/views/profitable/fixedAssets.vue

@@ -0,0 +1,1001 @@
+//固定资产
+<template>
+    <div class="container">
+        <el-row class="row_top">
+            <el-col :span="12">
+                <h2 class="bg-left title">固定资产</h2>
+            </el-col>
+        </el-row>
+        <div class="center">
+            <el-row style="margin-bottom: 10px">
+                <!-- <el-col :span="6">
+                          <el-date-picker value-format="yyyy-MM-dd" v-model="value" type="daterange" align="right" unlink-panels
+                            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
+                            class="data_css" @change="changeDate">
+                          </el-date-picker>
+                    </el-col> -->
+                <el-col :span="18">
+                    <div class="datascreen">
+                        <el-select v-model="deptAndWarehouse" filterable placeholder="按所属部门/库点查找" clearable
+                            @change="getList" class="options_css">
+                            <el-option v-for="(item, index) in deptAndWarehouseList" :key="index" :label="item"
+                                :value="item" />
+                        </el-select>
+                        <ws-input v-model="searchKeyWord" placeholder="可按名称查找" clearable maxlength="500" type="input"
+                            class="findValue" @keyup.enter.native="find()"></ws-input>
+                        <el-button class="find" type="primary" @click="find()"><img width="16" height="16"
+                                style="left: -8px" src="../../../public/img/sousuo.png" alt="" /></el-button>
+                    </div>
+                </el-col>
+                <el-col :span="4" style="display: flex;">
+                    <el-button @click="batchDel()" style="dis">批量删除</el-button>
+                    <!-- <el-upload action="" :on-change="batchImport" :show-file-list="false"
+                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                            :auto-upload="false">
+                            <el-button>批量导入</el-button>
+                        </el-upload> -->
+                    <el-button @click="batchImport()">导入</el-button>
+                    <el-link
+                        href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E5%9B%BA%E5%AE%9A%E8%B5%84%E4%BA%A7%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx"
+                        style="margin-left: 8px">
+                        <el-button>模板下载</el-button>
+                    </el-link>
+                    <el-button style="margin-left: 8px" @click="addOrEdit(1)">添加</el-button>
+                </el-col>
+            </el-row>
+            <el-row style="margin-bottom: 10px">
+                <el-col :span="18" style="width: 88%;">
+                    <el-button style="margin-left: 30px !important" @click="statusChange('')"
+                        :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-col>
+                <el-col style="text-align: right" :span="30">
+                    <span>合计：{{ allTotalPrice }} 元</span>
+                </el-col>
+            </el-row>
+            <div class="fromdata">
+                <el-table :data="fixedAssetsInfoList" ref="table" style="width: 100%; margin-top: 20px" border
+                    height="calc(130% - 170px)" @row-click="handleRowClick" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="30"></el-table-column>
+                    <el-table-column type="index" label="序号">
+                        <template scope="scope">
+                            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+                            <span v-else>{{ scope.$index + 1 }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="itemName" label="名称" width="100"></el-table-column>
+                    <el-table-column prop="deptAndWarehouse" label="所属部门/库点" width="150"></el-table-column>
+                    <el-table-column prop="businessType" label="类型" width="150"></el-table-column>
+                    <el-table-column prop="leadingCadre" label="负责人"></el-table-column>
+                    <el-table-column prop="purchaseQuantity" label="数量"></el-table-column>
+                    <el-table-column prop="purchasePrice" width="120" label="采购单价（元）"></el-table-column>
+                    <el-table-column prop="currentPrice" width="120" label="当前单价（元）"></el-table-column>
+                    <el-table-column prop="totalPrice" width="120" label="总价（元）"></el-table-column>
+                    <!-- <el-table-column prop="expenseRemarks" label="附件">
+                                <template slot-scope="scope">
+                                  <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+                                    src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+                                  <span v-if="scope.row.addressUrlArray != null">
+                                    {{
+                                        scope.row.addressUrlArray.length == 0
+                                          ? ''
+                                          : scope.row.addressUrlArray.length
+                                    }}
+                                  </span>
+                                </template>
+                        </el-table-column> -->
+                    <el-table-column prop="status" label="状态" width="100">
+                        <template slot-scope="scope">
+                            <div>
+                                <el-select v-model="scope.row.status" placeholder="" class="statusselect"
+                                    @change='editStatus($event, scope.row)' :value="scope.row.status">
+                                    <el-option v-for="item in statusList" :key="item.value" :label="item.value"
+                                        :value="item.value" style="color: #8890b1" />
+                                </el-select>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="purchaseDate" label="采购日期" width="150"></el-table-column>
+                    <el-table-column prop="remark" width="120" label="备注">
+                        <template scope="scope">
+                            <div v-if="!scope.row.select" @click.stop="lookRemark(scope.row)">
+                                <span class="text_css">查看</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="address" label="操作" width="220">
+                        <template slot-scope="scope">
+                            <el-button @click="addOrEdit(2, scope.row)" type="primary">编辑</el-button>
+                            <el-button @click="del(scope.row)" type="danger">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="currentPage" style="text-align: center" :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+            </el-pagination>
+        </div>
+        <!-- 添加/编辑弹窗 -->
+        <el-dialog width="25%" :visible.sync="fixedAssetsForm" :append-to-body="true" :title="title">
+            <div class="tanchuang">
+                <el-form>
+                    <el-form-item label="所属部门/库点" prop="deptAndWarehouse" label-width="110px">
+                        <el-select style="width:100%" v-model="fixedAssetsInfo.deptAndWarehouse"
+                            placeholder="按所属部门/库点查找" clearable filterable>
+                            <!-- @change="selectDeptAndWare" -->
+                            <el-option v-for="(item, index) in deAndWareFormList" :key="index" :label="item"
+                                :value="item" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="类型" prop="businessType" label-width="110px">
+                        <el-select style="width:100%" v-model="fixedAssetsInfo.businessType" placeholder=""
+                            @change='selectTypeChange' :value="businessType">
+                            <el-option v-for="item in typeList" :key="item.value" :label="item.value"
+                                :value="item.value" style="color: #8890b1" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="名称" prop="itemName" label-width="110px">
+                        <el-input v-model="fixedAssetsInfo.itemName" placeholder="输入名称，2-10个字" maxlength="10"
+                            size="small" />
+                    </el-form-item>
+                    <el-form-item label="数量" prop="purchaseQuantity" label-width="110px">
+                        <el-input type="number" @input="calculation" @mousewheel.native.prevent
+                            v-model="fixedAssetsInfo.purchaseQuantity" placeholder="输入数量" maxlength="10" size="small" />
+                    </el-form-item>
+                    <el-form-item label="状态" span="1" prop="status" class="readonly" label-width="110px">
+                        <el-select style="width:100%" v-model="fixedAssetsInfo.status" placeholder="" class="typeselect"
+                            @change="selectStatus">
+                            <ws-option v-for="item in statusList" :key="item.value" :label="item.value"
+                                :value="item.value" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="负责人" prop="leadingCadre" label-width="110px">
+                        <el-select style="width:100%" v-model="fixedAssetsInfo.leadingCadre" placeholder="请选择负责人"
+                            filterable clearable>
+                            <!-- @change="selectLead" -->
+                            <el-option v-for="item in leadingCadreList" :key="item" :label="item" :value="item" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="采购单价(元)" prop="purchasePrice" label-width="110px">
+                        <el-input type="number" @input="calculation" v-model="fixedAssetsInfo.purchasePrice"
+                            placeholder="请输入采购单价(元)" maxlength="100" size="small" />
+                    </el-form-item>
+                    <el-form-item label="当前单价(元)" prop="currentPrice" label-width="110px">
+                        <el-input type="number" @mousewheel.native.prevent v-model="fixedAssetsInfo.currentPrice"
+                            placeholder="请输入当前单价(元)" maxlength="100" size="small" />
+                    </el-form-item>
+                    <el-form-item label="总价(元)" prop="totalPrice" label-width="110px">
+                        <el-input type="number" @mousewheel.native.prevent v-model="fixedAssetsInfo.totalPrice"
+                            placeholder="自动计算，不可编辑" maxlength="100" size="small" disabled />
+                    </el-form-item>
+                    <el-form-item label="采购日期" prop=" purchaseDate" label-width="110px">
+                        <el-date-picker v-model="fixedAssetsInfo.purchaseDate" placeholder="请选择采购日期" type="date"
+                            value-format="yyyy-MM-dd"></el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="备注" prop="remark" label-width="110px">
+                        <el-input v-model="fixedAssetsInfo.remark" placeholder="输入备注，0-500个字" maxlength="500" row="5"
+                            type="textarea" size="small" />
+                    </el-form-item>
+                    <!-- <ws-form-item label="上传截图" prop=" paymentScreenshot"></ws-form-item>
+                    <div class="upLoad">
+                      <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
+                        :on-success="handleAvatarSuccess">
+                        <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                      </el-upload>
+                    </div> -->
+                    <div style="text-align: center; margin-top: 20px">
+                        <el-button @click="cancel()">取消</el-button>
+                        <el-button @click="fixedAassetsSubmit(flag)">提交</el-button>
+                    </div>
+                </el-form>
+            </div>
+        </el-dialog>
+        <!--备注弹窗-->
+        <el-dialog width='30%' :visible.sync="remarkList" title="备注" top="20vh">
+            <span>{{ remark }}</span>
+        </el-dialog>
+        <!--导入弹窗-->
+        <div class="mask" v-show="isShowImportType"></div>
+        <div class="print-type" v-show="isShowImportType">
+            <div class="print-type-content">
+                <div class="print-type-checkbox">
+                    <el-form ref="form" label-width="110px">
+                        <!--所属部门/库点-->
+                        <el-form-item label="所属部门/库点" span="1" prop="deptAndWarehouse">
+                            <el-select v-model="deptAndWarehouse" filterable placeholder="按所属部门/库点查找" clearable
+                                @change="deAndWareChange" class="options_css">
+                                <el-option v-for="item in deAndWareList" :key="item" :label="item" :value="item" />
+                            </el-select>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </div>
+            <div class="bottom-btn">
+                <el-upload action="" :on-change="submitImport" style="margin-left:75px;" :show-file-list="false"
+                    accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                    :auto-upload="false">
+                    <el-button>确定</el-button>
+                </el-upload>
+                <el-button style="margin-left:50px;" @click="cancelImport">取消</el-button>
+            </div>
+        </div>
+        <!-- <WinseaContentModal v-model="fujianshow" :title="title" @on-cancel="handleClose">
+                    <ws-upload :editable="false" ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
+                        :comp-id="compId" :appendix-ids="appendixIdss" :size-limit="size" />
+                </WinseaContentModal> -->
+    </div>
+</template>
+<script>
+import WsUpload from '@/components/WsUpload'
+import {
+    getFixedInfoList,
+    getLeadingCadre,
+    getDeptAndWare,
+    delFixedInfo,
+    batchDelFixedInfo,
+    addOrEditFixedInfo,
+    lookFixedInfo,
+    importFixed
+} from '@/model/profitable/index'
+export default {
+    components: {
+        WsUpload,
+    },
+    data() {
+        return {
+            value: '',
+            deptBudgetTotal: 0,
+            currentPage: 1,
+            pageSize: 10,
+            size: 100,
+            compId: localStorage.getItem('ws-pf_compId'),
+            searchType: '',
+            searchKeyWord: '',
+            deptAndWarehouse: [],//所属部门/库点
+            deptAndWarehouseList: [],
+            deAndWareList: [],
+            deAndWareFormList: [],
+            leadingCadre: [],//负责人
+            leadingCadreList: [],
+            statusFlag: 1,
+            status: '在用',
+            allTotalPrice: 0,
+            statusList: [
+                {
+                    value: '在用',
+                    type: 1
+                },
+                {
+                    value: '闲置',
+                    type: 3
+                },
+                {
+                    value: '报废',
+                    type: 5
+                },
+                {
+                    value: '转卖',
+                    type: 7
+                },
+            ],
+            typeList: [
+                {
+                    value: '自营',
+                    type: 1
+                },
+                {
+                    value: '合营',
+                    type: 3
+                },
+            ],
+            modification: [],
+            fixedAssetsInfoList: [],
+            fixedAssetsInfo: {
+                status: '在用',
+                statusFlag: 1,
+                businessType: '自营',
+                businessTypeKey: 1,
+                purchaseDate: '',
+                totalPrice: '',
+                deptAndWarehouse: '公司资产',
+                leadingCadre: '',
+            },
+            fixedAssetsForm: false,
+            businessType: '自营',
+            businessTypeKey: 1,
+            itemName: '',
+            purchaseDate: '',
+            remark: '',
+            purchaseQuantity: '',
+            purchasePrice: '',
+            currentPrice: '',
+            title: '',
+            flag: '',
+            remarkList: false,
+            isShowImportType: false,
+        }
+    },
+    activated() {
+        this.getList()
+        this.xiala()
+    },
+    methods: {
+        handleSelectionChange(val) {
+            this.modification = val
+        },
+        handleRowClick(row) {
+            return true
+        },
+        deAndWareChange(e) {
+            for (let i = 0; i < this.deptAndWarehouseList.length; i++) {
+                if (this.deptAndWarehouseList[i] == this.deptAndWarehouse) {
+                    this.deptAndWarehouse = this.deptAndWarehouseList[i]
+                    localStorage.setItem('houseSelfCollect_house1',
+                        JSON.stringify({
+                            value: this.deptAndWarehouseList[i],
+                            compId: localStorage.getItem('ws-pf_compId')
+                        })
+                    )
+                }
+            }
+        },
+        //导入
+        batchImport() {
+            // this.$forceUpdate();
+            this.isShowImportType = true
+        },
+        cancelImport() {
+            this.deptAndWarehouse = ''
+            this.isShowImportType = false
+        },
+        submitImport(file, fileList) {
+            this.fileTemp = file.raw
+            let fileName = file.raw.name
+            let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+            // 判断上传文件格式
+            if (this.fileTemp) {
+                if (fileType == 'xlsx' || fileType == 'xls') {
+                    this.importf(this.fileTemp)
+                } else {
+                    this.$message({
+                        type: 'warning',
+                        message: '附件格式错误，请删除后重新上传！',
+                    })
+                }
+            } else {
+                this.$message({
+                    type: 'warning',
+                    message: '请上传附件！',
+                })
+            }
+        },
+        importf(obj) {
+            this.excelFreightspace = []
+            let _this = this;
+            let inputDOM = this.$refs.inputer; // 通过DOM取文件数据
+            this.file = event.currentTarget.files[0];
+            var rABS = false; //是否将文件读取为二进制字符串
+            var f = this.file;
+            var reader = new FileReader();
+            //if (!FileReader.prototype.readAsBinaryString) {
+            FileReader.prototype.readAsBinaryString = function (f) {
+                var binary = '';
+                var rABS = false; //是否将文件读取为二进制字符串
+                var pt = this;
+                var wb; //读取完成的数据
+                var outdata;
+                var reader = new FileReader();
+                reader.onload = function (e) {
+                    var bytes = new Uint8Array(reader.result);
+                    var length = bytes.byteLength;
+                    for (var i = 0; i < length; i++) {
+                        binary += String.fromCharCode(bytes[i]);
+                    }
+                    var XLSX = require('xlsx');
+                    if (rABS) {
+                        wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
+                            type: 'base64',
+                            cellDates: true
+                        });
+                    } else {
+                        wb = XLSX.read(binary, {
+                            type: 'binary'
+                        });
+                    }
+                    // outdata就是你想要的东西 excel导入的数据
+                    outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
+                    // excel 数据再处理
+                    let arr = []
+                    outdata.map(v => {
+                        // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+                        let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig, '');
+                        v = JSON.parse(jsonString);
+                        let obj = {}
+                        //xxx代表列名
+                        obj.itemName = v.名称
+                        obj.leadingCadre = v.负责人
+                        obj.purchaseQuantity = v.数量
+                        obj.purchasePrice = v.采购单价
+                        obj.currentPrice = v.当前单价
+                        obj.status = v.状态
+                        obj.businessType = v.经营方式
+                        obj.remark = v.备注
+                        obj.purchaseDate = _this.formatDate(v.采购日期, '-')
+                        _this.excelFreightspace.push(obj)
+                    })
+                    if (_this.excelFreightspace) {
+                        importFixed({
+                            compId: localStorage.getItem('ws-pf_compId'),
+                            deptAndWarehouse: _this.deptAndWarehouse,
+                            fixedAssetsInfoList: _this.excelFreightspace
+                        }).toPromise()
+                            .then((response) => {
+                                if (response == 'ok') {
+                                    _this.$notify({
+                                        title: '成功',
+                                        message: '导入成功',
+                                        type: 'success'
+                                    });
+                                }
+                                _this.deAndWareChange = ''
+                                _this.isShowImportType = false
+                                _this.getList()
+                            })
+                    }
+                }
+                reader.readAsArrayBuffer(f);
+            }
+            if (rABS) {
+                reader.readAsArrayBuffer(f);
+            } else {
+                reader.readAsBinaryString(f);
+            }
+        },
+        formatDate(numb, format) {
+            const old = numb - 1;
+            const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60);
+            const time = new Date(1900, 0, old, 0, 0, t)
+            const year = time.getFullYear();
+            const month = time.getMonth() + 1;
+            const date = time.getDate();
+            return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date) +
+                ' 00:00:00'
+        },
+        typeChange(num) {
+            this.searchType = num
+            this.getList()
+        },
+        // getPassYearFormatDate() {
+        //   var nowDate = new Date()
+        //   var _date = new Date()
+        //   nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        //   var year = nowDate.getFullYear()
+        //   var year1 = _date.getFullYear()
+        //   var month = nowDate.getMonth() + 1
+        //   var month1 = _date.getMonth() + 1
+        //   var strDate = nowDate.getDate()
+        //   var strDate1 = _date.getDate()
+        //   if (month >= 1 && month <= 9) {
+        //     month = '0' + month
+        //   }
+        //   if (month1 >= 1 && month1 <= 9) {
+        //     month1 = '0' + month1
+        //   }
+
+        //   if (strDate >= 0 && strDate <= 9) {
+        //     strDate = '0' + strDate
+        //   }
+        //   if (strDate1 >= 0 && strDate1 <= 9) {
+        //     strDate1 = '0' + strDate1
+        //   }
+        //   this.startDate = year + '-' + month + '-' + strDate
+        //   this.endDate = year1 + '-' + month1 + '-' + strDate1
+        //   this.value = [this.startDate, this.endDate]
+        // },
+        // changeDate() {
+        //   if (this.value) {
+        //     this.startDate = this.value[0]
+        //     this.endDate = this.value[1]
+        //   }
+        //   this.getList()
+        // },
+        // fujian(row) {
+        //   this.id = row.id
+
+        //   if (row.addressUrl) {
+        //     this.appendixIdss = row.addressUrl
+        //     this.fujianshow = true
+        //   } else {
+        //     this.$message({
+        //       message: '暂无附件查看!',
+        //       type: 'warning',
+        //     })
+        //   }
+        // },
+        lookRemark(row) {
+            if (row.remark) {
+                this.remark = row.remark
+                this.remarkList = true
+            }
+            else {
+                this.$message({
+                    message: '暂无备注',
+                    type: 'warning'
+                });
+            }
+        },
+        getList() {
+            getFixedInfoList({
+                compId: localStorage.getItem('ws-pf_compId'),
+                searchKeyWord: this.searchKeyWord,
+                currentPage: this.currentPage,
+                pageSize: this.pageSize,
+                searchType: this.searchType,
+                deptAndWarehouse: this.deptAndWarehouse.length > 0 ? this.deptAndWarehouse.toString() : '',
+            })
+                .toPromise()
+                .then((response) => {
+                    //   if (response.records.length > 0) {
+                    //     for (let i = 0; i < response.records.length; i++) {
+                    //       if (response.records[i].addressUrl) {
+                    //         response.records[i].addressUrlArray =
+                    //           response.records[i].addressUrl.split(',')
+                    //       }
+                    //     }
+                    //   }
+                    this.fixedAssetsInfoList = response.records
+                    this.allTotalPrice = 0
+                    for (var i = 0; i < this.fixedAssetsInfoList.length; i++) {
+                        if (this.fixedAssetsInfoList[i].statusFlag != '7') {
+                            this.allTotalPrice += Number(this.fixedAssetsInfoList[i].totalPrice)
+                        }
+                        this.fixedAssetsInfoList[i].select = false
+                    }
+                    this.allTotalPrice = this.allTotalPrice.toFixed(2)
+                    this.deptBudgetTotal = response.total
+                })
+        },
+        getNowTime() {
+            var now = new Date();
+            var year = now.getFullYear(); //得到年份
+            var month = now.getMonth(); //得到月份
+            var date = now.getDate(); //得到日期
+            month = month + 1;
+            month = month.toString().padStart(2, '0');
+            date = date.toString().padStart(2, '0');
+            var defaultDate = `${year}-${month}-${date}`
+            this.fixedAssetsInfo.purchaseDate = defaultDate
+        },
+        statusChange(num) {
+            this.searchType = num
+            this.getList()
+        },
+        editStatus(e, row) {
+            for (var i = 0; i < this.statusList.length; i++) {
+                if (this.statusList[i].value == e) {
+                    this.statusFlag = this.statusList[i].type
+                }
+            }
+            var data = {}
+            var text = `是否将状态改为${e}`
+            data = {
+                id: row.id,
+                status: e,
+                statusFlag: this.statusFlag
+            }
+            this.$confirm(text, {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    addOrEditFixedInfo(data)
+                        .toPromise()
+                        .then((response) => {
+                            this.$notify.success({
+                                title: '成功',
+                                message: '状态修改成功',
+                            })
+                            this.getList()
+                        })
+                        .catch((response) => {
+                            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                        })
+                })
+                .catch(() => {
+                    row.status = row.currectstatus
+                    return false
+                })
+
+        },
+        del(row) {
+            this.$confirm('确定删除固定资产信息？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(() => {
+                delFixedInfo({ id: row.id })
+                    .toPromise()
+                    .then((response) => {
+                        this.$message({
+                            message: '删除成功',
+                            type: 'success',
+                        })
+                        this.getList()
+                    })
+                    .catch((response) => {
+                        this.$message({
+                            message: '删除失败',
+                            type: 'warning',
+                        })
+                    })
+            })
+        },
+        batchDel() {
+            this.fixedAssetsInfo.fixedAssetsInfoList = this.modification
+            if (this.modification.length == 0) {
+                this.$message.warning('请选择要删除的条目')
+            } else {
+                this.$confirm('确定批量删除固定资产信息？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                }).then(() => {
+                    batchDelFixedInfo(this.fixedAssetsInfo)
+                        .toPromise()
+                        .then((response) => {
+                            this.$message({
+                                message: '批量删除成功',
+                                type: 'success',
+                            })
+                            this.getList()
+                        })
+                        .catch((response) => {
+                            this.$message({
+                                message: '批量删除失败',
+                                type: 'warning',
+                            })
+                        })
+                })
+            }
+        },
+        xiala() {
+            //所属部门/库点下拉列表
+            getDeptAndWare({
+                compId: localStorage.getItem('ws-pf_compId'),
+            })
+                .toPromise()
+                .then((response) => {
+                    this.deptAndWarehouseList = response
+                    this.deAndWareList = response
+                    this.deAndWareFormList = response
+                })
+            //负责人下拉列表
+            getLeadingCadre({
+                compId: localStorage.getItem('ws-pf_compId'),
+            })
+                .toPromise()
+                .then((response) => {
+                    this.leadingCadreList = response
+                })
+        },
+        calculation() {
+            if (this.fixedAssetsInfo.purchaseQuantity && this.fixedAssetsInfo.purchasePrice) {
+                this.fixedAssetsInfo.totalPrice =
+                    Number(this.fixedAssetsInfo.purchaseQuantity *
+                    this.fixedAssetsInfo.purchasePrice).toFixed(2)
+            }
+        },
+        selectTypeChange(e) {
+            for (var i = 0; i < this.typeList.length; i++) {
+                if (this.typeList[i].value == e) {
+                    this.fixedAssetsInfo.businessTypeKey = this.typeList[i].type
+                }
+            }
+
+        },
+        selectStatus(e) {
+            for (var i = 0; i < this.statusList.length; i++) {
+                if (this.statusList[i].value == e) {
+                    this.fixedAssetsInfo.statusFlag = this.statusList[i].type
+                }
+            }
+        },
+        addOrEdit(flag, row) {
+            this.flag = flag
+            if (flag == 1) {
+                this.title = '添加'
+            } else if (flag == 2) {
+                this.title = '编辑'
+                // this.lookFixedInfo(row.id)
+                lookFixedInfo({
+                    id: row.id
+                })
+                    .toPromise()
+                    .then((response) => {
+                        this.fixedAssetsInfo = response
+                    })
+            }
+            this.getNowTime()
+            this.fixedAssetsForm = true
+        },
+        // lookFixedInfo(){
+        // },
+        fixedAassetsSubmit() {
+            var title
+            if (!this.fixedAssetsInfo.itemName) {
+                this.$message({
+                    message: '物品名称不能为空！',
+                    type: 'warning',
+                })
+                return
+            }
+            if (!this.fixedAssetsInfo.purchaseQuantity) {
+                this.$message({
+                    message: '采购数量不能为空！',
+                    type: 'warning',
+                })
+                return
+            }
+            if (this.fixedAssetsInfo.purchaseQuantity <= 0) {
+                this.$message({
+                    message: '数量输入有误',
+                    type: 'warning',
+                })
+                return
+            }
+            if (!this.fixedAssetsInfo.purchasePrice) {
+                this.$message({
+                    message: '采购单价不能为空',
+                    type: 'warning',
+                })
+                return
+            }
+            if (
+                isNaN(this.fixedAssetsInfo.purchasePrice) ||
+                (String(this.fixedAssetsInfo.purchasePrice).indexOf('.') != -1 &&
+                    String(this.fixedAssetsInfo.purchasePrice).length -
+                    (String(this.fixedAssetsInfo.purchasePrice).indexOf('.') + 1) >
+                    2) ||
+                this.fixedAssetsInfo.purchasePrice <= 0
+            ) {
+                this.$message({
+                    message: '采购单价输入有误！',
+                    type: 'warning',
+                })
+                return
+            }
+            if (!this.fixedAssetsInfo.currentPrice) {
+                this.$message({
+                    message: '当前单价不能为空',
+                    type: 'warning',
+                })
+                return
+            }
+            if (
+                isNaN(this.fixedAssetsInfo.currentPrice) ||
+                (String(this.fixedAssetsInfo.currentPrice).indexOf('.') != -1 &&
+                    String(this.fixedAssetsInfo.currentPrice).length -
+                    (String(this.fixedAssetsInfo.currentPrice).indexOf('.') + 1) >
+                    2) ||
+                this.fixedAssetsInfo.currentPrice <= 0
+            ) {
+                this.$message({
+                    message: '当前单价输入有误！',
+                    type: 'warning',
+                })
+                return
+            }
+            if (this.flag == 1) {
+                title = '确定提交资产信息？'
+            } else {
+                title = '确定提交本次修改？'
+            }
+            this.$confirm(title, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    this.fixedAssetsInfo.compId =
+                        localStorage.getItem('ws-pf_compId')
+                    addOrEditFixedInfo(this.fixedAssetsInfo)
+                        .toPromise()
+                        .then((response) => {
+                            this.$message.success('提交成功')
+                            this.fixedAssetsInfo = {
+                                status: '在用',
+                                statusFlag: 1,
+                                businessType: '自营',
+                                businessTypeKey: 1,
+                                purchaseDate: '',
+                                totalPrice: '',
+                                deptAndWarehouse: '公司资产',
+                                leadingCadre: '',
+                            }
+                            this.fixedAssetsForm = false
+                            this.getList()
+                        })
+                })
+                .catch(() => {
+                    return false
+                })
+        },
+        cancel() {
+            this.fixedAssetsForm = false
+            this.fixedAssetsInfo = {
+                status: '在用',
+                statusFlag: 1,
+                businessType: '自营',
+                businessTypeKey: 1,
+                purchaseDate: '',
+                totalPrice: '',
+                deptAndWarehouse: '',
+                leadingCadre: '',
+            }
+        },
+        pickerOptions() { },
+        find() {
+            this.getList()
+        },
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`)
+            this.pageSize = val
+            this.getList()
+        },
+        handleCurrentChange(val) {
+            this.currentPage = val
+            console.log(`当前页: ${val}`)
+            this.getList()
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+.container {
+    background: #e8ecf6;
+}
+
+.center {
+    margin: 0 auto;
+    background: #ffffff;
+    // height: calc(100vh - 13vh);
+    border-radius: 4px;
+    padding: 20px 0;
+
+    /deep/.el-table td,
+    /deep/.el-table th {
+        text-align: center;
+    }
+}
+
+.row_top {
+    background: #f6f7fc;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .bg-left {
+        padding-left: 30px;
+    }
+
+    .title {
+        position: relative;
+    }
+
+    .title::before {
+        content: '';
+        display: inline-block;
+        width: 5px;
+        height: 30px;
+        background: #5473e8;
+        position: absolute;
+        left: 0;
+    }
+}
+
+.datascreen {
+    display: flex;
+    margin-left: 25px;
+    width: 35%;
+
+    .find {
+        margin-right: 10px;
+    }
+}
+
+.anniu {
+    display: flex;
+    width: 28%;
+}
+
+.fromdata {
+    overflow-y: scroll;
+    height: 560px;
+}
+
+.top_info {
+    margin: 10px 0 0 10px;
+    min-width: 712px;
+
+    .info_css {
+        margin-right: 20px;
+    }
+}
+.options_css {
+    margin: 0 5px;
+    width: 80%;
+}
+
+.findValue {
+    width: 100%;
+}
+
+/deep/.statusselect .el-input__inner {
+    color: #8890b1;
+    width: 100%;
+}
+
+.tanchuang {
+    margin: 0 auto;
+    text-align: center;
+}
+
+.tanchuang .el-info-table {
+    display: initial;
+}
+
+.tanchuang .el-info-table .el-form-item {
+    margin: 0 auto;
+    text-align: center;
+}
+
+.print-type {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 340px;
+    height: 160px;
+    background: white;
+    border-radius: 10px;
+    z-index: 999;
+
+    .bottom-btn {
+        text-align: center;
+        display: flex;
+    }
+}
+.text_css {
+    color: #5878e8;
+  }
+  
+.print-type-checkbox {
+    padding-left: 20px;
+    margin-top: 30px;
+
+    .el-date-editor.el-input {
+        width: 85% !important;
+    }
+
+    .proportion_css {
+        width: 85%;
+    }
+}
+
+.mask {
+    background: black;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    z-index: 99;
+    opacity: 0.3;
+}
+</style>

src/views/profitable/warehouseprofits.vue

@@ -183,9 +183,10 @@
        getPassYearFormatDate() {
         var nowDate = new Date()
         var _date = new Date()
-        var year = nowDate.getFullYear()
+        // nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        var year = nowDate.getFullYear() - 1
         var year1 = _date.getFullYear()
-        var month = nowDate.getMonth()
+        var month = nowDate.getMonth() + 1
         var month1 = _date.getMonth() + 1
         var strDate = nowDate.getDate()
         var strDate1 = _date.getDate()

src/views/profitable/warehouseprofitsdetails.vue

@@ -107,10 +107,10 @@
       getPassYearFormatDate () {
           var nowDate = new Date()
           var _date = new Date()
-          // nowDate.setTime(nowDate.getTime()-24*60*60*1000*30)
+          nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
           var year = nowDate.getFullYear()
           var year1 = _date.getFullYear()
-          var month = nowDate.getMonth()
+          var month = nowDate.getMonth() + 1
           var month1 = _date.getMonth() + 1
           var strDate = nowDate.getDate()
           var strDate1 = _date.getDate()

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -145,7 +145,7 @@
             </div>
 
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification3 == 'true'" @click="weightClick(scope.row,2)"></i>
+              v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
           </template>
         </el-table-column>
         <el-table-column  width='130' class="table_td"  prop="amountIngReceivable" label="应收金额（元）">

src/views/taskManagement/tranManagementLook.vue

@@ -41,14 +41,13 @@
           <ws-info-table>
             <ws-form-item label="始发地" span="1" prop="netWeight">
               {{ deptBudgetList.startPrivate }}{{ deptBudgetList.startCity
-              }}{{ deptBudgetList.startArea
+              }}{{ deptBudgetList.startArea 
               }}{{ deptBudgetList.startDetailedAddress }}
               （{{deptBudgetList.sendWarehouse}}）
             </ws-form-item>
             <ws-form-item label="终到地" span="1" prop="netWeight">
               {{ deptBudgetList.endPrivate }}{{ deptBudgetList.endCity
-              }}{{ deptBudgetList.endArea
-              }}{{ deptBudgetList.endDetailedAddress }}
+              }}{{ deptBudgetList.endArea}}{{ deptBudgetList.endDetailedAddress }} 
                 （{{deptBudgetList.receiveWarehouse}}）
             </ws-form-item>
           </ws-info-table>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -107,7 +107,7 @@
               <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider>
             </span>
 
-            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus"
+            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus" v-show="scope.row.showFlag"
             >撤回</span>
             <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.View`" -->
               <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit`" -->
@@ -211,6 +211,7 @@
         primary: '1',
         pageSize: 10,
         searchType: '',
+        showFlag: false,
         publishertext:'全部发布者',
         publisher:'',
         searchTypeText: '全部状态',
@@ -423,6 +424,9 @@
               }else{
                 response.records[i].show=false
               }
+              if (response.records[i].publisher == localStorage.getItem('ws-pf_staffName')) {
+                response.records[i].showFlag = true
+              }
               
             }
             this.gainList = response

src/views/universalityAudit/audit.vue

@@ -96,7 +96,9 @@
               <el-button v-if="scope.row.approveStatus&&scope.row.taskId" @click="pass(scope.row)" type="primary">通过</el-button>
               <el-button v-if="scope.row.approveStatus&&scope.row.taskId" @click="reject(scope.row)" type="primary">驳回</el-button>
               <!-- <div style="display:inline-block;"> -->
-                <el-button v-if="scope.row.status=='已驳回'" @click="del(scope.row)" type="danger">删除</el-button>
+                <el-button v-show="scope.row.showFlag" v-if="scope.row.approveStatus&&scope.row.approveStatus != '发起人撤回'" @click="withdraw(scope.row)" type="primary">撤回</el-button>
+                <el-button v-show="scope.row.showFlag" v-if="scope.row.status=='已驳回' || scope.row.approveStatus =='发起人撤回'" @click="del(scope.row)" type="danger">删除</el-button>
+                <el-button v-show="scope.row.showFlag" v-if="scope.row.status=='已驳回' || scope.row.approveStatus =='发起人撤回'" @click="edit(scope.row)" type="primary">编辑</el-button>
               <!-- </div> -->
             </template>
           </el-table-column>
@@ -129,7 +131,7 @@
   </el-form-item>
   <el-form-item>
     <el-button @click="addshow=false">取消</el-button>
-    <el-button type="primary" @click="onSubmit">提交</el-button>
+    <el-button type="primary" @click="onSubmit(flag)">提交</el-button>
   </el-form-item>
 </el-form>
 </el-dialog>
@@ -188,7 +190,10 @@
     addaduitinfo,
     deladuitinfo,
     workflow,
-    gethis
+    gethis,
+    sponsorWithdraw,
+    editaduitinfo,
+    getaduitinfo
   } from '@/model/universalityAudit/index'
   import { getUuid } from '../../utils'
   import WsUpload from '@/components/WsUpload'
@@ -204,7 +209,7 @@
     },
     data() {
       return {
-        value: "",
+        value: '',
         tableData: [],
         show:false,
         title:'',
@@ -216,14 +221,17 @@
         currentPage: 1,
         pageSize: 10,
         businessType:'',
-        searchType:"",
-        searchKeyWord:"",
-        startDate:"",
-        endDate:"",
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
+        endDate:'',
+        showFlag:false,
+        flag:'',
         outtotal:0,
         xialaList:[],
         intotal:0,
         form:{},
+        generalAuditInfo:{},
         dialogVisible:false,
         contractList:[],
         datalist:{},
@@ -389,6 +397,22 @@
       //     index++
       //   }
       // },
+      withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该申请吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
       fujian(row) {
         this.id = row.id
         this.accessoryTFs = true
@@ -410,7 +434,14 @@
             this.getList()
           })
           })
-      },  
+      }, 
+      edit(row) {
+        getaduitinfo({ id: row.id }).toPromise().then(response => {
+          this.form = response
+        })
+        this.addshow = true
+        this.flag = 1
+      },
       onChange() {
         this.$refs.upload
           .handleSaveBill()
@@ -436,25 +467,47 @@
                 type: 'warning',
             })
         }
-        this.$confirm('确定发起审核？', '提示', {
+        if (this.flag != 1) {
+          this.$confirm('确定发起审核？', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           })
-          .then(() => {
-            this.form.compId=localStorage.getItem('ws-pf_compId')
-            this.form.sponsor=localStorage.getItem('ws-pf_staffName')
-          addaduitinfo(this.form).toPromise().then(response => {
-            this.$message({
-                message: '提交成功!',
-                type: 'success',
+            .then(() => {
+              this.form.compId = localStorage.getItem('ws-pf_compId')
+              this.form.sponsor = localStorage.getItem('ws-pf_staffName')
+              addaduitinfo(this.form).toPromise().then(response => {
+                this.$message({
+                  message: '提交成功!',
+                  type: 'success',
+                })
+                this.getList()
+              })
+              this.form = {}
+              this.$refs.upload.clearFiles()
+              this.addshow = false
             })
-            this.form={}
-            this.$refs.upload.clearFiles()
-            this.addshow=false
-            this.getList()
+        } else {
+          this.$confirm('确定提交本次修改？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           })
-        })
+            .then(() => {
+              // this.form.compId = localStorage.getItem('ws-pf_compId')
+              // this.form.sponsor = localStorage.getItem('ws-pf_staffName')
+              editaduitinfo(this.form).toPromise().then(response => {
+                this.$message({
+                  message: '修改成功!',
+                  type: 'success',
+                })
+                this.getList()
+              })
+              this.form = {}
+              this.$refs.upload.clearFiles()
+              this.addshow = false
+            })
+        }
       },
       addlist(){
         this.addshow=true
@@ -501,11 +554,11 @@
                     if(arr[q]!=''){
                       response.records[i].addressUrlArray.push(arr[q])
                     }
-                    
                   }
-                  
                 }
-                
+                if(response.records[i].sponsor == localStorage.getItem('ws-pf_staffName')){
+                  response.records[i].showFlag = true
+                }
               }
             }
             this.tableData=response.records

src/views/warehouse/warehouseManagementRecord.vue

@@ -303,7 +303,7 @@
           </el-select>
         </div>
         <!-- <div v-if="deptBudgetList.warehouseName=='鲅鱼圈金信库'||deptBudgetList.warehouseName=='白城内陆港'||deptBudgetList.warehouseName=='哈尔滨依兰库'||this.warehouseName=='山东园丰库'"> -->
-        <div v-if="deptBudgetList.warehouseName=='鲅鱼圈金信库'||deptBudgetList.warehouseName=='白城内陆港'">
+        <div v-if="deptBudgetList.warehouseName=='鲅鱼圈金信库'||deptBudgetList.warehouseName=='白城内陆港'||deptBudgetList.warehouseName=='杜尔伯特家禾库'||deptBudgetList.warehouseName=='洮南新友谊兴旺库'||deptBudgetList.warehouseName=='甘南宏旗库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>

src/views/warehousenew/inventoryCheck.vue

@@ -13,6 +13,14 @@
             <el-option key="全部仓库" label="全部仓库" value="" style="color: #8890b1" />
             <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.warehouseName" style="color: #8890b1" />
           </el-select>
+          <div style='width:50%;margin-right:10px;display: flex;'>
+          <el-select v-model="goodsName" filterable placeholder="" @change="goodsNameChange" 
+            style="margin: 0 10px">
+            <el-option key="全部货名" label="全部货名" value="0" style="color: #8890b1" />
+            <el-option v-for="(item,index) in goodsList" :key="item.id" :label="item.goodsName"
+              :value="(index+1)" style="color: #8890b1" />
+          </el-select>
+        </div>
       </template>
       <template slot="right">
         <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按货源查找" clearable maxlength="300" type="input"></ws-input>
@@ -40,6 +48,9 @@
             `warehouseManagement.warehousingOrder.View`
           ">盘亏
         </ws-button>
+        <ws-button :type="searchType === '1' ? 'primary' : ''" @click="handle('1')" v-hasPermission="
+        `warehouseManagement.warehousingOrder.View`">待审核
+        </ws-button>
         </el-col>
         <el-col style='text-align:right;' :span="12">
           
@@ -50,14 +61,15 @@
         <div>{{item.issuingTime}}</div>
         <div>{{item.warehouseName}}入库单<span v-if='item.warehouseType==2'>（临）</span></div>
         <div>
-          <ws-button type="primary" @click="profit(item.id)" v-hasPermission="
+          <ws-button type="primary" @click="profit(item)" v-hasPermission="
             `warehouseManagement.warehousingOrder.surplus`
           ">盘盈
         </ws-button>
-         <ws-button type="primary" @click="lose(item.id)" v-hasPermission="
+         <ws-button type="primary" @click="lose(item)" v-hasPermission="
             `warehouseManagement.warehousingOrder.loss`
           ">盘亏
         </ws-button>
+        
         </div>
       </div>
       <el-table class="wenzi" :data="item.warehousingOrderList" style="width: 100%"   >
@@ -123,6 +135,13 @@
             <el-form-item label="实际剩余（吨）">
               <el-input :disabled='disabled' v-model="form.num"></el-input>
             </el-form-item>
+            <el-form-item label="仓位">
+            <el-select :disabled='disabled' @focus="warehousefocus" @change="warehousechange" v-model="form.binNumber"
+              filterable placeholder="请选择">
+              <el-option v-for="item in options" :key="item.id" :label="item.binNumber" :value="item.binNumber">
+              </el-option>
+            </el-select>
+          </el-form-item>
           </el-form>
         </div>
         <span v-if='title=="审核"' slot="footer" class="dialog-footer">
@@ -168,7 +187,8 @@
   } from '@/model/outboundManagement/index'
     import {
   getwarehousingorder,
-  editwarehousingorder
+  editwarehousingorder,
+  getposition
 } from '@/model/warehouse/index'
   import {
     downloadFile
@@ -204,11 +224,13 @@
         form:{},
         // 表格显示数据
         tableDate: [],
-
+        options:[],
         // 是否显示
         showType: true,
         warehouseName:'',
         warehouseList:[],
+        goodsList:[],
+        searchType:'1',
         // 年
         year: '',
         title:'',
@@ -262,7 +284,7 @@
         value1: '',
         value2: '',
         pageSize: 10,
-        searchType: 1,
+        searchType: '',
         searchTypeText: '待审核',
         searchKeyWord: '',
         inOutType:'',
@@ -284,6 +306,7 @@
         compId: localStorage.getItem('ws-pf_compId'),
         historyList: [],
         aduitshow:false,
+        goodsName:'0',
         pickerBeginDateBefore: {
           disabledDate: (time) => {
             return time.getTime() > Date.now()
@@ -311,7 +334,66 @@
       this.showType = this.isShow
     },
     methods: {
-      warehouseNameChange(){
+      handle(status) {
+        this.currentPage=1
+      this.searchType = status
+      this.getList()
+    },
+      warehousefocus() {
+      getposition({ baseId: this.form.baseId, flag: 1 }).toPromise()
+        .then((response) => {
+          // row.weightedit=false
+          this.options = response
+        })
+    },
+    warehousechange(e) {
+      // console.log(e)
+      for (let i = 0; i < this.options.length; i++) {
+        if (this.options[i].binNumber == e) {
+          this.form.positionId = this.options[i].id
+        }
+
+      }
+    },
+      warehouseNameChange(e){
+        if (e == '全部仓库' || e == '') {
+        this.warehouseName = ''
+        this.goodsList = []
+        this.goodsName = '0'
+        this.baseId = ''
+      }else{
+        this.goodsList = []
+        for(let i =0 ; i<this.warehouseList.length;i++){
+          if(this.warehouseList[i].warehouseName == e){
+            console.log(this.warehouseList[i])
+            if(this.warehouseList[i].goodsNameInfos){
+              for(let j = 0;j<this.warehouseList[i].goodsNameInfos.length;j++){//构造数据，合并重复货名
+              if(j==0){
+                this.goodsList.push(this.warehouseList[i].goodsNameInfos[j])
+              }else{
+                // 
+                  if(this.goodsList.every((item)=>{return item.goodsName != this.warehouseList[i].goodsNameInfos[j].goodsName}) ){
+                    this.goodsList.push(this.warehouseList[i].goodsNameInfos[j])
+                  }else{
+                    for(let n = 0;n < this.goodsList.length;n++){
+                      if(this.goodsList[n].goodsName == this.warehouseList[i].goodsNameInfos[j].goodsName){
+                        this.goodsList[n].storage += this.warehouseList[i].goodsNameInfos[j].storage
+                      }
+                   }
+                  }
+                // 
+              }
+            }
+            }
+            
+            this.baseId = this.warehouseList[i].id
+            
+
+            break
+          }
+        }
+        this.goodsName= '0'
+      }
         this.getList()
       },
       datechange(e){
@@ -379,7 +461,9 @@
           this.form.id=row.id
           this.form.surplusWeight=row.surplusWeight
           this.form.profitAndLoss=row.profitAndLoss
-          this.form.num=row.surplusWeight+row.plValue
+          this.form.num=parseInt((row.surplusWeight+row.plValue)*100)/100
+          this.form.positionId=row.positionId
+          this.form.binNumber=row.binNumber
           this.form.plValue=row.plValue
           this.title='审核'
           this.currectflag=row.operationFlag
@@ -394,16 +478,18 @@
       },
       lose(ware){
         if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
-          console.log(this.multipleSelection[ware])
-          if(this.multipleSelection[ware]){
-            this.form.id=this.multipleSelection[ware].id
-            this.form.workflowId=this.multipleSelection[ware].workflowId
-            this.form.surplusWeight=this.multipleSelection[ware].surplusWeight
-            this.form.profitAndLoss=this.multipleSelection[ware].profitAndLoss
+          console.log(this.multipleSelection[ware.id])
+          if(this.multipleSelection[ware.id]){
+            this.form.baseId=ware.baseId
+            this.form.goodsName=this.multipleSelection[ware.id].goodsName
+            this.form.id=this.multipleSelection[ware.id].id
+            this.form.workflowId=this.multipleSelection[ware.id].workflowId
+            this.form.surplusWeight=this.multipleSelection[ware.id].surplusWeight
+            this.form.profitAndLoss=this.multipleSelection[ware.id].profitAndLoss
             this.title='盘亏'
             this.slecetwarehouseName=''
             // console.log(this.multipleSelection[ware].approveStatus,1111111111111)
-            if(this.multipleSelection[ware].inventoryStatus){
+            if(this.multipleSelection[ware.id].inventoryStatus&&this.multipleSelection[ware.id].inventoryStatus=='待审核'){
             this.$notify.warning({
               title: '警告',
               message: '当前数据审核中',
@@ -428,13 +514,15 @@
       },
       profit(ware){
         if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
-          if(this.multipleSelection[ware]){
-          this.form.id=this.multipleSelection[ware].id
-          this.form.workflowId=this.multipleSelection[ware].workflowId
-          this.form.surplusWeight=this.multipleSelection[ware].surplusWeight
-          this.form.profitAndLoss=this.multipleSelection[ware].profitAndLoss
+          if(this.multipleSelection[ware.id]){
+          this.form.baseId=ware.baseId
+          this.form.goodsName=this.multipleSelection[ware.id].goodsName
+          this.form.id=this.multipleSelection[ware.id].id
+          this.form.workflowId=this.multipleSelection[ware.id].workflowId
+          this.form.surplusWeight=this.multipleSelection[ware.id].surplusWeight
+          this.form.profitAndLoss=this.multipleSelection[ware.id].profitAndLoss
           this.title='盘盈'
-          if(this.multipleSelection[ware].inventoryStatus){
+          if(this.multipleSelection[ware.id].inventoryStatus&&this.multipleSelection[ware.id].inventoryStatus=='待审核'){
             this.$notify.warning({
               title: '警告',
               message: '当前数据审核中',
@@ -468,7 +556,7 @@
             return
           }
         if(this.title=='盘盈'){
-          this.form.plValue=this.form.num-this.form.surplusWeight
+          this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(2)
           this.form.flag=0
           if(this.form.num<this.form.surplusWeight){
             this.$notify.warning({
@@ -480,7 +568,7 @@
           title='确定提交盘盈数据？'
         }
         if(this.title=='盘亏'){
-          this.form.plValue=this.form.num-this.form.surplusWeight
+          this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(2)
           this.form.flag=1
           if(this.form.num>this.form.surplusWeight){
             this.$notify.warning({
@@ -507,11 +595,6 @@
                   type: 'success'
                 });
                 this.getList()
-              }).catch(() => {
-                  this.$message({
-                    message: '提交失败',
-                    type: 'error'
-                  });
               })  
         })
       },
@@ -631,7 +714,10 @@
             searchKeyWord: this.searchKeyWord,
             warehouseName:this.warehouseName,
             inOutType:this.inOutType,
-            flag:this.flag
+            flag:this.flag,
+            inventoryFlag:1,
+            inventoryStatus:this.searchType,
+            goodsName:this.goodsName!='0'?this.goodsName:'',
           })
           .toPromise()
           .then((response) => {
@@ -644,7 +730,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=data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss
+                  data[q].surplusWeight=parseInt((data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss)*100)/100
                 // }
                 data[q].select=false
                 data[q].weightedit=false

src/views/warehousenew/warehousingOrder.vue

@@ -2031,6 +2031,7 @@ export default {
                 data[q].surplusWeight =(data[q].inWarehouseWeight - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
               }
               data[q].avgCost = Number(data[q].avgCost).toFixed(2)
+              data[q].amountMoney = Number(data[q].amountMoney).toFixed(4)
               console.log(response.records[i].warehouseType)
               data[q].select = false
               data[q].weightedit = false

src/views/workNotification/utils/index.js

@@ -108,6 +108,10 @@ export function warehousetask(code, state){
     case 'INOUTTASK-TASK-APPROVE':
       url = 'tranManagementWarehouseInOutTask'
       break
+    // 附件
+    case 'FEIYONGGUANLI-APPROVE':
+      url = 'expensemanagementdetails'
+      break
   }
   return url
 }