前端出库管理合并

public/static/payprint.html

@@ -454,43 +454,43 @@
                   <td class="col">{{printData1[index].weighingManagement.type}}</td>
                   <td class="col col-bgc">容量（克/升）</td>
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
                   </td>
                   <td class="col col-bgc">不完善粒（%）</td>
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.imperfectGrain:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}
                   </td>
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">等级</td>
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.grade:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.grade:''}}
                   </td>
                   <td class="col col-bgc">水分（%）</td>
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.waterContent:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.waterContent:''}}
                   </td>
                   <td class="col col-bgc">热损伤（%）</td>
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.jiaorenli:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.jiaorenli:''}}
                   </td>
                   <td class="col col-bgc">质检时间</td>
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.qualityDate:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.qualityDate:''}}
                   </td>
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">杂质（%）</td>
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.impurity:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.impurity:''}}
                   </td>
                   <td class="col col-bgc">霉变粒（%）</td>
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.mildewGrain:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.mildewGrain:''}}
                   </td>
                   <td class="col col-bgc">扣杂</td>
                   <td class="col">
-                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.buckleMiscellaneous:''}}
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.buckleMiscellaneous:''}}
                   </td>
                   <td class="col " colspan="2"></td>
                 </tr>

public/static/warehouseBatchPrint.html

@@ -5,6 +5,9 @@
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
     <title></title>
     <style>
