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

src/views/contractManagement/acquisitionContract.vue

@@ -40,6 +40,8 @@
       </el-table-column>
       <el-table-column prop="contractNo" label="合同编号" width="150">
       </el-table-column>
+      <el-table-column prop="creator" label="创建人" width="90">
+      </el-table-column>
       <el-table-column prop="goodsName" label="货名" width="80">
       </el-table-column>
       <!-- <el-table-column prop="grade" label="品级" width="80">

src/views/contractManagement/collectionContract.vue

@@ -38,6 +38,8 @@
       </el-table-column>
       <el-table-column prop="contractNo" label="合同编号">
       </el-table-column>
+      <el-table-column prop="creator" label="创建人" width="90">
+      </el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
       <el-table-column prop="buyer" label="买方"> </el-table-column>
       <el-table-column prop="seller" label="卖方"> </el-table-column>

src/views/contractManagement/purchaseContract.vue

@@ -40,6 +40,8 @@
       </el-table-column>
       <el-table-column prop="contractNo" label="合同编号" width="150">
       </el-table-column>
+      <el-table-column prop="creator" label="创建人" width="90">
+      </el-table-column>
       <el-table-column prop="goodsName" label="货名" width="80">
       </el-table-column>
       <!-- <el-table-column prop="grade" label="品级" width="80">

src/views/contractManagement/purchaseContractAdd.vue

@@ -724,7 +724,7 @@ import { isUndefined } from 'xe-utils/methods'
           this.deptBudgetList.sourceProvince = data[0]
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
-          this.deptBudgetList.sourceGoods = data[3]
+          // this.deptBudgetList.sourceGoods = data[3]
           console.log(data[4])
           this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
@@ -732,7 +732,7 @@ import { isUndefined } from 'xe-utils/methods'
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
-          this.deptBudgetList.placeDelivery = data[3]
+          // this.deptBudgetList.placeDelivery = data[3]
           this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
@@ -986,20 +986,20 @@ import { isUndefined } from 'xe-utils/methods'
           return
         }
        }
-        if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
-              this.$message({
-            message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
-            type: 'warning',
-          })
-          return
-        }
-        if(this.deptBudgetList.sourceGoods.indexOf('省')>-1){
-          this.$message({
-          message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
-          type: 'warning',
-          })
-          return
-        }
+        // if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
+        //       this.$message({
+        //     message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if(this.deptBudgetList.sourceGoods.indexOf('省')>-1){
+        //   this.$message({
+        //   message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+        //   type: 'warning',
+        //   })
+        //   return
+        // }
         
         if (!this.deptBudgetList.contractNo) {
           this.$message({

src/views/contractManagement/purchaseContractEdit.vue

@@ -422,14 +422,14 @@
           this.deptBudgetList.sourceProvince = data[0]
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
-          this.deptBudgetList.sourceGoods = data[3]
+          // this.deptBudgetList.sourceGoods = data[3]
           this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
-          this.deptBudgetList.placeDelivery = data[3]
+          // this.deptBudgetList.placeDelivery = data[3]
           this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },

src/views/contractManagement/salesContract.vue

@@ -42,6 +42,8 @@
       </el-table-column>
       <el-table-column prop="contractNo" label="合同编号" width="150">
       </el-table-column>
+      <el-table-column prop="creator" label="创建人" width="90">
+      </el-table-column>
       <el-table-column prop="goodsName" label="货名" width="80">
       </el-table-column>
       <!-- <el-table-column prop="grade" label="品级" width="80">

src/views/contractManagement/storageContract.vue

@@ -38,6 +38,8 @@
       </el-table-column>
       <el-table-column prop="contractNo" label="合同编号">
       </el-table-column>
+      <el-table-column prop="creator" label="创建人" width="90">
+      </el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
       <el-table-column prop="buyer" label="买方"> </el-table-column>
       <el-table-column prop="seller" label="卖方"> </el-table-column>

src/views/contractManagement/storageContractAdd.vue

@@ -560,14 +560,14 @@
           this.deptBudgetList.sourceProvince = data[0]
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
-          this.deptBudgetList.sourceGoods = data[3]
+          // this.deptBudgetList.sourceGoods = data[3]
           this.deptBudgetList.sourceLocation = data[5].lat + ',' + data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
-          this.deptBudgetList.placeDelivery = data[3]
+          // this.deptBudgetList.placeDelivery = data[3]
           this.deptBudgetList.deliveryLocation = data[5].lat + ',' + data[5].lng
         }
       },

