前端

public/static/payprint.html

@@ -144,149 +144,156 @@
     <div id="app">
       <div class="content" v-if="bigContent">
         <div class="center">
-            <div class="header1">中天昊元粮食贸易有限公司结算凭证</div>
-            <div class="line"></div>
-            <div class="line"></div>
-          <div class="header">
-             <div>单位名称：黑龙江中天昊元粮食贸易有限公司</div>
-             <div>税务登记编号：91230230MA1BNL7Q93</div>
-          </div>
-          <div class="header-top">
-            <div>单位：公斤、元</div>
-            <div>No.</div>
-          </div>
-          <div class="header-top">
-            <div>开票日期：{{printData.currentTime}}</div>
-            <div class="number">{{100000000000000}}</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="3">{{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="3">{{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="3">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc">收货仓库</td>
-              <td class="col" colspan="3">{{printData.warehouseName}}</td>
-              <td class="col col-bgc">地址</td>
-              <td class="col" colspan="3">{{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">毛重</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.grossWeight}}</td>
-              <td class="col">{{printData.tare}}</td>
-              <td class="col">{{printData.qualityInspectionManagement.buckleWeightRatio}}</td>
-              <td class="col">{{printData.netWeight}}</td>
-              <td class="col">{{printData.pureWeight}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc" v-if="printData.type == '潮粮'">净重单价</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">运费补助</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 " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
-              <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
-              <td class="col ">{{printData.unitDeduction}}</td>
-              <td class="col ">{{printData.grainMoney}}</td>
-              <td class="col ">{{printData.weighingSubsidy}}</td>
-              <td class="col ">{{printData.freightSubsidy}}</td>
-              <td class="col ">{{printData.unloadSubsidy}}</td>
-              <td class="col ">{{printData.otherSubsidy}}</td>
-              <td class="col ">{{printData.weighingDeduction}}</td>
-              <td class="col ">{{printData.freightDeduction}}</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" 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="5">记事</td>
-            </tr>
-            <tr class="row">
-              <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 ">{{printData.calculationPayable}}</td>
-              <td class="col ">{{printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
-              <td class="col ">{{printData.carNo}}</td>
-              <td class="col " colspan="5">{{printData.remarks}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc">实付金额</td>
-              <td class="col " colspan="2">{{printData.actualPayment}}</td>
-              <td class="col col-bgc" colspan="3">人民币（大写）</td>
-              <td class="col " colspan="4">{{printData.capitalize}}</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>复点：{{printData.qualityInspector}}</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>
+        <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.currentTime}}</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 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">毛重</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.grossWeight}}</td>
+             <td class="col">{{ printData.tare}}</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"  v-if="printData.type == '潮粮'">净重单价</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">运费补助</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 " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
+             <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
+             <td class="col ">{{ printData.unitDeduction}}</td>
+             <td class="col ">{{ printData.grainMoney}}</td>
+             <td class="col ">{{ printData.weighingSubsidy}}</td>
+             <td class="col ">{{ printData.freightSubsidy}}</td>
+             <td class="col ">{{ printData.unloadSubsidy}}</td>
+             <td class="col ">{{ printData.otherSubsidy}}</td>
+             <td class="col ">{{ printData.weighingDeduction}}</td>
+             <td class="col ">{{ printData.freightDeduction}}</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" 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="5">记事</td>
+           </tr>
+           <tr class="row">
+             <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 ">{{ printData.calculationPayable}}</td>
+             <td class="col ">{{ printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
+             <td class="col ">{{ printData.carNo}}</td>
+             <td class="col " colspan="5">{{ printData.remarks}}</td>
+           </tr>
+           <tr class="row">
+             <td class="col col-bgc">实付金额</td>
+             <td class="col " colspan="2">{{printData.actualPayment}}</td>
+             <td class="col col-bgc" colspan="3">人民币（大写）</td>
+             <td class="col " colspan="4">{{printData.capitalize}}</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>
       <div class="small-content" v-if="smallContent">
         <div class="small-title">
           <div>
-            中天昊元粮食贸易有限公司结算凭证</div>
+            {{printData.compName}}结算凭证</div>
           <img class="small-img" src="../img/add.png" alt="">
         </div>
         <div class="small-row">
@@ -351,7 +358,7 @@
         </div>
         <div class="small-row">
           <div>扣杂重</div>
-          <div>{{printData.buckleMiscellaneous}}</div>
+          <div>{{printData.weighingManagement.buckleMiscellaneous}}</div>
         </div>
         <div class="small-row">
           <div>净重</div>
@@ -455,9 +462,8 @@
         </div>
         <div class="small-row">
           <div>复点</div>
-          <div>{{}}</div>
+          <div>&nbsp;&nbsp;&nbsp;</div>
         </div>
-
       </div>
     </div>
   </body>
@@ -475,6 +481,9 @@
       },
       computed: {},
       methods: {
+        dealNo(str){
+         return str.slice(4)
+        },
         tableRowClassName({
           row,
           rowIndex
@@ -515,7 +524,7 @@
         // console.log(_data)
         this.printData = JSON.parse(_data)
         // console.log(this.tableData)
-        document.title="中天昊元粮食贸易有限公司结算凭证"
+        document.title=printData.compName+"结算凭证"
         window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -384,7 +384,7 @@
         </ws-form-item>
 
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -411,7 +411,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -431,7 +431,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -441,7 +441,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -382,7 +382,7 @@
           {{ deptBudgetList.contractGoodsInfo.goodsName }}
         </ws-form-item>
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -409,7 +409,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -429,7 +429,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -439,7 +439,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"
@@ -1773,7 +1773,7 @@ export default {
   margin: 15px 0px;
 }
 .wenzi {
-  width: 900px;
+  width: 1200px;
   margin: 0 auto;
 }
 .wenzi h3 {

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -376,7 +376,7 @@
         </ws-form-item>
 
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -403,7 +403,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -423,7 +423,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -433,7 +433,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -376,7 +376,7 @@
             {{ deptBudgetList.contractGoodsInfo.goodsName }}
           </ws-form-item>
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -403,7 +403,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -423,7 +423,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -433,7 +433,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/purchaseContractAdd.vue

@@ -361,7 +361,7 @@
         </ws-form-item>
 
         <!--水分（%）<=-->
-        <ws-form-item label="水分（%）" span="1" prop="waterContent">
+        <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.waterContent"
             placeholder="请输入水分占比"
@@ -388,7 +388,7 @@
         </ws-form-item>
 
         <!--杂质（%）<=-->
-        <ws-form-item label="杂质（%）" span="1" prop="impurity">
+        <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.impurity"
             placeholder="请输入杂质占比（%）"
@@ -408,7 +408,7 @@
         </ws-form-item>
 
         <!--霉变粒（%）<=-->
-        <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+        <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
             placeholder="请输入霉变粒占比（%）"
@@ -418,7 +418,7 @@
         </ws-form-item>
 
         <!--热损伤（%）<=-->
-        <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+        <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
             placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/salesContractAdd.vue

@@ -366,7 +366,7 @@
           </ws-form-item>
 
           <!--水分（%）<=-->
-          <ws-form-item label="水分（%）" span="1" prop="waterContent">
+          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
               placeholder="请输入水分占比"
@@ -393,7 +393,7 @@
           </ws-form-item>
 
           <!--杂质（%）<=-->
-          <ws-form-item label="杂质（%）" span="1" prop="impurity">
+          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.impurity"
               placeholder="请输入杂质占比（%）"
@@ -413,7 +413,7 @@
           </ws-form-item>
 
           <!--霉变粒（%）<=-->
-          <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
+          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
               placeholder="请输入霉变粒占比（%）"
@@ -423,7 +423,7 @@
           </ws-form-item>
 
           <!--热损伤（%）<=-->
-          <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
+          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
               placeholder="请输入输入热损伤占比（%）"

src/views/contractManagement/salesContractEdit.vue

@@ -344,7 +344,7 @@
           </ws-form-item>
 
           <!--水分（%）<=-->
-          <ws-form-item label="水分（%）" span="1" prop="contractNo">
+          <ws-form-item label="水分（%）<=" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
               placeholder="请输入水分（%）"
@@ -362,7 +362,7 @@
           </ws-form-item>
 
           <!--杂质（%）<=-->
-          <ws-form-item label="杂质（%）" span="1" prop="contractNo">
+          <ws-form-item label="杂质（%）<=" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.impurity"
               placeholder="请输入杂质（%）"
@@ -382,7 +382,7 @@
           </ws-form-item>
 
           <!--霉变粒（%）<=-->
-          <ws-form-item label="霉变粒（%）" span="1" prop="contractNo">
+          <ws-form-item label="霉变粒（%）<=" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
               placeholder="请输入霉变粒（%）"
@@ -392,7 +392,7 @@
           </ws-form-item>
 
           <!--热损伤（%）<=-->
-          <ws-form-item label="热损伤（%）" span="1" prop="contractNo">
+          <ws-form-item label="热损伤（%）<=" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
               placeholder="请输入热损伤（%）"

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="center">
     <div class="header">
-       <div>单位名称：黑龙江中天昊元粮食贸易有限公司</div>
-       <div>税务登记编号：91230230MA1BNL7Q93</div>
+       <div>单位名称：{{ printData.compName}}</div>
+       <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
     </div>
     <div class="header-top">
       <div>单位：公斤、元</div>
@@ -11,7 +11,7 @@
     <div class="header-top">
       <div>开票日期：{{printData.currentTime}}</div>
       <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
-      <div class="number">{{100000000000000}}</div>
+      <div class="number">{{dealNo(printData.paymentNo)}}</div>
     </div>
     <table class="table">
       <tr class="row">
@@ -20,25 +20,25 @@
         <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="3">{{ printData.customerName}}</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="3">{{ printData.identityAuthenticationInfo.customerNumberCard}}</td>
+        <td class="col" colspan="4">{{ printData.identityAuthenticationInfo.customerNumberCard}}</td>
       </tr>
       <tr class="row">
-        <td class="col col-bgc">化验单号</td>
+        <td class="col col-bgc">业务编号</td>
         <td class="col" colspan="3">{{ printData.paymentNo}}</td>
         <td class="col col-bgc">卡号</td>
-        <td class="col" colspan="3">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</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="3">{{printData.warehouseName}}</td>
         <td class="col col-bgc">地址</td>
-        <td class="col" colspan="3">{{printData.identityAuthenticationInfo.compAddress}}</td>
+        <td class="col" colspan="4">{{printData.identityAuthenticationInfo.compAddress}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">货名</td>
@@ -60,7 +60,7 @@
         <td class="col">{{ printData.qualityInspectionManagement.impurity}}</td>
         <td class="col">{{ printData.grossWeight}}</td>
         <td class="col">{{ printData.tare}}</td>
-        <td class="col">{{ printData.qualityInspectionManagement.buckleWeightRatio}}</td>
+        <td class="col">{{ printData.weighingManagement.buckleMiscellaneous}}</td>
         <td class="col">{{ printData.netWeight}}</td>
         <td class="col">{{ printData.pureWeight}}</td>
       </tr>
@@ -76,12 +76,11 @@
         <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 " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
         <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
-        <td class="col ">{{ printData.qualityInspectionManagement.unitDeduction}}</td>
+        <td class="col ">{{ printData.unitDeduction}}</td>
         <td class="col ">{{ printData.grainMoney}}</td>
         <td class="col ">{{ printData.weighingSubsidy}}</td>
         <td class="col ">{{ printData.freightSubsidy}}</td>
@@ -90,23 +89,24 @@
         <td class="col ">{{ printData.weighingDeduction}}</td>
         <td class="col ">{{ printData.freightDeduction}}</td>
         <td class="col ">{{ printData.unloadDeduction}}</td>
-        <td class="col ">{{ printData.qualityDeduction}}</td>
       </tr>
       <tr class="row">
+        <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="6">记事</td>
+        <td class="col col-bgc" colspan="5">记事</td>
       </tr>
       <tr class="row">
+        <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 ">{{ printData.calculationPayable}}</td>
         <td class="col ">{{ printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
         <td class="col ">{{ printData.carNo}}</td>
-        <td class="col " colspan="6">{{ printData.remarks}}</td>
+        <td class="col " colspan="5">{{ printData.remarks}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">实付金额</td>
@@ -124,7 +124,8 @@
         <div>皮检：{{ printData.weighingManagement.skinInspector}}</div>
         <div>结算：{{ printData.settlementClerk}}</div>
         <div>付款：{{ printData.cashier}}</div>
-        <div>复点：{{ printData.qualityInspector}}</div>
+        <div>复点：{{ }}</div>
+        <div></div>
       </div>
       <div class="bottom-row2">
         <!-- <div class="left">
@@ -158,10 +159,12 @@
     },
     activated() {
       let date = new Date()
-     
       console.log( date.getFullYear())
     },
     methods: {
+      dealNo(str){
+        return str.slice(4)
+      },
       date(){
         let date = new Date()
        let datas = date.getDate

src/views/houseSelfCollect/inspectInfo.vue

@@ -73,7 +73,7 @@
           <ws-info-table>
             <ws-form-item label="等级" span="1" prop="grade">
               <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect"
-                :disabled="disabled">
+                :disabled="disabled" @change="waterContentChange">
                 <ws-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
                   :value="item.constValue" />
               </ws-select>
@@ -84,7 +84,7 @@
             </ws-form-item>
             <ws-form-item label="水分（%）" span="1" prop="waterContent">
               <ws-input v-model="inspect.waterContent" placeholder="请输入水分占比" maxlength="100" size="small"
-                @change="waterContentChange" :disabled="disabled" />
+                @change="waterContentChange('water')" :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
               <ws-input v-model="inspect.mildewGrain" placeholder="请输入霉变粒占比" maxlength="100" size="small"
@@ -626,14 +626,7 @@
               if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
                 if ((this.purchasePriceList[i].saleLimit - response/1000 < 50 || count > 0)&&this.tipFlag) {
                   this.tipFlag = false
-                    this.$alert('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。',
-                          '提示',
-                          {
-                            confirmButtonText: '确定',
-                            callback: (action) => {
-                            },
-                          }
-                        )
+                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。');
                 }
               }
             }
@@ -641,8 +634,8 @@
         }
       },
 
-      waterContentChange() {
-        if (this.inspect.goodsName) {
+      waterContentChange(type) {
+        if (this.inspect.goodsName&&type!='water') {
           for (var i = 0; i < this.purchasePriceList.length; i++) {
             if (this.purchasePriceList[i].goodsName == this.inspect.goodsName) {
               this.$set(this.inspect,'buckleWeightRatio',this.purchasePriceList[i].deductWeight)
@@ -701,20 +694,12 @@
               if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
                 if ((this.purchasePriceList[i].saleLimit - response/1000 < 50 || count > 0 )&&this.tipFlag) {
                   this.tipFlag = false
-                    this.$alert('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。',
-                          '提示',
-                          {
-                            confirmButtonText: '确定',
-                            callback: (action) => {
-                            },
-                          }
-                        )
+                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。');
                 }
               }
             }
           })
         }
-        
         }
       },
 

src/views/houseSelfCollect/inspectionManagement.vue

@@ -86,8 +86,8 @@
       <el-table-column width="400" label="操作">
         <template slot-scope="scope">
           <el-button @click="inspectInfo(scope.row, 2)" v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
-          <el-button @click="inspectInfo(scope.row, 3)" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">编辑</el-button>
-          <el-button @click="del(scope.row)" type="danger" v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
+          <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status!='已称皮重'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">编辑</el-button>
+          <el-button @click="del(scope.row)" v-if="scope.row.status=='已质检'" type="danger" v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
           <el-button @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionQuality.print`">打印</el-button>
         </template>
       </el-table-column>

src/views/houseSelfCollect/paymentManagement.vue

@@ -120,7 +120,7 @@
             v-hasPermission="`acquisitionManagement.acquisitionPay.view`"
           >查看</el-button>
           <el-button
-            v-show=" scope.row.approveStatus || scope.row.status == '已驳回' || userJurisdiction "
+            v-show="(scope.row.approveStatus || scope.row.status == '已驳回' || userJurisdiction)&&scope.row.status != '待结算'"
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
           >打印</el-button>
@@ -193,7 +193,7 @@
         class="table-content"
         center
         :visible.sync="isShowPrint"
-        title="中天昊元粮食贸易有限公司结算凭证"
+        :title="printData.compName+'结算凭证'"
       >
         <paymentPrint :printData="printData"></paymentPrint>
         <div style="text-align: center">
@@ -565,6 +565,9 @@ export default {
         .then(response => {
           this.isShowPrint = true
           this.printData = response
+          // 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() + '日'
         })

src/views/houseSelfCollect/settlement.vue

@@ -68,17 +68,11 @@
             <ws-form-item label="购粮性质" span="1" prop="waterContent">
                 <ws-input v-model="paymentList.qualityInspectionManagement.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
             </ws-form-item>
-            <!-- <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价" span="1" prop="waterContent">
-                <ws-input v-model="paymentList.solidGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" :disabled='disabled' />
-            </ws-form-item> -->
-             <!-- <ws-form-item v-if='paymentList.type=="潮粮"' label="纯重单价（元/公斤）" span="1" prop="tidalGrainPrice">
-                <ws-input v-model="paymentList.tidalGrainPrice" placeholder="请输入纯重单价" maxlength="100" size="small" disabled />
-            </ws-form-item> -->
              <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价（元/公斤）" span="1" prop="waterContent">
                 <ws-input v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
             </ws-form-item>
              <ws-form-item v-if='paymentList.type=="干粮"' label="净重（公斤）" span="1" prop="waterContent">
-                <ws-input v-model="paymentList.netWeight" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
+                <ws-input v-model="paymentList.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled />
             </ws-form-item>
           </ws-info-table>
           <div class="titles">质检数据</div>
@@ -201,7 +195,7 @@
               <ws-input v-model="paymentList.weighingManagement.buckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item  label="扣单价（元/公斤）" span="1" prop="unitDeduction">
-              <ws-input v-model="paymentList.unitDeduction" placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled"/>
+              <ws-input v-model="paymentList.unitDeduction" @input="grainMoney" placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled"/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"'
               label="纯重单价（元/公斤）"
@@ -210,7 +204,7 @@
             >
               <!-- v-model="paymentList.solidGrainPrice" -->
               <ws-input
-              v-model="paymentList.tidalGrainPrice"
+              v-model="paymentList.solidGrainPrice"
                 placeholder="请输入纯重单价"
                 maxlength="100"
                 size="small"
@@ -398,7 +392,7 @@
       class="table-content"
       center
       :visible.sync="isShowPrint"
-      title="中天昊元粮食贸易有限公司结算凭证"
+      :title="printData.compName+'结算凭证'"
        @close="closeDialog"
        :modal-append-to-body = "false"
     >
@@ -460,7 +454,6 @@ export default {
         let dataURL = canvas.toDataURL('image/png')
         this.imgUrl = dataURL
         if (this.imgUrl !== '') {
-          debugger
           let b = this.dataURLtoFile(this.imgUrl, 'printImage')
           let formdata = new FormData()
           formdata.append('file', b)
@@ -497,32 +490,18 @@ export default {
             this.paymentList.unitDeduction = 0
           } 
           this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
-          this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(2)
+          this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
           this.paymentList.qualityInspectionManagement.waterMin=this.$route.query.waterMin
           this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
-        this.paymentList.qualityInspectionManagement.weightDeduction=this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
-         this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
-         this.paymentList.base = this.paymentList.base.toFixed(2)
+          this.paymentList.qualityInspectionManagement.weightDeduction=this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
+          this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
+          this.paymentList.base = this.paymentList.base.toFixed(3)
           this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
-           this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
+          this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
           if(!this.paymentList.dryGrainPrice){
             this.paymentList.dryGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
           }
-          if(this.paymentList.type =='潮粮'){
-            this.paymentList.grainMoney=(this.paymentList.qualityInspectionManagement.tidalGrainPrice - this.paymentList.unitDeduction)*this.paymentList.weighingManagement.netWeight
-            this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
-            this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
-      
-              this.paymentList.actualPayment = this.paymentList.calculationPayable
-              this.actualPayment( this.paymentList.actualPayment)
-          }else{
-            this.paymentList.grainMoney=(this.paymentList.qualityInspectionManagement.dryGrainPrice - this.paymentList.unitDeduction)*this.paymentList.weighingManagement.netWeight
-             this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
-              this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
-                this.paymentList.actualPayment = this.paymentList.calculationPayable
-                this.actualPayment( this.paymentList.actualPayment)
-          }
-           this.paymentList.grainMoney = this.paymentList.grainMoney.toFixed(2)
+          this.grainMoney()
         })
           
     },
@@ -530,11 +509,22 @@ export default {
      this.paymentList.capitalize=this.convertCurrency(e)
     },
     grainMoney(){
-       this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
-       this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
-      this.paymentList.actualPayment = this.paymentList.calculationPayable
-      this.actualPayment( this.paymentList.actualPayment)
-      // this.paymentList.calculationPayable=num.toFixed(2)
+      if(this.paymentList.type =='潮粮'){
+        this.paymentList.grainMoney=(this.paymentList.qualityInspectionManagement.tidalGrainPrice - this.paymentList.unitDeduction)*this.paymentList.weighingManagement.netWeight
+        this.paymentList.solidGrainPrice = (Number(this.paymentList.grainMoney)/Number(this.paymentList.pureWeight)).toFixed(4)
+        this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
+        this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
+  
+        this.paymentList.actualPayment = this.paymentList.calculationPayable
+        this.actualPayment( this.paymentList.actualPayment)
+      }else{
+        this.paymentList.grainMoney=(this.paymentList.qualityInspectionManagement.dryGrainPrice - this.paymentList.unitDeduction)*this.paymentList.weighingManagement.netWeight
+        this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
+        this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
+        this.paymentList.actualPayment = this.paymentList.calculationPayable
+        this.actualPayment( this.paymentList.actualPayment)
+      }
+      this.paymentList.grainMoney = this.paymentList.grainMoney.toFixed(2)
     },
      /**
          * 将金额数字转为汉字大写
@@ -746,11 +736,10 @@ export default {
       if(this.paymentList.buckleWeightRatio >= 0 && this.paymentList.buckleWeightRatio <= 2){
         this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
         this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
-      this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
-      this.paymentList.base = this.paymentList.base.toFixed(2)
-      this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
-       this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
-
+        this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
+        this.paymentList.base = this.paymentList.base.toFixed(3)
+        this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
+        this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
       }else{
          this.$message({
             message: '扣重比输入错误',

src/views/houseSelfCollect/weighingManagement.vue

@@ -158,6 +158,7 @@ export default {
       value1: '', //选择时间
       warehouseList: [],
       warehouseId: '',
+      cangid: '',
       isShowPrint:false,//打印弹出
       dialogData:{
         qualityInspectionManagement:{},
@@ -196,13 +197,15 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].value == e) {
           this.warehouseId = this.warehouseList[i].warehouseId
-         this.purchasePriceList = this.warehouseList[i].warehouseList
+          this.cangid = this.warehouseList[i].warehouseId
+          this.purchasePriceList = this.warehouseList[i].warehouseList
           this.allowEdit = this.warehouseList[i].allowEdit
-            this.WAREHOUSE[2].payname = this.warehouseList[i].value
-             this.common.name  =  this.warehouseList[0].value
-            sessionStorage.setItem('ck',e)
+          this.WAREHOUSE[2].payname = this.warehouseList[i].value
+          this.common.name  =  this.warehouseList[0].value
+          sessionStorage.setItem('ck',e)
         }
       }
+
       this.getList()
     },
     weightCheck(row, num) {
@@ -254,17 +257,23 @@ export default {
               warehouseList:response[i].purchasePriceList,
               allowEdit:response[i].allowEdit
             })
+            if (this.cangid&&this.cangid == response[i].id) {
+              this.warehouseName = response[i].warehouseName
+              this.allowEdit = response[i].allowEdit
+              this.common.name = response[i].warehouseName
+              this.warehouseId =  response[i].id
+              this.warehouseNo =  response[i].commonWarehouseNo
+              this.purchasePriceList =  response[i].purchasePriceList
+            }
           }
-          this.warehouseName =  this.warehouseList[0].value
-             if (this.warehouseId) {
-            this.warehouseName = this.WAREHOUSE[2].payname
-          } else {
-            this.WAREHOUSE[2].payname = this.warehouseList[0].value
+           if(this.warehouseList.length > 0 && !this.cangid){
+            this.warehouseName = this.warehouseList[0].value
+            this.cangid =  this.warehouseList[0].warehouseId
+            this.warehouseId =  this.warehouseList[0].warehouseId
+            this.purchasePriceList =  this.warehouseList[0].purchasePriceList
+            this.WAREHOUSE[1].payname = this.warehouseList[0].value
+            this.common.name  =  this.warehouseList[0].value
           }
-          this.allowEdit = this.warehouseList[0].allowEdit
-          this.warehouseId = this.warehouseList[0].warehouseId
-          this.purchasePriceList = this.warehouseList[0].warehouseList
-           this.common.name  =  this.warehouseList[0].value
            sessionStorage.setItem('ck',this.common.name)
          this.getList()
         })

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -77,6 +77,9 @@
               :label="item.contractNo"
               :value="item.contractNo"
             ></el-option> -->
+            
+            {{dataList.moveTaskNo}}
+            {{dataList.contractNo}}
             <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
             <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
             <!-- </el-select> -->
@@ -495,7 +498,7 @@ export default {
       this.$router.go(-1)
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+      this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
     },
     // 获取当前年月日
     getdate() {
@@ -555,7 +558,8 @@ export default {
             .toPromise()
             .then(response => {
               this.$message.success('添加成功')
-              this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+              this.$router.go(-1)
+              // this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
             })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -565,7 +569,8 @@ export default {
     },
     //关闭
     close() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+      this.$router.go(-1)
+      // this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
     },
     tarechange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {
@@ -648,6 +653,7 @@ export default {
           } else {
             if(response[0].taskTypeKey == 2){
               this.dataList.taskTypeKey=response[0].taskTypeKey
+               this.dataList = response[0]
               this.dataList.inOutType=response[0].inOutType
               this.dataList1 = response[0]
             }else{

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -409,7 +409,7 @@ export default {
         },
       })
     },
-    audit(item) {
+    audit(item) {debugger
       this.$router.push({
         path: 'tranManagementWarehouseInOuttaskaudit',
         query: {

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -6,45 +6,46 @@
         <h2 class="bg-left title">审核出入库任务</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+          <img
             width="6"
             height="10"
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+            alt
+          />返回
+        </el-button>
       </el-col>
     </el-row>
     <div class="basicInformation">
       <div class="annu">
-        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-        </el-radio-group>
+        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey"></el-radio-group>
         <div class="nav">
           <span class="ziti">
             任务类型：
-            <h1 class="ziti1" v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"> 移库任务</h1>
-          <h1 class="ziti1" v-show="dataList.inOutType == '销售出库'||dataList.inOutType == '暂存出库'||dataList.inOutType == '贸易服务出库'||dataList.inOutType == '采购出库'"> 出库任务</h1>
-          <h1 class="ziti1" v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"> 入库任务</h1>
+            <h1
+              class="ziti1"
+              v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"
+            >移库任务</h1>
+            <h1
+              class="ziti1"
+              v-show="dataList.inOutType == '销售出库'||dataList.inOutType == '暂存出库'||dataList.inOutType == '贸易服务出库'||dataList.inOutType == '采购出库'"
+            >出库任务</h1>
+            <h1
+              class="ziti1"
+              v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"
+            >入库任务</h1>
           </span>
         </div>
       </div>
       <div class="ding"></div>
-      <div
-        v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4"
-        class="center1"
-      >
+      <div v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4" class="center1">
         <img
           style="position: relative; top: 40px; left: 300px"
           width="19"
           height="19"
           src="../../../public/img/cangku.png"
-          alt=""
+          alt
         />
         <!--出库=-->
         <div class="small-title">
@@ -143,11 +144,7 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item
-            label="重量（吨）"
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               disabled
               v-model="dataList.weight"
@@ -161,7 +158,7 @@
           <el-form-item label="品级">
             <el-select
               v-model="dataList.grade"
-              placeholder=""
+              placeholder
               class="typeselect"
               @change="selectpackingMethod"
             >
@@ -185,11 +182,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item
-            label="水分（%）<="
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               @input="waterContentchange"
               v-model="dataList.waterContent"
@@ -200,11 +193,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item
-            label="单价(元/吨)"
-            span="1"
-            style="margin-left: 650px; margin-top: -40px"
-          >
+          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -215,12 +204,7 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计出库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
+          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
             <el-date-picker
               disabled
               v-model="dataList.predictDate"
@@ -248,11 +232,7 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item
-            v-if="dataList.taskTypeKey != 3"
-            label="业务描述"
-            span="1"
-          >
+          <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
@@ -278,7 +258,7 @@
           width="19"
           height="19"
           src="../../../public/img/cangku.png"
-          alt=""
+          alt
         />
         <div class="small-title">
           <h3>
@@ -286,12 +266,7 @@
             <span v-if="deletetask" style="color: red">已删除</span>
           </h3>
         </div>
-        <el-form
-          v-if="!deletetask"
-          ref="form"
-          :model="form"
-          label-width="140px"
-        >
+        <el-form v-if="!deletetask" ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名" v-if="dataList1.inOutType == '移库入库'">
             <el-select
@@ -309,10 +284,7 @@
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
-          <el-form-item
-            label="入库类型"
-            v-if="dataList1.inOutType == '移库入库'"
-          >
+          <el-form-item label="入库类型" v-if="dataList1.inOutType == '移库入库'">
             <el-select
               disabled
               v-model="dataList1.inOutType"
@@ -385,11 +357,7 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item
-            label="重量（吨）"
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               @input="weightchange"
               v-model="dataList1.weight"
@@ -404,7 +372,7 @@
             <el-select
               :disabled="dataList.taskTypeKey == 3"
               v-model="dataList1.grade"
-              placeholder=""
+              placeholder
               class="typeselect"
               @change="selectpackingMethod1"
             >
@@ -429,11 +397,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item
-            label="水分（%）<="
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               @input="waterContentchange"
               :disabled="dataList.taskTypeKey == 3"
@@ -445,11 +409,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item
-            label="单价(元/吨)"
-            span="1"
-            style="margin-left: 650px; margin-top: -40px"
-          >
+          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -461,12 +421,7 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计入库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
+          <el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
             <el-date-picker
               disabled
               v-model="dataList1.predictDate"
@@ -521,7 +476,7 @@
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
-            alt=""
+            alt
           />
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
@@ -615,11 +570,7 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item
-            label="重量（吨）"
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               disabled
               v-model="dataList.weight"
@@ -634,7 +585,7 @@
             <el-select
               disabled
               v-model="dataList.grade"
-              placeholder=""
+              placeholder
               class="typeselect"
               @change="selectpackingMethod"
             >
@@ -658,11 +609,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item
-            label="水分（%）<="
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               disabled
               v-model="dataList.waterContent"
@@ -673,11 +620,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item
-            label="单价(元/吨)"
-            span="1"
-            style="margin-left: 650px; margin-top: -40px"
-          >
+          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
             <el-input
               disabled
               v-model="dataList.unitPrice"
@@ -688,12 +631,7 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计出库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
+          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
             <el-date-picker
               v-model="dataList.predictDate"
               type="date"
@@ -727,49 +665,34 @@
               size="large"
             />
           </el-form-item>
-        </el-form>     
+        </el-form>
       </div>
     </div>
 
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="reject()"
-        >驳回</el-button
-      >
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
-        >通过</el-button
-      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="reject()">驳回</el-button>
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()">通过</el-button>
     </div>
-     <el-table
-        class="wenzi"
-        :data="taskhistories"
-        style="width: 80%"
-        height="180"
-      >
-        <el-table-column prop="operatorMajorRoleName" label="审核人">
-        </el-table-column>
-        <el-table-column prop="inOutTaskNo" label="审核结果">
-          <template scope="scope">
-            <span v-if='scope.row.approved'>通过</span>
-            <span v-if='!scope.row.approved'>驳回</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
-     </el-table>
-    <WinseaContentModal
-      v-model="outerVisible"
-      title="驳回原因"
-      @on-cancel="handleClose"
-    >
+    <el-table class="wenzi" :data="taskhistories" style="width: 80%" height="180">
+      <el-table-column prop="operatorMajorRoleName" label="审核人"></el-table-column>
+      <el-table-column prop="inOutTaskNo" label="审核结果">
+        <template scope="scope">
+          <span v-if="scope.row.approved">通过</span>
+          <span v-if="!scope.row.approved">驳回</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="审核时间"></el-table-column>
+      <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+    </el-table>
+    <WinseaContentModal v-model="outerVisible" title="驳回原因" @on-cancel="handleClose">
       <el-input
         type="textarea"
         :rows="2"
         maxlength="30"
         placeholder="请输入驳回原因，1~30个字"
         v-model="auditMind"
-      >
-      </el-input>
+      ></el-input>
       <div class="dialog-footer">
         <el-button @click="outerVisible = false">取 消</el-button>
         <el-button type="primary" @click="disableReasons">确定</el-button>
@@ -792,11 +715,12 @@ import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
+import { mapGetters } from 'vuex'
 export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     // vesselId(val) {
@@ -804,10 +728,10 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   computed: {
-    ...mapGetters(['deptBudgetList']),
+    ...mapGetters(['deptBudgetList'])
   },
   data() {
     return {
@@ -835,7 +759,7 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      taskhistories:[],
+      taskhistories: [],
       goodnameList: [],
       checked: true,
       form: {},
@@ -864,9 +788,9 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -874,7 +798,7 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+        month: dayjs().format('MM')
       },
       contractList: [],
       inOutTaskNo: '',
@@ -883,11 +807,11 @@ export default {
       dataList1: { taskTypeKey: '1' },
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   activated() {
@@ -913,7 +837,7 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year +'' + mouth + datetime
+      return year + '' + mouth + datetime
     },
     reject() {
       this.outerVisible = true
@@ -926,22 +850,20 @@ export default {
         if (i > 90) continue
         arr.push(String.fromCharCode(i))
       }
-      arr.sort(function () {
+      arr.sort(function() {
         return Math.random() - 0.5
       })
       arr.length = 4
 
       return arr.join('')
     },
-    MathRand()
-{
-var Num='';
-for(var i=0;i<4;i++)
-{
-Num+=Math.floor(Math.random()*10);
-}
-return Num
-},
+    MathRand() {
+      var Num = ''
+      for (var i = 0; i < 4; i++) {
+        Num += Math.floor(Math.random() * 10)
+      }
+      return Num
+    },
     selectTaskNo(e) {
       if (this.dataList.taskTypeKey == 3) {
         this.dataList1.moveTaskNo = e
@@ -952,7 +874,7 @@ return Num
       this.deptBudgetList.staffList = val
       if (val) {
         //val存在
-        this.options = this.staffList.filter((item) => {
+        this.options = this.staffList.filter(item => {
           if (
             !!~item.staffName.indexOf(val) ||
             !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
@@ -997,10 +919,10 @@ return Num
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
               contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo,
+              contractNo: this.contractNoList[i].contractNo
             })
               .toPromise()
-              .then((response) => {
+              .then(response => {
                 this.$set(this.dataList, 'goodsName', response.goodsName)
                 this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
                 this.$set(this.dataList, 'grade', response.grade)
@@ -1024,10 +946,10 @@ return Num
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
               contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo,
+              contractNo: this.contractNoList[i].contractNo
             })
               .toPromise()
-              .then((response) => {
+              .then(response => {
                 this.$set(this.dataList1, 'goodsName', response.goodsName)
                 this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
                 this.$set(this.dataList1, 'grade', response.grade)
@@ -1066,15 +988,15 @@ return Num
         sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
-        .then((response) => {
+        .then(response => {
           woekflowhandle({
             taskId: list.taskId,
             approved: true,
             auditMind: '34',
-            needReapply: false,
+            needReapply: false
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$message.success('审核成功')
               this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
@@ -1087,15 +1009,15 @@ return Num
         sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
-        .then((response) => {
+        .then(response => {
           woekflowhandle({
             taskId: list.taskId,
             approved: false,
             auditMind: this.auditMind,
-            needReapply: true,
+            needReapply: true
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$message.success('驳回成功')
               this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
@@ -1125,7 +1047,7 @@ return Num
       if (!this.auditMind) {
         this.$message({
           message: '驳回原因不能为空！',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -1271,15 +1193,19 @@ return Num
       return Min + Math.round(Rand * Range)
     },
     getList() {
-      gettaskhistories({businessKey: this.$route.query.businessKey,workflowId: this.$route.query.workflowId}).toPromise()
-          .then((response) => {
-            this.taskhistories=response
-          })
+      gettaskhistories({
+        businessKey: this.$route.query.businessKey,
+        workflowId: this.$route.query.workflowId
+      })
+        .toPromise()
+        .then(response => {
+          this.taskhistories = response
+        })
 
       if (this.$route.query.relevanceId) {
         outexamine({ relevanceId: this.$route.query.relevanceId })
           .toPromise()
-          .then((response) => {
+          .then(response => {
             if (response.length > 1) {
               if (response[0].taskTypeKey == 3) {
                 if (response[0].inOutType == '移库出库') {
@@ -1299,7 +1225,7 @@ return Num
                     response[0].inOutTaskNo.indexOf('C') + 1,
                     response[0].inOutTaskNo.length
                   )
-              }else if (response[0].taskTypeKey == 2){
+              } else if (response[0].taskTypeKey == 2) {
                 this.dataList1 = response[0]
               }
               this.dataList = response[0]
@@ -1322,53 +1248,53 @@ return Num
       // 货名
       pullDown({ constId: 'CON2' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.goodnameList = response
         })
       // 品级
       pullDown({ constId: 'CON3' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.gradeList = response
         })
       pullDown({ constId: 'CON6' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.storageType = response
         })
       pullDown({ constId: 'CON5' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.storageType1 = response
         })
       xialaNo({
-        compId: this.compId,
+        compId: this.compId
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.contractNoList = response
         })
       //仓库名
       getwarehousename({
         compId: this.compId,
-        warehouseType: 1,
+        warehouseType: 1
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.warehouseNameList = response
         })
       getwarehousename({
         compId: this.compId,
-        warehouseType: 2,
+        warehouseType: 2
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.warehouseNameList1 = response
         })
       //经办人
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.options = response
           this.staffList = response
           //  this.agent = response
@@ -1398,7 +1324,7 @@ return Num
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id },
+        query: { id: row.id }
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -1409,11 +1335,11 @@ return Num
       console.log(row)
       billoperatehis({ id: row.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.historyList = response
         })
-    },
-  },
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -1610,7 +1536,7 @@ return Num
   width: 381px;
   height: 20px;
 }
-.wenzi{
-  margin:0 auto;
+.wenzi {
+  margin: 0 auto;
 }
 </style>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -150,7 +150,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="接单时间" prop="createDate">
+        <el-table-column class="table_td" label="接单时间" prop="createDate" width="90">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -407,7 +407,7 @@ import { shippingLook, packList, dispatchCat ,delhaulagestage} from '@/model/tra
 import { getstaff } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-// import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -139,13 +139,6 @@
       </div>
       <!-- 导入 -->
       <div style="font-size: 16px; width: 50%; float: left; text-align: right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="import1()"
-          >导入</el-button
-        >
         <el-upload style="margin-left: 8px;"
           class="upload-demo inline-block margin-right-10"
           action=""

src/views/tranManagement/tranManagementShippingLook.vue

@@ -180,7 +180,7 @@
           .toPromise()
           .then((response) => {
             this.deptBudgetList = response
-            if(response.tranCarInfoList[0].shipType =='集装箱') {
+            if(response.tranCarInfoList.length > 0 &&response.tranCarInfoList[0].shipType =='集装箱') {
               this.deptBudgetList.tranCarInfoList=[this.deptBudgetList.tranCarInfoList[0]]
 
             }else{

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -145,7 +145,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" class="table_td" label="接单时间">
+        <el-table-column prop="createDate" class="table_td" label="接单时间" width="90">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -782,8 +782,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 /deep/.basicInformation {
-  height: 87vh;
-  overflow: scroll;
+  // height: 87vh;
+  // overflow: scroll;
   .ws-info-table {
     border: none;
   }

src/views/warehouse/warehouseManagementDelivery.vue

@@ -250,7 +250,7 @@
       <div class="neifor">
         <ws-info-table>
           <!--水分（%）<=-->
-          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
+          <ws-form-item label="水分（%）" span="1" prop="waterContent">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.waterContent"
               placeholder="请输入水分占比"
@@ -259,7 +259,7 @@
             />
           </ws-form-item>
           <!--杂质（%）<=-->
-          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
+          <ws-form-item label="杂质（%）" span="1" prop="impurity">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.impurity"
               placeholder="请输入杂质占比"
@@ -268,7 +268,7 @@
             />
           </ws-form-item>
           <!--容重(克/升)>=-->
-          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
+          <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
               placeholder="请输入容重"
@@ -277,7 +277,7 @@
             />
           </ws-form-item>
           <!--霉变粒（%）<=-->
-          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
+          <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
               placeholder="请输入霉变粒占比"
@@ -286,7 +286,7 @@
             />
           </ws-form-item>
           <!--热损伤（%）<=-->
-          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
+          <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
               placeholder="请输入热损伤占比"
@@ -295,7 +295,7 @@
             />
           </ws-form-item>
           <!--不完善粒（%）<=-->
-          <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
+          <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
               placeholder="请输入不完善粒占比"

src/views/warehouse/warehouseManagementPut.vue

@@ -342,7 +342,7 @@
       <div class="neifor">
         <ws-info-table>
           <!--水分（%）<=-->
-          <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
+          <ws-form-item label="水分（%）" span="1" prop="waterContent">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.waterContent"
               placeholder="请输入水分占比"
@@ -351,7 +351,7 @@
             />
           </ws-form-item>
           <!--杂质（%）<=-->
-          <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
+          <ws-form-item label="杂质（%）" span="1" prop="impurity">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.impurity"
               placeholder="请输入杂质占比"
@@ -359,8 +359,8 @@
               size="small"
             />
           </ws-form-item>
-          <!--容重(克/升)>=-->
-          <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
+          <!--容重(克/升)-->
+          <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
               placeholder="请输入容重"
@@ -369,7 +369,7 @@
             />
           </ws-form-item>
           <!--霉变粒（%）<=-->
-          <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
+          <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
               placeholder="请输入霉变粒占比"
@@ -378,7 +378,7 @@
             />
           </ws-form-item>
           <!--热损伤（%）<=-->
-          <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
+          <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
               placeholder="请输入热损伤占比"
@@ -387,7 +387,7 @@
             />
           </ws-form-item>
           <!--不完善粒（%）<=-->
-          <ws-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
+          <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
               placeholder="请输入不完善粒占比"

src/views/warehouse/warehouseManagementRecord.vue

@@ -112,23 +112,23 @@
             <template #default="props">
               <ws-form ref="deptBudgetList" :model="deptBudgetList">
                 <ws-info-table>
-                  <ws-form-item label="水分(%)<=" span="1" prop="waterContent">
+                  <ws-form-item label="水分(%)" span="1" prop="waterContent">
                     {{ props.row.waterContent }}
                   </ws-form-item>
-                  <ws-form-item label="容重(g/l)>=" span="1" prop="bulkDensity">
+                  <ws-form-item label="容重(g/l)" span="1" prop="bulkDensity">
                     {{ props.row.bulkDensity }}
                   </ws-form-item>
-                  <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
+                  <ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
                     {{ props.row.jiaorenli }}
                   </ws-form-item>
-                  <ws-form-item label="杂质(%)<=" span="1" prop="impurity">
+                  <ws-form-item label="杂质(%)" span="1" prop="impurity">
                     {{ props.row.impurity }}
                   </ws-form-item>
-                  <ws-form-item label="霉变粒(%)<=" span="1" prop="mildewGrain">
+                  <ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
                     {{ props.row.mildewGrain }}
                   </ws-form-item>
                   <ws-form-item
-                    label="不完善粒(%)<="
+                    label="不完善粒(%)"
                     span="1"
                     prop="imperfectGrain"
                   >        
@@ -230,23 +230,23 @@
             <template #default="props">
               <ws-form ref="deptBudgetList" :model="deptBudgetList">
                 <ws-info-table>
-                  <ws-form-item label="水分(%)<=" span="1" prop="waterContent">
+                  <ws-form-item label="水分(%)" span="1" prop="waterContent">
                     {{ props.row.waterContent }}
                   </ws-form-item>
-                  <ws-form-item label="容重(g/l)>=" span="1" prop="bulkDensity">
+                  <ws-form-item label="容重(g/l)" span="1" prop="bulkDensity">
                     {{ props.row.bulkDensity }}
                   </ws-form-item>
-                  <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
+                  <ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
                     {{ props.row.jiaorenli }}
                   </ws-form-item>
-                  <ws-form-item label="杂质(%)<=" span="1" prop="impurity">
+                  <ws-form-item label="杂质(%)" span="1" prop="impurity">
                     {{ props.row.impurity }}
                   </ws-form-item>
-                  <ws-form-item label="霉变粒(%)<=" span="1" prop="mildewGrain">
+                  <ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
                     {{ props.row.mildewGrain }}
                   </ws-form-item>
                   <ws-form-item
-                    label="不完善粒(%)<="
+                    label="不完善粒(%)"
                     span="1"
                     prop="imperfectGrain"
                   >

vue.config.js

@@ -141,8 +141,12 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
+<<<<<<< HEAD
         target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.1.122:9100/',
+=======
+        target: 'http://192.168.1.122:8090/',
+>>>>>>> fda6d6a17183b1b8bd85dcbfa90d78b2cdf7412b
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',