前端

src/api/V2/profitable/index.js

@@ -63,4 +63,6 @@ export const API_EXPENSECHAT ='/expenseInfo/expenseChart'
 // 费用管理收支表
 export const API_EXPENSECHATLIST ='/expenseInfo/expenseList'
 // 当天提交的费用条数
-export const API_EXPENSECOUNT ='/expenseInfo/api/expenseCount'  
+export const API_EXPENSECOUNT ='/expenseInfo/api/expenseCount'
+// 当天提交的费用条数
+export const API_PAYEEINFO ='/customerInfo/getPayeeInfo'

src/model/profitable/index.js

@@ -33,7 +33,8 @@ import {
   API_GET_CONTRACTCHART,
   API_GET_WAREHOUSECHART,
   API_DEL_ONE_ALLOCATIONINFO,
-  API_EXPENSECOUNT
+  API_EXPENSECOUNT,
+  API_PAYEEINFO
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -101,3 +102,5 @@ export const getexpensechat= appRx.get(API_EXPENSECHAT, errorCatcher, errorHandl
 export const getexpensechatlist= appRx.get(API_EXPENSECHATLIST, errorCatcher, errorHandle, filter)
 // 当天提交的费用条数
 export const getexpensecount= appRx.get(API_EXPENSECOUNT, errorCatcher, errorHandle, filter)
+// 当天提交的费用条数
+export const getpayeeinfo= appRx.get(API_PAYEEINFO, errorCatcher, errorHandle, filter)

src/views/profitable/payment.vue

@@ -10,9 +10,10 @@
         </el-button></el-col>
     </el-row>
     <div class="center">
-     <div style='margin:0 auto 10px;width:90%;'>基本信息</div>
-      <div>
-        <el-form label-position="left">
+     
+      <div  style='margin:0 auto 10px;width:90%;display:flex;'>
+        <el-form class='left-form' label-position="left">
+          <div style='margin:0 auto 10px;'>基本信息</div>
           <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="1"
@@ -58,22 +59,39 @@
               :src="item"
                :preview-src-list="srcList"></el-image></span>
               -->
-              <el-upload ref='uploadfiles' :file-list='srcList' action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
-            :on-success="handlefujian" :on-remove="handleRemove" class="photo2">
-            <i class="el-icon-plus"></i>
-          </el-upload>
+              <el-upload ref='uploadfiles' :file-list='srcList' action="https://www.zthymaoyi.com/upload/admin" 
+              list-type="picture-card" :on-success="handlefujian" :on-remove="handleRemove" class="photo2">
+                <i class="el-icon-plus"></i>
+              </el-upload>
           </div>
         </el-form-item>
         </el-form>
-        <div style='width:90%;margin:10px auto;text-align:right;'>
+        <div style='width:50%;'>
+          <div style='margin:0 auto 10px;width:90%;'>账户信息</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}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="账号" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankCard}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="开户行" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankDeposit}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="开户支行" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankDepositBranch}}
+            </el-form-item>
+             </el-form>
+        </div>
+      </div>
+      <div style='width:90%;margin:10px auto;text-align:right;'>
         <el-button class="bg-bottom" type="primary" size="small" @click="submit()">提交
         </el-button></div>
-      </div>
     </div>
   </div>
 </template>
 <script>
-  import {lookexenseinfo,expensepayment} from '@/model/profitable/index'
+  import {lookexenseinfo,expensepayment,getpayeeinfo} from '@/model/profitable/index'
   import {woekflowhandle,} from '@/model/tasksport/index'
   export default {
     components: {},
@@ -88,6 +106,7 @@
         deptBudgetList:{},
         makeWordData: {},
         srcList:[],
+        payeeinfo:{},
         textarea:'',
         valueData: [{
             date: 10
@@ -112,12 +131,22 @@
           this.deptBudgetList=response
           var arr=response.addressUrl.split(',')
           for (let i = 0; i < arr.length; i++) {
-          this.srcList.push({url:arr[i]})
-            
+            if(arr[i]!=''){
+              this.srcList.push({url:arr[i]})
+            }
+          }
+          if(localStorage.getItem('ws-pf_roleName')=='出纳'){
+            if(this.deptBudgetList.expensesPurpose==1){
+              getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
+              .then((response1) => {
+                this.payeeinfo=response1
+                console.log(this.payeeinfo)
+              })
+            }          
           }
-          this.paymentScreenshot=response.addressUrl.split(',')
+          this.paymentScreenshot=this.srcList
         })
-
+        
       },
       handlefujian(file) {
         // console.log(file)
@@ -236,12 +265,15 @@
     text-align:center;
 
   }
+  /deep/.el-form.left-form{
+    width:50%;
+    margin:10px auto;
+  }
   /deep/.el-form{
-    width:90%;
+    width: 90%;
     margin:10px auto;
   }
-  
   /deep/.el-form-item {
-    width: 50%;
+    // width: 50%;
 }
 </style>

src/views/warehousenew/warehousingOrder.vue

@@ -213,8 +213,8 @@
           </el-form>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="distributionshow = false">取消</el-button>
-          <el-button type="primary" @click="distributionsubmit">确定</el-button>
+          <el-button @click="handleClose1">取消</el-button>
+          <el-button type="primary" @click="distributionsubmit">提交</el-button>
         </span>
       </el-dialog>
                   <el-dialog
@@ -265,8 +265,8 @@
           </el-form>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="marginshow = false">取消</el-button>
-          <el-button type="primary" @click="marginsubmit">确定</el-button>
+          <el-button @click="handleClose2">取消</el-button>
+          <el-button type="primary" @click="marginsubmit">提交</el-button>
         </span>
       </el-dialog>
       <!-- <el-dialog
@@ -895,12 +895,18 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
             return
           }
-          paymoney({flag:3,money:this.form.distributionIng,warehousingOrderList:arr2}).toPromise()
+          this.$confirm('确定提交分配金额?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            paymoney({flag:3,money:this.form.distributionIng,warehousingOrderList:arr2}).toPromise()
           .then((response) => {
             this.$message({
               message: '分配成功',
               type: 'success'
             });
+            this.form.distributionIng=''
             this.marginshow=false
             this.getList()
           }).catch(() => {
@@ -909,6 +915,13 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
               type: 'warning'
             });
           })
+          }).catch(() => {
+            // this.$message({
+            //   type: 'info',
+            //   message: '已取消删除'
+            // });          
+          });
+          
       },
       distributionsubmit(){
         var arr2=this.currectdata
@@ -926,12 +939,18 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
             return
           }
-          paymoney({flag:2,money:this.form.distributionIng,warehousingOrderList:arr2}).toPromise()
+          this.$confirm('确定提交分配金额?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            paymoney({flag:2,money:this.form.distributionIng,warehousingOrderList:arr2}).toPromise()
           .then((response) => {
             this.$message({
               message: '分配成功',
               type: 'success'
             });
+            this.form.distributionIng=''
             this.distributionshow=false
             this.getList()
           }).catch(() => {
@@ -940,6 +959,13 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
               type: 'warning'
             });
           })
+          }).catch(() => {
+            // this.$message({
+            //   type: 'info',
+            //   message: '已取消删除'
+            // });          
+          });
+          
       },
       payment(item){
         if(localStorage.getItem('ws-pf_roleName')=='出纳'){
@@ -1237,9 +1263,11 @@ multiFilter(array, filters) {
         this.aduitshow = false
       },
       handleClose1() {
+        this.form.distributionIng=''
         this.distributionshow = false
       },
       handleClose2() {
+        this.form.distributionIng=''
         this.marginshow = false
       },
       handleSizeChange(val) {