|
@@ -2134,7 +2134,7 @@
|
|
|
filterable
|
|
|
clearable
|
|
|
placeholder="客户名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fMblnoOptions"
|
|
@@ -2158,7 +2158,7 @@
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="费用名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fDNameOptions"
|
|
@@ -2204,7 +2204,7 @@
|
|
|
v-model="scope.row.fFeeUnitid"
|
|
|
placeholder="请选择计价单位"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
@change="changeFeeUnit(scope.row)"
|
|
|
>
|
|
|
<el-option
|
|
@@ -2228,7 +2228,7 @@
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fUnitprice"
|
|
|
placeholder="数量"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
@change="changeContractAmt(scope.row)"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2246,7 +2246,7 @@
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fQty"
|
|
|
placeholder="单价"
|
|
|
- :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
|
|
|
+ :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
|
|
|
@change="changeContractAmt(scope.row)"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2261,7 +2261,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
|
|
|
+ :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fAmount"
|
|
|
placeholder="金额"
|
|
@@ -2280,7 +2280,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"
|
|
@@ -2301,7 +2301,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fCurrency"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="币别"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2317,7 +2317,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fExrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="汇率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2333,7 +2333,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fTaxrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="税率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2349,7 +2349,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMblno"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="提单号"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2365,7 +2365,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fProductName"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="品名"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2381,7 +2381,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="品牌"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2420,10 +2420,10 @@
|
|
|
align="center"
|
|
|
width="140px"
|
|
|
label="业务单号"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.fMblno" :disabled="browseStatus" placeholder="请输入业务单号"></el-input>
|
|
|
+ <el-input v-model="scope.row.fMblno" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入业务单号"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -2434,7 +2434,7 @@
|
|
|
label="唛头"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.fMarks" :disabled="browseStatus" placeholder="请输入唛头"></el-input>
|
|
|
+ <el-input v-model="scope.row.fMarks" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入唛头"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -2447,7 +2447,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker
|
|
|
style="width: 100%;"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
v-model="scope.row.fBsdate"
|
|
|
type="date"
|
|
|
placeholder="选择日期">
|
|
@@ -2465,7 +2465,7 @@
|
|
|
<el-select
|
|
|
v-model="scope.row.fBillingway"
|
|
|
placeholder="请选择计费单位"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
@@ -2485,7 +2485,7 @@
|
|
|
label="计费数量"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.fBillingQty" :disabled="browseStatus" placeholder="请输入计费数量"></el-input>
|
|
|
+ <el-input v-model="scope.row.fBillingQty" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入计费数量"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -2498,7 +2498,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker
|
|
|
style="width: 100%;"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
v-model="scope.row.fChargedate"
|
|
|
type="date"
|
|
|
placeholder="选择日期">
|
|
@@ -2515,7 +2515,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker
|
|
|
style="width: 100%;"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
v-model="scope.row.fBillingDeadline"
|
|
|
type="date"
|
|
|
placeholder="选择日期">
|
|
@@ -2530,7 +2530,7 @@
|
|
|
label="计费天数"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.fBillingDays" :disabled="browseStatus" placeholder="请输入计费天数"></el-input>
|
|
|
+ <el-input v-model="scope.row.fBillingDays" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入计费天数"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -2541,7 +2541,7 @@
|
|
|
label="库存天数"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.fInventoryDays" :disabled="browseStatus" placeholder="请输入库存天数"></el-input>
|
|
|
+ <el-input v-model="scope.row.fInventoryDays" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入库存天数"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -2552,7 +2552,7 @@
|
|
|
label="计费金额"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-input v-model="scope.row.fAmt" :disabled="browseStatus" placeholder="请输入计费金额"
|
|
|
+ <el-input v-model="scope.row.fAmt" :disabled="browseStatus || scope.row.fBillstatus == 6" placeholder="请输入计费金额"
|
|
|
@change="calculationFAmt(scope.row)"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -2566,7 +2566,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.remark"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="备注"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2587,6 +2587,16 @@
|
|
|
>移除
|
|
|
</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>
|
|
@@ -2671,7 +2681,7 @@
|
|
|
filterable
|
|
|
clearable
|
|
|
placeholder="客户名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fMblnoOptions"
|
|
@@ -2695,7 +2705,7 @@
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="费用名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fCNameOptions"
|
|
@@ -2742,7 +2752,7 @@
|
|
|
v-model="scope.row.fFeeUnitid"
|
|
|
placeholder="请选择计价单位"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
@change="changeFeeUnit(scope.row)"
|
|
|
>
|
|
|
<el-option
|
|
@@ -2765,7 +2775,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
|
|
@@ -2783,7 +2793,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
|
|
@@ -2818,7 +2828,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"
|
|
@@ -2840,7 +2850,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fCurrency"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="币别"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2856,7 +2866,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fExrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="汇率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2872,7 +2882,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fTaxrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="税率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2889,7 +2899,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMblno"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="提单号"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2905,7 +2915,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fProductName"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="品名"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2922,7 +2932,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="品牌"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2951,7 +2961,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.remark"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="备注"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -2973,6 +2983,16 @@
|
|
|
>移除
|
|
|
</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>
|
|
@@ -4456,7 +4476,9 @@ import {
|
|
|
ordersRevoke,
|
|
|
checkCode,
|
|
|
deliveryCalculation,
|
|
|
- matchWarehouse
|
|
|
+ matchWarehouse,
|
|
|
+ feesCheck,
|
|
|
+ revokefeeCheck
|
|
|
} from "@/api/warehouseBusiness/warehouseInAndOutStock";
|
|
|
import {operationAgreement} from "@/api/agreement/agreement";
|
|
|
import {listCorps} from "@/api/basicdata/corps";
|
|
@@ -7229,7 +7251,8 @@ export default {
|
|
|
fMarks: this.form.fMarks,
|
|
|
fBusinessType: this.form.fBusinessType,
|
|
|
fSrcTypeId: 0,
|
|
|
- fBilltype: 'CDZZ'
|
|
|
+ fBilltype: 'CDZZ',
|
|
|
+ fStltypeid: '1',
|
|
|
});
|
|
|
this.fWbuOptions = [];
|
|
|
let queryParams = {pageNum: 1, fDc: "D"};
|
|
@@ -7265,6 +7288,7 @@ export default {
|
|
|
fMarks: this.form.fMarks,
|
|
|
fBusinessType: this.form.fBusinessType,
|
|
|
fSrcTypeId: 0,
|
|
|
+ fStltypeid: '1',
|
|
|
});
|
|
|
this.fWbuOptions = [];
|
|
|
let queryParams = {pageNum: 1, fDc: "C"};
|
|
@@ -7312,6 +7336,7 @@ export default {
|
|
|
fMarks: this.form.fMarks,
|
|
|
fBusinessType: this.form.fBusinessType,
|
|
|
fSrcTypeId: 1,
|
|
|
+ fStltypeid: '1',
|
|
|
});
|
|
|
} else {
|
|
|
this.warehouseCrList.push({
|
|
@@ -7329,6 +7354,7 @@ export default {
|
|
|
fMarks: this.form.fMarks,
|
|
|
fBusinessType: this.form.fBusinessType,
|
|
|
fSrcTypeId: 1,
|
|
|
+ fStltypeid: '1',
|
|
|
});
|
|
|
}
|
|
|
});
|
|
@@ -7701,6 +7727,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 改变
|