+      body{
+        margin: 0;
+      }
       table tr th,
       table tr td {
         border: 2px solid #333333;
@@ -20,9 +23,9 @@
 
       .content {
         width: 1000px;
-        padding: 70px 20px 20px 20px;
+        padding: 30px 20px 20px 20px;
         font-size: 18px;
-        height: calc(100vh - 7.5vh);
+        height:573px;
         top: 0;
         bottom: 0;
         left: 0;
@@ -80,7 +83,7 @@
         <div></div>
         <div v-if="item.inOutFlag == '2'" class="title">入库检斤单</div>
         <div v-else class="title">出库检斤单</div>
-        <div class="number">{{item.contractManagementInfo?item.contractManagementInfo.contractNo:''}}</div>
+        <div class="number" v-if="isEWPrint">{{item.contractManagementInfo?item.contractManagementInfo.contractNo:''}}</div>
         <table class="table">
           <tr class="row">
             <td class="col col-bgc">出货单位</td>
@@ -102,29 +105,29 @@
             <td class="col col-bgc">类型</td>
             <td class="col" colspan="">{{item.type}}</td>
             <td class="col col-bgc">等级</td>
-            <td class="col"  colspan="3">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
+            <td class="col"  colspan="3">{{item.grade}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">检斤时间</td>
             <td class="col" colspan="">{{item.updateDate}}</td>
 
             <td class="col col-bgc">水分（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
+            <td class="col">{{item.waterContent}}
             </td>
             <td class="col col-bgc">热损伤（%）</td>
-            <td class="col" colspan="3">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
+            <td class="col" colspan="3">{{item.jiaorenli}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">杂质（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
+            <td class="col">{{item.impurity}}</td>
             <td class="col col-bgc">霉变粒（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
+            <td class="col">{{item.mildewGrain}}
             </td>
             <td class="col col-bgc">容量</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+            <td class="col">{{item.bulkDensity}}
             </td>
             <td class="col col-bgc">不完善粒（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+            <td class="col">{{item.imperfectGrain}}
             </td>
           </tr>
           <tr class="row">
@@ -158,7 +161,7 @@
         <div></div>
         <div v-if="item.inOutFlag == '2'" class="title">入库检斤单</div>
         <div v-else class="title">出库检斤单</div>
-        <div class="number">{{item.contractManagementInfo?item.contractManagementInfo.contractNo:''}}</div>
+        <div class="number" v-if="isEWPrint">{{item.contractManagementInfo?item.contractManagementInfo.contractNo:''}}</div>
         <table class="table">
           <tr class="row">
             <td class="col col-bgc">出货单位</td>
@@ -180,29 +183,29 @@
             <td class="col col-bgc">类型</td>
             <td class="col" colspan="">{{item.type}}</td>
             <td class="col col-bgc">等级</td>
-            <td class="col"  colspan="3">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
+            <td class="col"  colspan="3">{{item.grade}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">检斤时间</td>
             <td class="col" colspan="">{{item.updateDate}}</td>
 
             <td class="col col-bgc">水分（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
+            <td class="col">{{item.warehouseInOutDetail.waterContent}}
             </td>
             <td class="col col-bgc">热损伤（%）</td>
-            <td class="col" colspan="3">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
+            <td class="col" colspan="3">{{item.warehouseInOutDetail.jiaorenli}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">杂质（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
+            <td class="col">{{item.warehouseInOutDetail.impurity}}</td>
             <td class="col col-bgc">霉变粒（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
+            <td class="col">{{item.warehouseInOutDetail.mildewGrain}}
             </td>
-            <td class="col col-bgc">容量</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+            <td class="col col-bgc">容重</td>
+            <td class="col">{{item.warehouseInOutDetail.bulkDensity}}
             </td>
             <td class="col col-bgc">不完善粒（%）</td>
-            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+            <td class="col">{{item.warehouseInOutDetail.imperfectGrain}}
             </td>
           </tr>
           <tr class="row">
@@ -269,24 +272,28 @@
         printSmall() {},
         printBig() {},
       },
-      mounted() {debugger
+      mounted() {
         let _ew = decodeURIComponent(this.getQueryVariable("selectEW"))
         let _ewdd = decodeURIComponent(this.getQueryVariable("selectEWDD"))
         if(_ew== 'true'){
            this.tableDataEW = JSON.parse(localStorage.getItem('ewWarehouseBatchPrint'))
              this.isEWPrint = true
+        }else{
+          this.isEWPrint = false
         }
         if(_ewdd== 'true'){
            this.tableDataEW = JSON.parse(localStorage.getItem('ewWarehouseBatchPrint'))
           this.isDDPrint = true
+        }else{
+          this.isDDPrint = false
         }
         this.tableData = JSON.parse(localStorage.getItem("warehouseBatchPrint"))
         console.log("打印数据", this.tableData)
         document.title = "粮食检斤单"
-        // window.print()
-        // window.onafterprint = function(event) {
-        //   window.history.back(-1)
-        // };
+        window.print()
+        window.onafterprint = function(event) {
+          window.history.back(-1)
+        };
       },
       watch: {}
     })

public/static/weightCheck.html

@@ -341,93 +341,93 @@
         </div>
       </div>
       <div v-else>
-        <div class="content" v-if="bigContent">
+        <div class="content" v-if="bigContent" v-for="(_item,index) in tableData">
 
-          <div class="title">{{tableData.compName}}</div>
+          <!-- <div class="title">{{_item.compName}}</div> -->
           <div class="title">入库检斤单</div>
           <div class="left">
-            <img :src="tableData.codeUrl" alt="">
+            <img :src="_item.codeUrl" alt="">
           </div>
-          <div class="number">{{tableData.number}}</div>
+          <div class="number">{{_item.number}}</div>
           <table class="table">
             <tr class="row">
               <td class="col col-bgc">客户姓名</td>
-              <td class="col" colspan="2">{{tableData.customer}}</td>
+              <td class="col" colspan="2">{{_item.customer}}</td>
               <td class="col col-bgc">客户电话</td>
-              <td class="col">{{tableData.customerPhone}}</td>
+              <td class="col">{{_item.customerPhone}}</td>
               <td class="col col-bgc">车牌号</td>
-              <td class="col" colspan="2">{{tableData.carNumber}}</td>
+              <td class="col" colspan="2">{{_item.carNumber}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">收货单位</td>
-              <td class="col" colspan="2">{{tableData.compName}}</td>
+              <td class="col" colspan="2">{{_item.compName}}</td>
               <td class="col col-bgc">联系人</td>
-              <td class="col">{{tableData.person}}</td>
+              <td class="col">{{_item.person}}</td>
               <td class="col col-bgc">联系电话</td>
-              <td class="col" colspan="2">{{tableData.personPhone}}</td>
+              <td class="col" colspan="2">{{_item.personPhone}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">货名</td>
-              <td class="col">{{tableData.goodsName}}</td>
+              <td class="col">{{_item.goodsName}}</td>
               <td class="col col-bgc">类型</td>
-              <td class="col">{{tableData.type}}</td>
+              <td class="col">{{_item.type}}</td>
               <td class="col col-bgc">容量（克/升）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}</td>
               <td class="col col-bgc">不完善粒（%）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">等级</td>
-              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.grade:''}}
+              <td class="col">{{_item.qualityInspectionManagement?_item.qualityInspectionManagement.grade:''}}
               </td>
               <td class="col col-bgc">水分（%）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.waterContent:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.waterContent:''}}</td>
               <td class="col col-bgc">热损伤（%）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.jiaorenli:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.jiaorenli:''}}</td>
               <td class="col col-bgc">质检时间</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.qualityDate:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.qualityDate:''}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">杂质（%）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.impurity:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.impurity:''}}</td>
               <td class="col col-bgc">霉变粒（%）</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.mildewGrain:''}}</td>
