|
@@ -660,12 +660,14 @@
|
|
|
type="danger"
|
|
|
>作业费协议</el-button
|
|
|
>
|
|
|
-<!-- <el-button-->
|
|
|
-<!-- type="primary"-->
|
|
|
-<!-- size="small"-->
|
|
|
-<!-- v-if="browseStatus"-->
|
|
|
-<!-- @click="feeChange"-->
|
|
|
-<!-- >费用变更</el-button>-->
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ v-if="browseStatus"
|
|
|
+ @click="feeChange('D')"
|
|
|
+ >
|
|
|
+ 费用变更
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-table
|
|
@@ -694,7 +696,7 @@
|
|
|
filterable
|
|
|
clearable
|
|
|
placeholder="客户名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fMblnoOptions"
|
|
@@ -718,7 +720,7 @@
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="费用名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fDNameOptions"
|
|
@@ -764,7 +766,7 @@
|
|
|
v-model="scope.row.fFeeUnitid"
|
|
|
placeholder="请选择计价单位"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
@change="changeFeeUnit(scope.row)"
|
|
|
>
|
|
|
<el-option
|
|
@@ -788,7 +790,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
|
|
|
/>
|
|
@@ -806,7 +808,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
|
|
|
/>
|
|
@@ -840,7 +842,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"
|
|
@@ -861,7 +863,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fCurrency"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="币别"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -877,7 +879,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fExrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="汇率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -893,7 +895,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fTaxrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="税率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -909,7 +911,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMblno"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="提单号"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -925,7 +927,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fProductName"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="品名"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -941,7 +943,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="品牌"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -970,7 +972,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.Remarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="备注"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -986,9 +988,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>
|
|
@@ -1032,12 +1044,14 @@
|
|
|
:disabled="browseStatus"
|
|
|
>作业费协议</el-button
|
|
|
>
|
|
|
-<!-- <el-button-->
|
|
|
-<!-- type="primary"-->
|
|
|
-<!-- size="small"-->
|
|
|
-<!-- v-if="browseStatus"-->
|
|
|
-<!-- @click="feeChange"-->
|
|
|
-<!-- >费用变更</el-button>-->
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ v-if="browseStatus"
|
|
|
+ @click="feeChange('C')"
|
|
|
+ >
|
|
|
+ 费用变更
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-table
|
|
@@ -1070,7 +1084,7 @@
|
|
|
filterable
|
|
|
clearable
|
|
|
placeholder="客户名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fMblnoOptions"
|
|
@@ -1094,7 +1108,7 @@
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="费用名称"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in fCNameOptions"
|
|
@@ -1141,7 +1155,7 @@
|
|
|
v-model="scope.row.fFeeUnitid"
|
|
|
placeholder="请选择计价单位"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
@change="changeFeeUnit(scope.row)"
|
|
|
>
|
|
|
<el-option
|
|
@@ -1164,7 +1178,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
|
|
@@ -1182,7 +1196,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
|
|
@@ -1217,7 +1231,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"
|
|
@@ -1239,7 +1253,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fCurrency"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="币别"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1255,7 +1269,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fExrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="汇率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1271,7 +1285,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fTaxrate"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="税率"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1288,7 +1302,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMblno"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="提单号"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1304,7 +1318,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fProductName"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="品名"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1321,7 +1335,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="品牌"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1349,7 +1363,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.remarks"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus == 6"
|
|
|
placeholder="备注"
|
|
|
show-word-limit
|
|
|
/>
|
|
@@ -1366,9 +1380,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>
|
|
@@ -1677,7 +1701,7 @@
|
|
|
:total="whgenlegTotal"
|
|
|
:page.sync="pageNum"
|
|
|
:limit.sync="pageSize"
|
|
|
- @pagination="getWhgenlegList"
|
|
|
+ @pagination="getWhgenlegList(key_id)"
|
|
|
/>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="zhgenlegData">导 入</el-button>
|
|
@@ -1773,6 +1797,8 @@ import {
|
|
|
delgoodsTransfer_s,
|
|
|
exportgoodsTransfer,
|
|
|
updateCredit,
|
|
|
+ feesCheck,
|
|
|
+ revokefeeCheck
|
|
|
} from "@/api/warehouseBusiness/goodsTransfer";
|
|
|
import { operationAgreement } from "@/api/agreement/agreement";
|
|
|
import { listCorps } from "@/api/basicdata/corps";
|
|
@@ -2862,7 +2888,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
- this.msgSuccess("调拨成功");
|
|
|
+ this.msgSuccess("货转成功");
|
|
|
this.$set(this.form, "fItemsStatus", 4);
|
|
|
}
|
|
|
});
|
|
@@ -3513,6 +3539,8 @@ export default {
|
|
|
type: "warning",
|
|
|
});
|
|
|
} else {
|
|
|
+ this.pageNum = 1;
|
|
|
+ this.pageSize = 10;
|
|
|
this.dialogWhgenlegList = [];
|
|
|
this.whgenlegTotal = 0;
|
|
|
this.warehousingagreements = true;
|
|
@@ -3896,13 +3924,51 @@ export default {
|
|
|
this.cancel();
|
|
|
});
|
|
|
},
|
|
|
- feeChange() {
|
|
|
+ feeChange(fDC) {
|
|
|
+ let data = {
|
|
|
+ form: {},
|
|
|
+ warehousebillsfeesCr: [],
|
|
|
+ warehousebillsfeesDr: [],
|
|
|
+ billType: 'outStock',
|
|
|
+ fDc: fDC
|
|
|
+ }
|
|
|
+ data.form = this.form
|
|
|
+ if (fDC == 'C') {
|
|
|
+ data.warehousebillsfeesCr = this.warehouseCrList
|
|
|
+ } else {
|
|
|
+ data.warehousebillsfeesDr = this.warehouseDrList
|
|
|
+ }
|
|
|
this.$router.push({
|
|
|
path: "/business/costModify",
|
|
|
- // query: { id: this.form.id},
|
|
|
- query: { id: 1},
|
|
|
+ query: { data: data},
|
|
|
});
|
|
|
},
|
|
|
+ // 费用明细请核
|
|
|
+ listCheck(row) {
|
|
|
+ feesCheck(row.fId).then(res => {
|
|
|
+ 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)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 费用明细撤销请核
|
|
|
+ revokeListCheck(row) {
|
|
|
+ revokefeeCheck(row.fId).then(res => {
|
|
|
+ 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 改变
|