|
@@ -1185,7 +1185,7 @@
|
|
|
filterable
|
|
|
clearable
|
|
|
placeholder="客户名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fMblnoOptions"
|
|
@@ -1209,7 +1209,7 @@
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="费用名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fDNameOptions"
|
|
@@ -1255,7 +1255,7 @@
|
|
|
v-model="scope.row.fFeeUnitid"
|
|
|
placeholder="请选择计价单位"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
@change="changeFeeUnit(scope.row)"
|
|
|
>
|
|
|
<el-option
|
|
@@ -1279,7 +1279,7 @@
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fQty"
|
|
|
placeholder="数量"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
@change="changeContractAmt(scope.row)"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1297,7 +1297,7 @@
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fUnitprice"
|
|
|
placeholder="单价"
|
|
|
- :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
|
|
|
+ :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus === 6"
|
|
|
@change="changeContractAmt(scope.row)"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1331,7 +1331,7 @@
|
|
|
<el-select
|
|
|
v-model="scope.row.fStltypeid"
|
|
|
placeholder="请选择结算表票结、月结"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fStltypeOptions"
|
|
@@ -1352,7 +1352,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fCurrency"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="币别"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1368,7 +1368,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fExrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="汇率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1384,7 +1384,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fTaxrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="税率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1400,7 +1400,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMblno"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="提单号"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1416,7 +1416,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fProductName"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="品名"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1432,7 +1432,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="品牌"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1462,7 +1462,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.Remarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="备注"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1479,9 +1479,19 @@
|
|
|
<el-button
|
|
|
@click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
|
|
|
size="small"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>移除</el-button
|
|
|
>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ @click="listCheck(scope.row)"
|
|
|
+ v-if="scope.row.fBillstatus < 6"
|
|
|
+ >请核</el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ @click="revokeListCheck(scope.row)"
|
|
|
+ v-if="scope.row.fBillstatus == 6"
|
|
|
+ >撤销请核</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -1564,7 +1574,7 @@
|
|
|
filterable
|
|
|
clearable
|
|
|
placeholder="客户名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fMblnoOptions"
|
|
@@ -1588,7 +1598,7 @@
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="费用名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fCNameOptions"
|
|
@@ -1635,7 +1645,7 @@
|
|
|
v-model="scope.row.fFeeUnitid"
|
|
|
placeholder="请选择计价单位"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
@change="changeFeeUnit(scope.row)"
|
|
|
>
|
|
|
<el-option
|
|
@@ -1658,7 +1668,7 @@
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fQty"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
@change="changeContractAmt(scope.row)"
|
|
|
placeholder="数量"
|
|
|
show-word-limit
|
|
@@ -1676,7 +1686,7 @@
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fUnitprice"
|
|
|
- :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
|
|
|
+ :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus === 6"
|
|
|
@change="changeContractAmt(scope.row)"
|
|
|
placeholder="单价"
|
|
|
show-word-limit
|
|
@@ -1711,7 +1721,7 @@
|
|
|
<el-select
|
|
|
v-model="scope.row.fStltypeid"
|
|
|
placeholder="请选择结算表票结、月结"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fStltypeOptions"
|
|
@@ -1733,7 +1743,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fCurrency"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="币别"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1749,7 +1759,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fExrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="汇率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1765,7 +1775,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fTaxrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="税率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1782,7 +1792,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMblno"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="提单号"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1798,7 +1808,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fProductName"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="品名"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1815,7 +1825,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="品牌"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1844,7 +1854,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.remarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
placeholder="备注"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1862,9 +1872,19 @@
|
|
|
<el-button
|
|
|
@click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
|
|
|
size="small"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus === 6"
|
|
|
>移除</el-button
|
|
|
>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ @click="listCheck(scope.row)"
|
|
|
+ v-if="scope.row.fBillstatus < 6"
|
|
|
+ >请核</el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ @click="revokeListCheck(scope.row)"
|
|
|
+ v-if="scope.row.fBillstatus == 6"
|
|
|
+ >撤销请核</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -2653,6 +2673,8 @@ import {
|
|
|
submitWarehousingApproval,
|
|
|
ordersRevoke,
|
|
|
checkCode,
|
|
|
+ feesCheck,
|
|
|
+ revokefeeCheck
|
|
|
} from "@/api/warehouseBusiness/stockTransfer";
|
|
|
import { operationAgreement } from "@/api/agreement/agreement";
|
|
|
import { listCorps } from "@/api/basicdata/corps";
|
|
@@ -4284,6 +4306,24 @@ export default {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
|
this.form.fBillstatus = 2;
|
|
|
+ for (let item in this.warehouseDrList) {
|
|
|
+ if (!this.warehouseDrList[item].fCorpid) {
|
|
|
+ return this.$message.error('收款信息第' + (Number(item) + 1) + '行' + '客户名称不能为空');
|
|
|
+ } else if (!this.warehouseDrList[item].fFeeid) {
|
|
|
+ return this.$message.error('收款信息第' + (Number(item) + 1) + '行' + '费用名称不能为空');
|
|
|
+ } else if (!this.warehouseDrList[item].fFeeUnitid) {
|
|
|
+ return this.$message.error('收款信息第' + (Number(item) + 1) + '行' + '计价单位不能为空');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (let item in this.warehouseCrList) {
|
|
|
+ if (!this.warehouseCrList[item].fCorpid) {
|
|
|
+ return this.$message.error('付款信息第' + (Number(item) + 1) + '行' + '客户名称不能为空');
|
|
|
+ } else if (!this.warehouseCrList[item].fFeeid) {
|
|
|
+ return this.$message.error('付款信息第' + (Number(item) + 1) + '行' + '费用名称不能为空');
|
|
|
+ } else if (!this.warehouseCrList[item].fFeeUnitid) {
|
|
|
+ return this.$message.error('付款信息第' + (Number(item) + 1) + '行' + '计价单位不能为空');
|
|
|
+ }
|
|
|
+ }
|
|
|
let formData = new window.FormData();
|
|
|
formData.append("type", "2");
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
@@ -5076,6 +5116,34 @@ export default {
|
|
|
query: { data: data},
|
|
|
});
|
|
|
},
|
|
|
+ // 费用明细请核
|
|
|
+ listCheck(row) {
|
|
|
+ feesCheck(row.fId).then(res => {
|
|
|
+ this.$message.success('请核成功')
|
|
|
+ res.data.fFeeUnitid = res.data.fFeeunitid.toString();
|
|
|
+ if (res.data.fDc == 'D') {
|
|
|
+ let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
|
|
|
+ this.warehouseDrList.splice(index, 1, res.data)
|
|
|
+ } else {
|
|
|
+ let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
|
|
|
+ this.warehouseCrList.splice(index, 1, res.data)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 费用明细撤销请核
|
|
|
+ revokeListCheck(row) {
|
|
|
+ revokefeeCheck(row.fId).then(res => {
|
|
|
+ res.data.fFeeUnitid = res.data.fFeeunitid.toString();
|
|
|
+ this.$message.success('操作成功')
|
|
|
+ if (res.data.fDc == 'D') {
|
|
|
+ let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
|
|
|
+ this.warehouseDrList.splice(index, 1, res.data)
|
|
|
+ } else {
|
|
|
+ let index = this.warehouseCrList.findIndex(item => item.fId == res.data.fId)
|
|
|
+ this.warehouseCrList.splice(index, 1, res.data)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
},
|
|
|
watch: {
|
|
|
// 监听 addOrUpdateVisible 改变
|