|
@@ -17,7 +17,6 @@
|
|
|
vertical-align: text-top;
|
|
vertical-align: text-top;
|
|
|
position: relative;
|
|
position: relative;
|
|
|
top: 0px;
|
|
top: 0px;
|
|
|
- left: -8px;
|
|
|
|
|
" src="../../../public/img/sousuo.png" alt />
|
|
" src="../../../public/img/sousuo.png" alt />
|
|
|
</ws-button>
|
|
</ws-button>
|
|
|
</template>
|
|
</template>
|
|
@@ -46,6 +45,8 @@
|
|
|
<div>{{item.issuingTime}}</div>
|
|
<div>{{item.issuingTime}}</div>
|
|
|
<div>{{item.warehouseName}}入库单<span v-if='item.warehouseType==2'>（临）</span></div>
|
|
<div>{{item.warehouseName}}入库单<span v-if='item.warehouseType==2'>（临）</span></div>
|
|
|
<div>
|
|
<div>
|
|
|
|
|
+ <ws-button type="primary" @click="distribution(item)" >预付款分配</ws-button>
|
|
|
|
|
+ <ws-button type="primary" @click="marginAllocation(item)">保证金分配</ws-button>
|
|
|
<ws-button v-if='item.payshow' type="primary" @click="payout(item)" v-hasPermission="
|
|
<ws-button v-if='item.payshow' type="primary" @click="payout(item)" v-hasPermission="
|
|
|
`warehouseManagement.warehousingOrder.appl`
|
|
`warehouseManagement.warehousingOrder.appl`
|
|
|
">请款
|
|
">请款
|
|
@@ -159,6 +160,110 @@
|
|
|
<el-button @click="aduitshow = false">取消</el-button>
|
|
<el-button @click="aduitshow = false">取消</el-button>
|
|
|
<el-button type="primary" @click="paymentsubmit">确定</el-button>
|
|
<el-button type="primary" @click="paymentsubmit">确定</el-button>
|
|
|
</span>
|
|
</span>
|
|
|
|
|
+ </el-dialog>
|
|
|
|
|
+ <el-dialog
|
|
|
|
|
+ title="预付款分配"
|
|
|
|
|
+ :visible.sync="distributionshow"
|
|
|
|
|
+ width="50%"
|
|
|
|
|
+ :before-close="handleClose1">
|
|
|
|
|
+ <div>
|
|
|
|
|
+ <!--插槽会替换title显示的内容 -->
|
|
|
|
|
+ <div slot="title" class="header-title">
|
|
|
|
|
+ <span v-show="dialogTitle" class="title-name">{{ dialogTitle }}</span>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <el-form ref="form" :model="form" label-width="120px">
|
|
|
|
|
+ <el-col class="col1">
|
|
|
|
|
+ <el-form-item label="累计预付(元)">
|
|
|
|
|
+ <el-input disabled v-model="form.accumulatedPrepayment"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col class="col1">
|
|
|
|
|
+ <el-form-item label="收回预付(元)">
|
|
|
|
|
+ <el-input disabled v-model="form.recoveryPrepayments"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col class="col1">
|
|
|
|
|
+ <el-form-item label="已分配(元)">
|
|
|
|
|
+ <el-input disabled v-model="form.distributionEd"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col class="col1">
|
|
|
|
|
+ <el-form-item label="可分配(元)">
|
|
|
|
|
+ <el-input disabled v-model="form.distributionCan"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-col class="col1">
|
|
|
|
|
+ <el-form-item label="未付金额(元)">
|
|
|
|
|
+ <el-input disabled v-model="form.distributionNot"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-form-item label="分配金额(元)">
|
|
|
|
|
+ <el-input v-model="form.distributionIng"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ </el-form>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
|
|
+ <el-button @click="distributionshow = false">取消</el-button>
|
|
|
|
|
+ <el-button type="primary" @click="distributionsubmit">确定</el-button>
|
|
|
|
|
+ </span>
|
|
|
|
|
+ </el-dialog>
|
|
|
|
|
+ <el-dialog
|
|
|
|
|
+ title="保证金分配"
|
|
|
|
|
+ :visible.sync="marginshow"
|
|
|
|
|
+ width="50%"
|
|
|
|
|
+ :before-close="handleClose2">
|
|
|
|
|
+ <div>
|
|
|
|
|
+ <!--插槽会替换title显示的内容 -->
|
|
|
|
|
+ <div slot="title" class="header-title">
|
|
|
|
|
+ <span v-show="dialogTitle" class="title-name">{{ dialogTitle }}</span>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <el-form ref="form" :model="form" label-width="120px">
|
|
|
|
|
+ <el-col class="col1">
|
|
|
|
|
+ <el-form-item label="累计支付(元)">
|
|
|
|
|
+ <el-input disabled v-model="form.accumulatedPrepayment"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col class="col1">
|
|
|
|
|
+ <el-form-item label="累计收回(元)">
|
|
|
|
|
+ <el-input disabled v-model="form.recoveryPrepayments"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col class="col1">
|
|
|
|
|
+ <el-form-item label="已分配(元)">
|
|
|
|
|
+ <el-input disabled v-model="form.distributionEd"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col class="col1">
|
|
|
|
|
+ <el-form-item label="可分配(元)">
|
|
|
|
|
+ <el-input disabled v-model="form.distributionCan"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-col class="col1">
|
|
|
|
|
+ <el-form-item label="未付金额(元)">
|
|
|
|
|
+ <el-input disabled v-model="form.distributionNot"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-form-item label="分配金额(元)">
|
|
|
|
|
+ <el-input v-model="form.distributionIng"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ </el-form>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
|
|
+ <el-button @click="marginshow = false">取消</el-button>
|
|
|
|
|
+ <el-button type="primary" @click="marginsubmit">确定</el-button>
|
|
|
|
|
+ </span>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
<!-- <el-dialog
|
|
<!-- <el-dialog
|
|
|
title="提示"
|
|
title="提示"
|
|
@@ -221,7 +326,7 @@
|
|
|
getwarehousingorder,
|
|
getwarehousingorder,
|
|
|
paymoney,
|
|
paymoney,
|
|
|
editwarehousingorder,
|
|
editwarehousingorder,
|
|
|
- getexenseinfo,
|
|
|
|
|
|
|
+ getExpense,
|
|
|
workflowhandle
|
|
workflowhandle
|
|
|
} from '@/model/warehouse/index'
|
|
} from '@/model/warehouse/index'
|
|
|
import {
|
|
import {
|
|
@@ -258,7 +363,15 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
dataList:[],
|
|
dataList:[],
|
|
|
// 船舶类型
|
|
// 船舶类型
|
|
|
monetaryKey: null,
|
|
monetaryKey: null,
|
|
|
- form:{},
|
|
|
|
|
|
|
+ form:{
|
|
|
|
|
+ accumulatedPrepayment:'',
|
|
|
|
|
+ recoveryPrepayments:'',
|
|
|
|
|
+ distributionEd:'',
|
|
|
|
|
+ distributionCan:'',
|
|
|
|
|
+ distributionNot:'',
|
|
|
|
|
+ distributionIng:''
|
|
|
|
|
+
|
|
|
|
|
+ },
|
|
|
// 表格显示数据
|
|
// 表格显示数据
|
|
|
tableDate: [],
|
|
tableDate: [],
|
|
|
|
|
|
|
@@ -342,6 +455,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
money:0,
|
|
money:0,
|
|
|
multipleSelection1:{},
|
|
multipleSelection1:{},
|
|
|
aduitshow:false,
|
|
aduitshow:false,
|
|
|
|
|
+ distributionshow:false,
|
|
|
|
|
+ marginshow:false,
|
|
|
costlist:[],
|
|
costlist:[],
|
|
|
pickerBeginDateBefore: {
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: (time) => {
|
|
disabledDate: (time) => {
|
|
@@ -350,6 +465,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
},
|
|
},
|
|
|
accessoryTFs: false,
|
|
accessoryTFs: false,
|
|
|
remarkList: false,
|
|
remarkList: false,
|
|
|
|
|
+ dialogTitle:'',
|
|
|
|
|
+
|
|
|
remark:''
|
|
remark:''
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
@@ -463,6 +580,83 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ },
|
|
|
|
|
+ marginAllocation(item){
|
|
|
|
|
+ let _this= this
|
|
|
|
|
+ var arr1=this.multipleSelection1[item.id]
|
|
|
|
|
+ for (let i = 0; i < arr1.length; i++) {
|
|
|
|
|
+ if(arr1[i].amountNotPayable<0){
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '请选择一条有未付金额的条目！',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ if(!arr1[i].contractNo){
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '请选择货源是采购合同的条目',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ _this.dialogTitle=arr1[i].contractNo
|
|
|
|
|
+ getExpense({contractNo:arr1[i].contractNo,costType:5}).toPromise()
|
|
|
|
|
+ .then((response) => {
|
|
|
|
|
+ _this.form.accumulatedPrepayment=response.accumulatedPrepayment
|
|
|
|
|
+ _this.form.recoveryPrepayments=response.recoveryPrepayments
|
|
|
|
|
+ _this.form.distributionEd=response.distributionMoney
|
|
|
|
|
+ _this.form.distributionCan=response.accumulatedPrepayment-response.recoveryPrepayments-response.distributionMoney
|
|
|
|
|
+ _this.form.distributionNot=arr1[i].amountNotPayable
|
|
|
|
|
+ }).catch(() => {
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '无可分配金额',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ return
|
|
|
|
|
+ })
|
|
|
|
|
+ }
|
|
|
|
|
+ this.currectdata=item
|
|
|
|
|
+ this.marginshow=true
|
|
|
|
|
+ },
|
|
|
|
|
+ distribution(item){
|
|
|
|
|
+ let _this= this
|
|
|
|
|
+ var arr1=this.multipleSelection1[item.id]
|
|
|
|
|
+ for (let i = 0; i < arr1.length; i++) {
|
|
|
|
|
+ if(arr1[i].amountNotPayable<0){
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '请选择一条有未付金额的条目！',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ if(!arr1[i].contractNo){
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '请选择货源是采购合同的条目',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ _this.dialogTitle=arr1[i].contractNo
|
|
|
|
|
+ getExpense({contractNo:arr1[i].contractNo,costType:1}).toPromise()
|
|
|
|
|
+ .then((response) => {
|
|
|
|
|
+ _this.form.accumulatedPrepayment=response.accumulatedPrepayment
|
|
|
|
|
+ _this.form.recoveryPrepayments=response.recoveryPrepayments
|
|
|
|
|
+ _this.form.distributionEd=response.distributionMoney
|
|
|
|
|
+ _this.form.distributionCan=response.accumulatedPrepayment-response.recoveryPrepayments-response.distributionMoney
|
|
|
|
|
+ _this.form.distributionNot=arr1[i].amountNotPayable
|
|
|
|
|
+ }).catch(() => {
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '无可分配金额',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ return
|
|
|
|
|
+ })
|
|
|
|
|
+ }
|
|
|
|
|
+ this.currectdata=item
|
|
|
|
|
+
|
|
|
|
|
+ this.distributionshow=true
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
getNowTime() {
|
|
getNowTime() {
|
|
|
const start = new Date(new Date().getTime() - 3600 * 1000 * 24 )
|
|
const start = new Date(new Date().getTime() - 3600 * 1000 * 24 )
|
|
@@ -624,6 +818,68 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
});
|
|
});
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
|
|
+ marginsubmit(item){
|
|
|
|
|
+ var arr2=this.multipleSelection1[this.currectdata.id]
|
|
|
|
|
+ if(this.form.distributionIng>this.form.distributionCan){
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '超出可分配金额',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ if(this.form.distributionIng>this.form.distributionNot){
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '超出未付金额',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ paymoney({flag:3,money:this.form.distributionIng,warehousingOrderList:arr2}).toPromise()
|
|
|
|
|
+ .then((response) => {
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '分配成功',
|
|
|
|
|
+ type: 'success'
|
|
|
|
|
+ });
|
|
|
|
|
+ this.marginshow=false
|
|
|
|
|
+ this.getList()
|
|
|
|
|
+ }).catch(() => {
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '分配失败',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ })
|
|
|
|
|
+ },
|
|
|
|
|
+ distributionsubmit(item){
|
|
|
|
|
+ var arr2=this.multipleSelection1[this.currectdata.id]
|
|
|
|
|
+ if(this.form.distributionIng>this.form.distributionCan){
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '超出可分配金额',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ if(this.form.distributionIng>this.form.distributionNot){
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '超出未付金额',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ paymoney({flag:2,money:this.form.distributionIng,warehousingOrderList:arr2}).toPromise()
|
|
|
|
|
+ .then((response) => {
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '分配成功',
|
|
|
|
|
+ type: 'success'
|
|
|
|
|
+ });
|
|
|
|
|
+ this.distributionshow=false
|
|
|
|
|
+ this.getList()
|
|
|
|
|
+ }).catch(() => {
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ message: '分配失败',
|
|
|
|
|
+ type: 'warning'
|
|
|
|
|
+ });
|
|
|
|
|
+ })
|
|
|
|
|
+ },
|
|
|
payment(item){
|
|
payment(item){
|
|
|
if(localStorage.getItem('ws-pf_roleName')=='出纳'){
|
|
if(localStorage.getItem('ws-pf_roleName')=='出纳'){
|
|
|
this.money=0
|
|
this.money=0
|
|
@@ -798,7 +1054,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
|
|
|
this.gainList = response.records
|
|
this.gainList = response.records
|
|
|
// this.currentPage = response.current
|
|
// this.currentPage = response.current
|
|
|
// this.pageSize = response.size
|
|
// this.pageSize = response.size
|
|
|
- // console.log(arr)
|
|
|
|
|
|
|
+ console.log(this.gainList,96)
|
|
|
this.deptBudgetTotal = response.total
|
|
this.deptBudgetTotal = response.total
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
@@ -919,6 +1175,12 @@ multiFilter(array, filters) {
|
|
|
handleClose() {
|
|
handleClose() {
|
|
|
this.aduitshow = false
|
|
this.aduitshow = false
|
|
|
},
|
|
},
|
|
|
|
|
+ handleClose1() {
|
|
|
|
|
+ this.distributionshow = false
|
|
|
|
|
+ },
|
|
|
|
|
+ handleClose2() {
|
|
|
|
|
+ this.marginshow = false
|
|
|
|
|
+ },
|
|
|
handleSizeChange(val) {
|
|
handleSizeChange(val) {
|
|
|
console.log(`每页 ${val} 条`)
|
|
console.log(`每页 ${val} 条`)
|
|
|
this.pageSize = val
|
|
this.pageSize = val
|
|
@@ -1008,6 +1270,9 @@ multiFilter(array, filters) {
|
|
|
width: 30%;
|
|
width: 30%;
|
|
|
margin-right: 10px;
|
|
margin-right: 10px;
|
|
|
}
|
|
}
|
|
|
|
|
+ .col1 {
|
|
|
|
|
+ width: 50%;
|
|
|
|
|
+ }
|
|
|
.audit {
|
|
.audit {
|
|
|
margin-bottom: 20px;
|
|
margin-bottom: 20px;
|
|
|
border-bottom: 1px solid #AFB3BF;
|
|
border-bottom: 1px solid #AFB3BF;
|