+                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.mildewGrain:''}}</td>
               <td class="col col-bgc">扣杂</td>
               <td class="col">
-                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.buckleMiscellaneous:''}}
+                {{_item.qualityInspectionManagement?_item.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">{{_item.grossWeight}}</td>
               <td class="col col-bgc">皮重（公斤）</td>
-              <td class="col">{{tableData.tare}}</td>
+              <td class="col">{{_item.tare}}</td>
               <td class="col col-bgc">扣重（公斤）</td>
-              <td class="col">{{tableData.buckleMiscellaneous}}</td>
+              <td class="col">{{_item.buckleMiscellaneous}}</td>
               <td class="col col-bgc">净重（公斤）</td>
-              <td class="col">{{tableData.netWeight}}</td>
+              <td class="col">{{_item.netWeight}}</td>
               <td class="col " colspan="2"></td>
 
             </tr>
             <tr class="row">
               <td class="col col-bgc" colspan="2">毛重检斤时间</td>
-              <td class="col" colspan="2">{{tableData.grossDate}}</td>
+              <td class="col" colspan="2">{{_item.grossDate}}</td>
               <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-              <td class="col" colspan="2">{{tableData.tareDate}}</td>
+              <td class="col" colspan="2">{{_item.tareDate}}</td>
             </tr>
           </table>
           <div class="bottom">
             <div class="bottom-row1">
-              <div>毛检：{{tableData.secretaryWeigher}}</div>
-              <div style="margin-left:60px">皮检：{{tableData.skinInspector}}</div>
+              <div>毛检：{{_item.secretaryWeigher}}</div>
+              <div style="margin-left:60px">皮检：{{_item.skinInspector}}</div>
               <!-- <div>{{tableData.qualityDate}}</div> -->
             </div>
             <div class="bottom-row2">
@@ -596,7 +596,7 @@
           }
         } else {
           this.tableData = JSON.parse(_data)
-          console.log(this.tableData)
+          console.log("sssss",this.tableData)
         }
         // sessionStorage.setItem('record_print', JSON.stringify(response))
         // this.tableData = JSON.parse(sessionStorage.getItem("record_print"))

src/views/contractManagement/salesContractAdd.vue

@@ -14,10 +14,22 @@
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <div class="remark">
           <h3>基本信息</h3>
-          <p style="color: #8890b1">
-            &nbsp;&nbsp;注：基本信息均为必填项，“<span style="color:red">*</span>”
-            标记的条目提交后不可修改。
-          </p>
+            <el-row>
+            <el-col :span="12">
+              <p style="color: #8890b1">
+                注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>” 标记的条目提交后不可修改。
+              </p>
+              </el-col>
+              <el-col :span="12" style='text-align:right;'>
+              <el-select v-model="contractNo" placeholder="请选择要复制的合同" class="typeselect" filterable clearable
+                  @change="copySelect">
+                    <el-option v-for="(item,index) in outContractNo" :key="'hetong'+index" :label="item.contractNo"
+                      :value="item.contractNo" />
+                  </el-select>
+                  <el-button class="bg-bottom" type="primary" size="small" @click="cancelcopy()">取消复制
+              </el-button>
+              </el-col>
+          </el-row>
         </div>
         <!--基本信息-->
         <ws-info-table>
