前端

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/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/statisticalReport/shippingList.vue

@@ -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="卸车净重(吨)">

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/warehousenew/warehousingOrder.vue

@@ -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,
@@ -817,7 +820,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 +1373,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 +1401,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 +1790,9 @@ multiFilter(array, filters) {
   }
 </script>
 <style lang="scss" scoped>
- 
+ /deep/.el-form-item{
+  margin:0;
+ }
 /deep/.el-table .cell .el-input {
     width: 92%;
 }