src/views/contractManagement/storageContractEdit.vue

@@ -523,14 +523,14 @@
           this.deptBudgetList.sourceProvince = data[0]
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
-          this.deptBudgetList.sourceGoods = data[3]
+          // this.deptBudgetList.sourceGoods = data[3]
           this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
-          this.deptBudgetList.placeDelivery = data[3]
+          // this.deptBudgetList.placeDelivery = data[3]
           this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -323,13 +323,13 @@
                 </ws-form-item>
                 <ws-form-item label="船名" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'">
                   <el-select filterable clearable v-model="deptBudgetList.shipName"
-                    placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event, 1)">
-                    <el-option v-for="item in shipInfoList" :key="item.constKey" :label="item.carNo"
-                      :value="item.carNo" />
+                    placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event)">
+                    <el-option v-for="item in shipInfoList" :key="item.constKey" :label="item.shipName"
+                      :value="item.shipName" />
                   </el-select>
                 </ws-form-item>
                 <ws-form-item label="航次" span="1" prop="shipNumber" v-if="deptBudgetList.outType == '散船'">
-                  <ws-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                  <ws-input disabled v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="箱号-1" span="1" prop="boxNo"
                   v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
@@ -770,6 +770,13 @@ export default {
     }
   },
   methods: {
+    shipInfoChange(e){
+        for (let i = 0; i < this.shipInfoList.length; i++) {
+          if(this.shipInfoList[i].shipName==this.weighingList.shipName){
+            this.weighingList.shipNumber=this.shipInfoList[i].shipNo
+          } 
+        }
+      },
     fleetNameChange(e){
         console.log(e,this.fleetNameList)
         if(e=='非车队'){

src/views/outboundManagement/weighingManagementNew.vue

@@ -202,14 +202,14 @@
                       </ws-form-item>
                       <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
                         <!-- <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" /> -->
-                        <el-select filterable clearable v-model="weighingList.shipName"
+                        <el-select :disabled="tpyeNo == 2" filterable clearable v-model="weighingList.shipName"
                           placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event)">
                           <el-option v-for="item in shipInfoList" :key="item.id" :label="item.shipName"
                             :value="item.shipName" />
                         </el-select>
                       </ws-form-item>
                       <ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'">
-                        <ws-input v-model="weighingList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                        <ws-input disabled v-model="weighingList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item v-if="tpyeNo == 2" label="毛重(KG)" span="1" prop="grossWeight">
                         <ws-input type="number" @mousewheel.native.prevent v-if="tpyeNo == 2"
@@ -1569,15 +1569,16 @@
                       id: response
                     })
                     .toPromise().then((response) => {
-                      this.weighingList = response
-                      this.inspect = JSON.parse(
-                        JSON.stringify(this.weighingList)
-                      )
+                      
                        if(this.warehouseName == '鲅鱼圈金信库' ||
                         this
                         .warehouseName == '哈尔滨依兰库' || this
                         .warehouseName == '白城内陆港'|| this
                         .warehouseName == '山东园丰库'){
+                          this.weighingList = response
+                      this.inspect = JSON.parse(
+                        JSON.stringify(this.weighingList)
+                      )
                           if(this.weighingList.contractManagement){
                             let cang = {}
                             cang.value = this.weighingList.contractManagement.seller
@@ -1593,7 +1594,6 @@
                               }
                               this.myCompanyCustomer = this.weighingList.contractManagement.buyer
                           }
-                          console.log(11111111111111111111)
                           
                           this.isShowPrintType = true
                         }else{
@@ -2612,7 +2612,6 @@
     margin: 20px 20px 0 20px;
     // border-radius: 10px;
     padding-bottom: 20px;
-
     .img1,
     .img2 {
       width: 200px;

src/views/profitable/cashout.vue

@@ -51,6 +51,9 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             <el-input class='input50 input_css' placeholder="输入费用名称，1-15个字" v-model="deptBudgetList.expenseName"></el-input>
           </el-form-item>
+          <el-form-item label-width='100px' label="付款方名头" span="1" prop="payerHeader" class="readonly">
+            <el-input class='input50 input_css' placeholder="输入付款方名头" v-model="deptBudgetList.payerHeader"></el-input>
+          </el-form-item>
           <el-form-item label-width='100px' label="金额（元）" span="1" prop="contractNo" class="readonly">
             <el-input class='input50 input_css' placeholder="输入请款金额" v-model="deptBudgetList.amountMoney"></el-input>
           </el-form-item>
@@ -491,6 +494,20 @@
       submit(){
         this.deptBudgetList.compId=localStorage.getItem('ws-pf_compId')
         this.deptBudgetList.agent=localStorage.getItem('ws-pf_staffName')
+        if(!this.deptBudgetList.payerHeader){
+          this.$message({
+            message: '请输入付款方名头!',
+            type: 'warning',
+          })
+          return
+        }
+        if(this.deptBudgetList.payerHeader.length<0||this.deptBudgetList.payerHeader.length>25){
+          this.$message({
+            message: '付款方名头输入错误!',
+            type: 'warning',
+          })
+          return
+        }
         if(this.deptBudgetList.purpose=='合同费用'&&this.deptBudgetList.type=='非粮款'||this.deptBudgetList.purpose=='库点费用'&&this.deptBudgetList.flag!="是"){
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(!this.feeDetailsDistributions[i].distributionMoney&&this.mode!="暂不分配"){
@@ -682,10 +699,19 @@
           .then(() => {
         addexenseinfo(this.deptBudgetList).toPromise()
           .then(response => {
-            this.$message({
+            console.log(response)
+            if(response=='合同请款金额超出总粮款！'){
+              this.$message({
+              message: '合同请款金额超出总粮款！',
+              type: 'error',
+              duration:15000
+            })
+            }else{
+              this.$message({
               message: '提交成功!',
               type: 'success',
             })
+            }
             this.deptBudgetList={purpose:"合同费用",type:'粮款'}
             this.paymentScreenshot=[]
             this.$refs.upload.clearFiles()

src/views/profitable/cashoutaduit.vue

@@ -38,6 +38,9 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             {{deptBudgetList.expenseName}}
           </el-form-item>
+          <el-form-item label-width='100px' label="付款方名头" span="1" prop="payerHeader" class="readonly">
+            {{deptBudgetList.payerHeader}}
+          </el-form-item>
           <el-form-item label-width='100px' label="金额（元）" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
           </el-form-item>

src/views/profitable/cashoutaduitNQ.vue

@@ -33,6 +33,9 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             {{deptBudgetList.expenseName}}
           </el-form-item>
+          <el-form-item label-width='100px' label="付款方名头" span="1" prop="payerHeader" class="readonly">
+            {{deptBudgetList.payerHeader}}
+          </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
           </el-form-item>

src/views/profitable/cashoutedit.vue

@@ -45,6 +45,9 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             <el-input class='input50 input_css' placeholder="输入费用名称，1-15个字" v-model="deptBudgetList.expenseName"></el-input>
           </el-form-item>
+          <el-form-item label-width='100px' label="付款方名头" span="1" prop="payerHeader" class="readonly">
+            <el-input class='input50 input_css' placeholder="输入付款方名头" v-model="deptBudgetList.payerHeader"></el-input>
+          </el-form-item>
           <el-form-item label-width='100px' label="金额（元）" span="1" prop="contractNo" class="readonly">
             <el-input class='input50 input_css' placeholder="输入请款金额" v-model="deptBudgetList.amountMoney"></el-input>
           </el-form-item>

src/views/profitable/expenseallot.vue

@@ -34,6 +34,9 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             {{deptBudgetList.expenseName}}
           </el-form-item>
+          <el-form-item label-width='100px' label="付款方名头" span="1" prop="payerHeader" class="readonly">
+            {{deptBudgetList.payerHeader}}
+          </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
           </el-form-item>

src/views/profitable/expenseallotaduit.vue

@@ -40,6 +40,9 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             {{deptBudgetList.expenseName}}
           </el-form-item>
+          <el-form-item label-width='100px' label="付款方名头" span="1" prop="payerHeader" class="readonly">
+            {{deptBudgetList.payerHeader}}
+          </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
           </el-form-item>

src/views/profitable/expensemanagentedit.vue

@@ -43,6 +43,9 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             {{deptBudgetList.expenseName}}
           </el-form-item>
+          <el-form-item label-width='100px' label="付款方名头" span="1" prop="payerHeader" class="readonly">
+            {{deptBudgetList.payerHeader}}
+          </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
           </el-form-item>

src/views/profitable/expensemanagentlook.vue

@@ -36,6 +36,9 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             {{deptBudgetList.expenseName}}
           </el-form-item>
+          <el-form-item label-width='100px' label="付款方名头" span="1" prop="payerHeader" class="readonly">
+            {{deptBudgetList.payerHeader}}
+          </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
           </el-form-item>

src/views/profitable/storageCharge.vue

@@ -178,7 +178,7 @@
           .then(response => {
             if(response.records.length>0){
               for (let i = 0; i < response.records.length; i++) {
-                response.records[i].money=response.records[i].amountMoney-response.records[i].unallocatedAmount
+                response.records[i].money=(response.records[i].amountMoney-response.records[i].unallocatedAmount).toFixed(2)
                 if(response.records[i].paymentDate){
                   response.records[i].paymentDate=response.records[i].paymentDate.split(' ')[0]
                 }

src/views/statisticalReport/shippingList.vue

@@ -31,11 +31,11 @@
             <el-option v-for="item in taskNoList" :key="item.taskNoKey" :label="item.taskNoValue"
               :value="item.taskNoValue" />
           </el-select>
-          <el-select v-model="processNo" placeholder="请选择运输阶段编号" clearable filterable @change="processNochange"
+          <!-- <el-select v-model="processNo" placeholder="请选择运输阶段编号" clearable filterable @change="processNochange"
             maxlength="500" type="input" class="findValue">
             <el-option v-for="item in processNoList" :key="item.processNoKey" :label="item.processNoValue"
               :value="item.processNoValue" />
-          </el-select>
+          </el-select> -->
            <!-- <el-input v-model="startAddress" placeholder="可按照发货地进行查找" clearable maxlength="500" type="input"
           class="findValue" @keyup.enter.native="find()"></el-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
@@ -81,8 +81,8 @@
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
         <el-table-column class="table_td" prop="taskNo" label="运输任务"></el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输阶段"></el-table-column>
         <el-table-column class="table_td" prop="shipType" label="类型"></el-table-column>
+        <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
         <el-table-column class="boxNo" prop="boxNo" label="箱号/仓位号"></el-table-column>
         <el-table-column class="table_td" prop="loadingWeight" label="装车净重（吨）"></el-table-column>
         <el-table-column class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
@@ -90,7 +90,6 @@
         <el-table-column class="table_td" prop="lossWeight" label="损耗(吨)">
         </el-table-column>
       </el-table>
-
       <!-- 页数 -->
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
         :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
@@ -306,7 +305,7 @@
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 10,
-        searchType: '1',
+        searchType: '',
         manualFlag: '',
         searchTypeText: '未完成',
         searchKeyWord: '',
@@ -921,8 +920,10 @@
                 taskNoValue: response[i].taskNo,
                 processNo: response[i].tranProcessInfoList,
               })
+              this.getList()
             }
           })
+
       },
       taskNochange(e) {
         this.taskNo = e

src/views/taskManagement/tranManagementTransport.vue

@@ -51,8 +51,8 @@
             }}{{ scope.row.startArea }}{{ scope.row.startDetailedAddress }}
         </template>
       </el-table-column>
-      <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转">
-      </el-table-column>
+      <!-- <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转">
+      </el-table-column> -->
       <el-table-column prop="end" class="table_td" label="终点">
         <template slot-scope="scope">
           {{ scope.row.endPrivate }}{{ scope.row.endCity

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -90,11 +90,11 @@
           <el-row class="myTest">
 
             <!--当前运输总价-->
-            <el-form-item label="当前运输总价(元/吨):" prop="tranPrice" label-width="150px" class="input-item-margin">
+            <el-form-item label="当前运输总价(元):" prop="tranPrice" label-width="150px" class="input-item-margin">
               <el-input v-model="deptBudgetList.tranPrice" maxlength="70" disabled />
             </el-form-item>
             <!--审核中的运输总价-->
-            <el-form-item label="审核中的运输总价(元/吨):" prop="tranPriceIng" label-width="180px" class="input-item-margin">
+            <el-form-item label="审核中的运输总价(元):" prop="tranPriceIng" label-width="180px" class="input-item-margin">
               <el-input v-if="deptBudgetList.priceStatus=='审核中'" :disabled="readonly"
                 v-model="deptBudgetList.tranPriceIng" maxlength="70" />
               <el-input v-else v-model="deptBudgetList.tranPriceIng" maxlength="70" />
@@ -213,11 +213,10 @@
             v-show="deptBudgetList.tranCarInfoList[0].shipType == '散船'">
             共{{ total }}/{{ deptBudgetList.weight }}
           </div>
-          <el-button class="add bg-bottom" type="primary" size="small" @click="add"
+          <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add"
             v-show="deptBudgetList.tranCarInfoList[0].shipType == '散船'">
-            <!-- <img width="22" height="22" src="../../../public/img/add.png" alt /> -->
             <div class="spans">添加仓位</div>
-          </el-button>
+          </el-button> -->
         </div>
       </el-form>
       <div style="text-align: right; padding: 10px">

src/views/warehousenew/warehousingOrder.vue

@@ -50,7 +50,7 @@
     </el-row>
     <div v-for="(item,index) in gainList" style='margin:10px;border:1px solid #ccc;padding:10px;'>
       <div style='width:100%;justify-content:space-between;align-items:center;margin-bottom:10px;' class="flex">
-        <div>{{item.issuingTime}}</div>
+        <div>{{item.issuingTime}} 合计{{item.summation}}</div>
         <div>{{item.warehouseName}}入库单<span v-if='item.warehouseType==2'>（临）</span></div>
         <div>
           <!-- <ws-button  type="primary" @click="distribution(item)" >预付款分配</ws-button>
@@ -176,22 +176,25 @@
             </el-form> 
           </div>
           
-          <div style='width:50%;'>
-          <div style='margin:0 0 10px;width:90%;'>账户信息</div>
-            <el-form label-position="left">
+          <div style='width:50%;height:220px;overflow-y:scroll;'>
+            <div v-for="(item,index) in payeeinfo">
+              <div style='margin:0 0 10px;width:90%;'>账户信息-{{index+1}}</div>
+            <el-form  label-position="left">
             <el-form-item  label-width='100px' label="收款方" span="1" prop="purpose" class="readonly">
-            {{payeeinfo.customerType=="企业客户"?payeeinfo.compName:payeeinfo.customerName}}
+            {{item.customerName}}
             </el-form-item>
             <el-form-item  label-width='100px' label="账号" span="1" prop="purpose" class="readonly">
-            {{payeeinfo.bankCard}}
+            {{item.bankCard}}
             </el-form-item>
             <el-form-item  label-width='100px' label="开户行" span="1" prop="purpose" class="readonly">
-            {{payeeinfo.bankDeposit}}
+            {{item.bankDeposit}}
             </el-form-item>
             <el-form-item  label-width='100px' label="开户支行" span="1" prop="purpose" class="readonly">
-            {{payeeinfo.bankDepositBranch}}
+            {{item.bankDepositBranch}}
             </el-form-item>
              </el-form>
+            </div>
+          
         </div>
         </div>
         <span slot="footer" class="dialog-footer">
@@ -207,7 +210,7 @@
         <div>
             <el-form label-position="left">
             <el-form-item  label-width='100px' label="收款方" span="1" prop="purpose" class="readonly">
-            {{customerInfo.customerType=="企业客户"?customerInfo.compName:customerInfo.customerName}}
+            {{customerInfo.customerName}}
             </el-form-item>
             <el-form-item  label-width='100px' label="账号" span="1" prop="purpose" class="readonly">
             {{customerInfo.bankCard}}
@@ -509,7 +512,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         dialogApproveFormVisible: false,
         interestrateshow:false,
         dataList:[],
-        payeeinfo:{},
+        payeeinfo:[],
         options:[],
         textarea:'',
         dialogVisiblecontent:false,
@@ -775,7 +778,15 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             }
            }
           }
-          console.log(val)
+          item.summation=0
+          for (let i = 0; i < val.length; i++) {
+            if(val[i].surplusWeight){
+              item.summation+=val[i].surplusWeight
+            }
+            
+          }
+          this.$forceUpdate()
+          console.log(val,item.summation,1111111111)
           this.multipleSelection1[item.id]=val
         //  this.multipleSelection=this.noRepeat(this.multipleSelection.concat(val))
         //  console.log(this.multipleSelection)
@@ -817,7 +828,6 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           if(Object.keys(this.multipleSelection1).length!=0&&this.multipleSelection1[item.id].length>0){
             for (let i = 0; i < this.multipleSelection1[item.id].length; i++) {
               if(item.warehouseName==this.multipleSelection1[item.id][i].warehouseName){
-                
                 if(this.multipleSelection1[item.id][i].inType=='移库入库'||this.multipleSelection1[item.id][i].inType=='退库入库'){
                   this.$message({
                     message: '请选择收购入库或采购入库的条目！',
@@ -1371,19 +1381,9 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           
       },
       lookcustomer(row){
-        if(row.inType=='采购入库'){
-            getpayeeinfo({compId: localStorage.getItem('ws-pf_compId'),contractNo:row.contractNo}).toPromise()
-            .then((response) => {
-              this.customerInfo=response
-              this.customershow=true
-            })
-          }else if(row.inType=='收购入库'){
-            getbuypayeeinfo({compId: localStorage.getItem('ws-pf_compId'),customerName:row.customer}).toPromise()
-            .then((response) => {
-              this.customerInfo=response
-              this.customershow=true
-            })
-          }
+
+          this.customerInfo=row
+          this.customershow=true
       },
       payment(item){
         if(localStorage.getItem('ws-pf_roleName')=='出纳'){
@@ -1409,20 +1409,21 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           this.form.name=this.money
           this.currectdata=item
           if(moneyarr&&moneyarr.length>0){
-            if(item.inType=='采购入库'){
-              getpayeeinfo({compId: localStorage.getItem('ws-pf_compId'),contractNo:item.contractNo}).toPromise()
-              .then((response) => {
-                this.payeeinfo=response
-                this.aduitshow=true
-              })
-            }else if(item.inType=='收购入库'){
-              getbuypayeeinfo({compId: localStorage.getItem('ws-pf_compId'),customerName:item.customer}).toPromise()
-              .then((response) => {
-                this.payeeinfo=response
-                this.aduitshow=true
-              })
-            }
-            
+            // if(moneyarr[0].inType=='采购入库'){
+            //   getpayeeinfo({compId: localStorage.getItem('ws-pf_compId'),contractNo:moneyarr[0].contractNo}).toPromise()
+            //   .then((response) => {
+            //     this.payeeinfo=response
+            //     this.aduitshow=true
+            //   })
+            // }else if(moneyarr[0].inType=='收购入库'){
+            //   getbuypayeeinfo({compId: localStorage.getItem('ws-pf_compId'),customerName:moneyarr[0].customer}).toPromise()
+            //   .then((response) => {
+            //     this.payeeinfo=response
+                
+            //   })
+            // }
+            this.payeeinfo=moneyarr
+            this.aduitshow=true
           }else{
             this.$message({
                 message: '至少勾选一条待付款的条目',
@@ -1797,7 +1798,9 @@ multiFilter(array, filters) {
   }
 </script>
 <style lang="scss" scoped>
- 
+ /deep/.el-form-item{
+  margin:0;
+ }
 /deep/.el-table .cell .el-input {
     width: 92%;
 }