@@ -385,10 +397,11 @@
     editxiala,
     delxiala,
     getRelationContractNo,
-     getcustomerinfo
+     getcustomerinfo,
+     examineList,
   } from '@/model/contarct/index'
    import {
-    getstaff,
+    getstaff,xialaNo,
   } from '@/model/warehouse/index'
   import WsUpload from '@/components/WsUpload'
   import {
@@ -419,6 +432,8 @@
         restaurants3: [],
         restaurants4: [],
         customerinfo:[],
+        contractNo:'',
+        outContractNo:[],
         //弹出框
         dialogViewSpareMoney: false,
         dialogApproveFormVisible: false,
@@ -524,6 +539,47 @@
       if (!this.restaurants4) this.restaurants4 = [];
     },
     methods: {
+      copySelect(e){
+        for (let i = 0; i < this.outContractNo.length; i++) {
+          if(this.outContractNo[i].contractNo==e){
+            examineList({
+            id: this.outContractNo[i].id
+          })
+          .toPromise()
+          .then((response) => {
+            this.deptBudgetList = response
+            if(this.deptBudgetList.personPhone){
+              this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.split(',')
+            }
+            
+            if (this.deptBudgetList.deliverType == 1) {
+              this.deptBudgetList.deliverType1 = '我方自提'
+            } else if (this.deptBudgetList.deliverType == 2) {
+              this.deptBudgetList.deliverType1 = '对方送货'
+            }
+          })
+          }
+          
+        }
+      },
+      cancelcopy(){
+        this.contractNo=''
+        this.deptBudgetList={
+          deliverType: '1',
+          agreementType: '销售合同',
+          finalTradingVolume: 0,
+          totalContractPrice: 0,
+          contractGoodsInfo: {
+            goodsName: '',
+          },
+          buyerPhone:'',
+          contractProcessInfo: {},
+          addressUrl: '',
+          sourceGoods: '',
+          placeDelivery: '',
+          settlementWeightMethod: '1',
+        }
+      },
       feedbackLeaderChange(e){
         this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
         this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone
@@ -632,6 +688,14 @@
         })
       },
       loaddata() {
+         xialaNo({
+            compId: localStorage.getItem('ws-pf_compId'),
+            flag: 1,
+          })
+          .toPromise()
+          .then((response) => {
+            this.outContractNo = response
+          })
         // 包装方式
         packList({
             constId: 'CON1',
@@ -1160,11 +1224,7 @@
         //   return
         // }
         if (
-<<<<<<< HEAD
-          this.deptBudgetList.contractGoodsInfo.mildewGrain ||
-=======
           this.deptBudgetList.contractGoodsInfo.mildewGrain &&
->>>>>>> origin
           (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
               '.'
             ) != -1 &&
@@ -1191,11 +1251,7 @@
         //   return
         // }
         if (
-<<<<<<< HEAD
-          this.deptBudgetList.contractGoodsInfo.jiaorenli ||
-=======
           this.deptBudgetList.contractGoodsInfo.jiaorenli &&
->>>>>>> origin
           (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
             -1 &&
             String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
@@ -1221,11 +1277,7 @@
         //   return
         // }
         if (
-<<<<<<< HEAD
-          this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
-=======
           this.deptBudgetList.contractGoodsInfo.imperfectGrain &&
->>>>>>> origin
           (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
               '.'
             ) != -1 &&

src/views/contractManagement/storageContractAdd.vue

@@ -868,11 +868,7 @@
           })
           return
         }
-<<<<<<< HEAD
-        if (!this.deptBudgetList.storageFeeNew) {
-=======
         if (!this.deptBudgetList.storageFee) {
->>>>>>> origin
           this.$message({
             message: '代储费不能为空！',
             type: 'warning',
@@ -887,15 +883,6 @@
           return
         }
         if (
-<<<<<<< HEAD
-          isNaN(this.deptBudgetList.storageFeeNew) ||
-          (String(this.deptBudgetList.storageFeeNew).indexOf('.') != -1 &&
-            String(this.deptBudgetList.storageFeeNew).length -
-            (String(this.deptBudgetList.storageFeeNew).indexOf('.') + 1) >
-            2) ||
-          this.deptBudgetList.storageFeeNew < 0 ||
-          this.deptBudgetList.storageFeeNew > 1000
-=======
           isNaN(this.deptBudgetList.storageFee) ||
           (String(this.deptBudgetList.storageFee).indexOf('.') != -1 &&
             String(this.deptBudgetList.storageFee).length -
@@ -903,7 +890,6 @@
             2) ||
           this.deptBudgetList.storageFee < 0 ||
           this.deptBudgetList.storageFee > 1000
->>>>>>> origin
         ) {
           this.$message({
             message: '代储费填写错误！',

src/views/houseSelfCollect/paymentManagement.vue

@@ -36,6 +36,11 @@
         <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
       </template>
       <template slot="right">
+         <el-select class="warehouse_select" v-model="goodsName" placeholder="请选择货名" @change="goodsNameChange"
+          filterable clearable style="margin: 0 10px">
+           <el-option label="全部货名" value="全部货名"></el-option>
+          <el-option v-for="(item,index) in goodnameList" :key="item.id" :label="item.goodsName" :value="index"></el-option>
+        </el-select>
         <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
           filterable clearable style="margin: 0 10px">
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
@@ -361,7 +366,7 @@
     settlementEdit,
     workflowcontent,
     suspendinstance,
-    importWord
+    importWord,
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle,
@@ -467,10 +472,13 @@
         fileList: [],
         appendixIdsAdd: '',
         excelFreightspace: [],
+        goodnameList:[],
+        goodsName:"全部",
       }
     },
     activated() {
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
+      
       this.getPassYearFormatDate()
       this.getWarehouse()
       // this.getList()
@@ -482,6 +490,10 @@
       })
     },
     methods: {
+      goodsNameChange(e){
+        this.goodsName = this.goodnameList[e].constValue
+        this.getList()
+      },
       importClick(file, fileList) {
         this.fileTemp = file.raw
         let fileName = file.raw.name
@@ -1209,6 +1221,14 @@
         )
       },
       getList() {
+        for(let _temp = 0 ; _temp < this.warehouseList.length ; _temp++){
+          if(this.warehouseName == this.warehouseList[_temp].warehouseName){
+            for(let _num = 0 ; _num < this.warehouseList[_temp].goodsNameInfos.length;_num++){
+                const res = new Map()
+                this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr)=> !res.has(arr.goodsName)&&res.set(arr.goodsName,1))
+            }
+          }
+        }
         this.payments = {
           amountNotPayable: 0,
           paymentDate: '',
@@ -1235,6 +1255,7 @@
             managementType: 1,
             invoicing: this.invoicing,
             compId: localStorage.getItem('ws-pf_compId'),
+            goodsName:this.goodsName == '全部'?"":this.goodsName
           })
           .toPromise()
           .then((response) => {

src/views/houseSelfCollect/weighingManagement.vue

@@ -127,10 +127,10 @@
       <div class="print-type-content">
         <div class="print-type-title">请选择打印纸张类型</div>
         <div class="print-type-checkbox">
-          <el-radio-group v-model="radio">
+          <!-- <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>
+          </el-radio-group> -->
         </div>
 
         <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
@@ -255,6 +255,7 @@
         dialogData: {
           qualityInspectionManagement: {},
         },
+        dialogDataList:[],
         purchasePriceList: [],
         allowEdit: '0',
         disabled: false,
@@ -268,7 +269,9 @@
         excelPrintData: [],
         isExcelPrint: false,
         selectEW: false,
-        printSeparately: false
+        printSeparately: false,
+        onePrint:false,//单个打印标识
+        idPrint:"",
       }
     },
     computed: {
@@ -495,12 +498,46 @@
           localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
           window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
         } else {
-
-          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogData))
+          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList))
         }
       },
       async typePrintClick(type) {
-        if (this.isExcelPrint) {
+        if(this.onePrint){//判断是否是单个打印
+           getPrint({
+              id: this.idPrint
+            })
+            .toPromise()
+            .then((response) => {
+              this.dialogDataList = []//点击确认时先清空要打印的数组
+              this.dialogData = response
+              if (response.compName == '黑龙江秋收有限公司') {
+                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+              }
+              
+              if (this.checked) {
+                this.dialogDataList.push( this.dialogData)
+                var _datas = JSON.stringify(this.dialogData) 
+                _datas = JSON.parse(_datas)
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+             }else if(this.ddchecked){
+                _datas = this.dialogData
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+             }else{
+              this.dialogData.companyName = this.companyName
+                this.dialogDataList.push( this.dialogData)
+             }
+              this.printBig("", this.radio)
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+
+        }else{
+          if (this.isExcelPrint) {
           this.printBig(2, this.radio)
           this.isExcelPrint = false
 
@@ -528,35 +565,21 @@
               .catch((response) => {})
           }
         }
-
-
+        }
       },
       typePrintCannelClick() {
+        this.onePrint = false//单个打印标识
+        this.dialogDataList = []//打个打印取消时数组至空
         this.isShowPrintType = false
       },
       print(row, type, pageType) {
+      //打印
         if (type == 1) {
           this.isShowPrintType = true
         } else {
-          getPrint({
-              id: row.id
-            })
-            .toPromise()
-            .then((response) => {
-              // let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid
-              // getQRcode({printString}).toPromise()
-              //       .then((res) => {//二维码
-              this.isShowPrint = true
-              this.dialogData = response
-              // this.printData.qrCodeUrl = res
-              // })
-              if (response.compName == '黑龙江秋收有限公司') {
-                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
-              }
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
+          this.idPrint = row.id
+           this.isShowPrintType = true
+           this.onePrint = true //单个打印标识
         }
 
       },

src/views/profitable/contractOtherMoney.vue

@@ -58,22 +58,25 @@
           </el-table-column>
           <el-table-column prop="payee" label="请款人/收款人" min-width="100"></el-table-column>
           <el-table-column prop="paymentDate" label="支付日期"></el-table-column>
+          <el-table-column prop="createDate" label="录入日期" min-width="130"></el-table-column>
           <el-table-column prop="status" label="状态" min-width="81">
             <template slot-scope="scope">
               <span style="margin-right:10px">{{scope.row.status}}</span><i class="el-icon-tickets icon_css"
                 v-show="scope.row.reexType == '支出'" @click="showAudit(scope.row)"></i>
             </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="400">
-            <template slot-scope="scope">
-              <el-button @click="audit(1,scope.row)" v-if="scope.row.reexType == '支出' && scope.row.taskId">审核
+          <el-table-column label="操作" min-width="340">
+            <template slot-scope="scope" >
+              <div v-if="scope.row.reexType =='支出'">
+                <el-button @click="audit(1,scope.row)" v-if="scope.row.taskId">审核
               </el-button>
-              <el-button @click="audit(2,scope.row)"
+              <el-button @click="audit(2,scope.row)" v-if="scope.row.status != '已付款'"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.status`">付款</el-button>
               <el-button @click="audit(5,scope.row)"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.edit`">编辑</el-button>
               <el-button @click="delData(scope.row)"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.delete`">删除</el-button>
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -352,8 +355,7 @@
         if (Number(this.formData.amountMoney) < 0 || Number(this.formData.amountMoney) > 100000000) {
           this.$message.error("金额输入错误！")
         }
-        
-        if (this.formData.amountMoney.indexOf(".") != -1 && this.formData.amountMoney.split(".")[1].length > 2) {
+        if (this.formData.amountMoney.toString().indexOf(".") != -1 && this.formData.amountMoney.split(".")[1].length > 2) {
           this.$message.error("金额请保留两位小数！")
           return
         }

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -890,15 +890,10 @@
             if (index === 0) {
               sums[index] = '合计'
             } else if (
-<<<<<<< HEAD
               index === 7 ||
               index === 8 ||
               index === 9 ||
               index === 10 ||
-=======
-              // index === 10 ||
-              index === 8 ||
->>>>>>> origin
               index === 11 ||
               index === 13 ||
               index === 14 ||

src/views/warehouse/warehouseManagementRecord.vue

@@ -525,7 +525,6 @@
         }
       },
       changeEw(e) {
-        debugger
         this.ddchecked = false
 
         if (e) {
@@ -544,32 +543,31 @@
         localStorage.setItem('ewWarehouseBatchPrint', JSON.stringify(_printList))
       },
       async typePrintClick() {
-        debugger
         this.printList = []
-        if (this.onePrint) {
-          sessionStorage.removeItem('ck_bd_printData')
-          getPrintInfo({
-              id: this.idPrint
-            })
-            .toPromise()
-            .then((response) => {
-              if (response) {
-                if (this.checked || this.ddchecked) {
-                  var arrayPrint = response
-                  // for (let i = 0; i < arrayPrint.length; i++) {
-                    // let _data = arrayPrint[i];
-                    arrayPrint.companyName = this.companyNameEW;
-                    arrayPrint.customer = this.ewCustomer
-                  // }
-                  localStorage.setItem('ck_bd_printData', JSON.stringify(arrayPrint))
-                  window.open('../../../../static/weightCheckInOut.html?type=2')
-                  return
-                }
-                localStorage.setItem('ck_bd_printData', JSON.stringify(response))
-                window.open('../../../../static/weightCheckInOut.html?type=2')
-              }
-            })
-        } else {
+        // if (this.onePrint) {
+        //   sessionStorage.removeItem('ck_bd_printData')
+        //   getPrintInfo({
+        //       id: this.idPrint
+        //     })
+        //     .toPromise()
+        //     .then((response) => {
+        //       if (response) {
+        //         if (this.checked || this.ddchecked) {
+        //           var arrayPrint = response
+        //           // for (let i = 0; i < arrayPrint.length; i++) {
+        //             // let _data = arrayPrint[i];
+        //             arrayPrint.companyName = this.companyNameEW;
+        //             arrayPrint.customer = this.ewCustomer
+        //           // }
+        //           localStorage.setItem('ck_bd_printData', JSON.stringify(arrayPrint))
+        //           window.open('../../../../static/weightCheckInOut.html?type=2')
+        //           return
+        //         }
+        //         localStorage.setItem('ck_bd_printData', JSON.stringify(response))
+        //         window.open('../../../../static/weightCheckInOut.html?type=2')
+        //       }
+        //     })
+        // } else {
           var count = 0
           for (var i = 0; i < this.modification.length; i++) {
             await getPrintInfo({
@@ -592,7 +590,7 @@
               })
 
           }
-        }
+        // }
 
 
 
@@ -679,7 +677,10 @@
 				
 			// },
       batchPrint() {
+<<<<<<< HEAD
       
+=======
+>>>>>>> origin
         this.printList = []
         if (this.modification.length == 0) {
           this.$message.error("请勾选要打印的条目！")
@@ -803,9 +804,28 @@
         this.value2 = [formatDate, nowData] // 默认赋值一年时间
       },
       print(row) {
-        this.onePrint = true
-        this.isShowPrintType = true
-        this.idPrint = row.id
+        // this.onePrint = true
+        // this.isShowPrintType = true
+        // this.idPrint = row.id
+         sessionStorage.removeItem('ck_bd_printData')
+          getPrintInfo({
+              id: row.id
+            })
+            .toPromise()
+            .then((response) => {
+              if (response) {
+                // if (this.checked || this.ddchecked) {
+                //   var arrayPrint = response
+                //     arrayPrint.companyName = this.companyNameEW;
+                //     arrayPrint.customer = this.ewCustomer
+                //   localStorage.setItem('ck_bd_printData', JSON.stringify(arrayPrint))
+                //   window.open('../../../../static/weightCheckInOut.html?type=2')
+                //   return
+                // }
+                localStorage.setItem('ck_bd_printData', JSON.stringify(response))
+                window.open('../../../../static/weightCheckInOut.html?type=2')
+              }
+            })
 
       },
       //返回按钮