|
|
@@ -234,11 +234,14 @@
|
|
|
<avue-crud :option="pickOption" :data="pickData" id="out-table" ref="crud5"
|
|
|
:header-cell-class-name="headerClassName" :row-style="{ height: '20px' }" :cell-style="{ padding: '0px' }"
|
|
|
:search.sync="pickSearch" @search-change="searchChange" @search-reset="searchReset"
|
|
|
- @selection-change="pickChange"@resetColumn="resetColumn('crud5', 'pickOption', 'pickOptionBack', 518)"
|
|
|
+ @selection-change="pickChange" @resetColumn="resetColumn('crud5', 'pickOption', 'pickOptionBack', 518)"
|
|
|
@saveColumn="saveColumn('crud5', 'pickOption', 'pickOptionBack', 518)">
|
|
|
<template slot="menuLeft">
|
|
|
<el-button type="info" plain size="small" :disabled="editDisabled || selecPickList.length == 0"
|
|
|
@click="allClick('合并生成')">合并生成费用</el-button>
|
|
|
+ <el-button type="danger" plain size="small" :disabled="editDisabled || selecPickList.length == 0"
|
|
|
+ @click="allClick('撤销生成')">撤销生成费用</el-button>
|
|
|
+ <el-button type="warning" plain size="small" @click="allClick('批量导入费用')">批量导入费用</el-button>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</el-tab-pane>
|
|
|
@@ -251,6 +254,12 @@
|
|
|
<template slot="menuLeft">
|
|
|
<el-button type="info" plain size="small" :disabled="editDisabled || selecPerList.length == 0"
|
|
|
@click="allClick('合并生成2')">合并生成费用</el-button>
|
|
|
+ <el-button type="danger" plain size="small" :disabled="editDisabled || selecPerList.length == 0"
|
|
|
+ @click="allClick('撤销生成2')">撤销生成费用</el-button>
|
|
|
+ <el-button type="success" plain size="small" @click="allClick('生成租金')"
|
|
|
+ :disabled="form.tradingBoxItemsList.length == 0">生成租金</el-button>
|
|
|
+ <el-button type="danger" plain size="small" @click="allClick('撤销租金')"
|
|
|
+ :disabled="form.tradingBoxItemsList.length == 0">撤销租金</el-button>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</el-tab-pane>
|
|
|
@@ -272,15 +281,10 @@
|
|
|
<el-button type="info" plain size="small" @click="allClick('D费用一键编辑')">一键编辑</el-button>
|
|
|
<el-button type="danger" plain size="small" :disabled="selectionfeedList.length == 0"
|
|
|
@click="allClick('D费用批量删除')">批量删除</el-button>
|
|
|
- <el-button type="success" plain size="small" @click="allClick('生成租金')"
|
|
|
- :disabled="form.tradingBoxItemsList.length == 0">生成租金</el-button>
|
|
|
- <el-button type="danger" plain size="small" @click="allClick('撤销租金')"
|
|
|
- :disabled="form.tradingBoxItemsList.length == 0">撤销租金</el-button>
|
|
|
<el-button type="primary" plain size="small"
|
|
|
:disabled="(selectionfeedList.length == 0 && selectionfeecList.length == 0)"
|
|
|
@click="allClick('D费用申请')">请核费用</el-button>
|
|
|
<!-- <el-button type="primary" plain size="small" :disabled="editDisabled">计算超期箱使费</el-button> -->
|
|
|
- <el-button type="warning" plain size="small" @click="allClick('批量导入费用')">批量导入费用</el-button>
|
|
|
<!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
|
|
|
</template>
|
|
|
<template slot="indexHeader" slot-scope="{row,index}">
|
|
|
@@ -641,14 +645,15 @@ import {
|
|
|
getAccurate,
|
|
|
synchronousPutBoxData,
|
|
|
feeList,
|
|
|
- mergeGenerateCost
|
|
|
+ bfeesList,
|
|
|
+ mergeGenerateCost,
|
|
|
+ revokeMergeGenerateCost
|
|
|
} from "@/api/boxManagement/buyContainer";
|
|
|
import dicSelect from "@/components/dicSelect/main";
|
|
|
import containerNumber from "@/components/dicSelect/containerNumber";
|
|
|
import checkSchedule from "@/components/checkH/checkSchedule.vue";
|
|
|
import businessReports from "@/components/boxManagement/businessReports.vue";
|
|
|
import reports from "@/components/boxManagement/reports.vue";
|
|
|
-import { bfeesList } from "@/api/iosBasicData/bfees";
|
|
|
import {
|
|
|
dateFormat
|
|
|
} from "@/util/date";
|
|
|
@@ -666,6 +671,7 @@ export default {
|
|
|
name: "detailsPage",
|
|
|
data() {
|
|
|
return {
|
|
|
+ saberUserInfo: JSON.parse(localStorage.getItem('saber-userInfo')).content, // 当前登录人个人信息
|
|
|
selecPickList: [],
|
|
|
selecPerList: [],
|
|
|
pickSearch: {},
|
|
|
@@ -1507,6 +1513,19 @@ export default {
|
|
|
menu: false,
|
|
|
column: [
|
|
|
{
|
|
|
+ label: "是否生成",
|
|
|
+ prop: "whetherGenerateCost",
|
|
|
+ overHidden: true,
|
|
|
+ type: 'select',
|
|
|
+ dicData: [{
|
|
|
+ label: '否',
|
|
|
+ value: '0'
|
|
|
+ }, {
|
|
|
+ label: '是',
|
|
|
+ value: '1'
|
|
|
+ }]
|
|
|
+ },
|
|
|
+ {
|
|
|
label: "Customer",
|
|
|
prop: "corpCnName",
|
|
|
overHidden: true
|
|
|
@@ -1580,6 +1599,19 @@ export default {
|
|
|
menu: false,
|
|
|
column: [
|
|
|
{
|
|
|
+ label: "是否生成",
|
|
|
+ prop: "whetherGenerateCost",
|
|
|
+ overHidden: true,
|
|
|
+ type: 'select',
|
|
|
+ dicData: [{
|
|
|
+ label: '否',
|
|
|
+ value: '0'
|
|
|
+ }, {
|
|
|
+ label: '是',
|
|
|
+ value: '1'
|
|
|
+ }]
|
|
|
+ },
|
|
|
+ {
|
|
|
label: "Customer",
|
|
|
prop: "corpCnName",
|
|
|
overHidden: true
|
|
|
@@ -3296,6 +3328,7 @@ export default {
|
|
|
countRent(obj).then(res => {
|
|
|
this.$message.success("操作成功！");
|
|
|
this.getDetail(this.form.id)
|
|
|
+ this.getPer()
|
|
|
}).finally(() => {
|
|
|
loading.close();
|
|
|
})
|
|
|
@@ -3320,6 +3353,7 @@ export default {
|
|
|
}).then(res => {
|
|
|
this.$message.success("操作成功！");
|
|
|
this.getDetail(this.form.id)
|
|
|
+ this.getPer()
|
|
|
}).finally(() => {
|
|
|
loading.close();
|
|
|
})
|
|
|
@@ -3408,76 +3442,117 @@ export default {
|
|
|
}
|
|
|
if (name == '批量导入费用') {
|
|
|
this.checkRate(null, this.form.effectiveDate, null, 1, this.deptId)
|
|
|
- this.$confirm('是否批量导入费用?', '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- cancelButtonText: '取消',
|
|
|
- type: 'warning'
|
|
|
- }).then(() => {
|
|
|
- console.log(this.form.dc)
|
|
|
- if (this.form.dc == 'd') {
|
|
|
- bfeesList(1, 10, { cnName: 'Pickup fee' }).then(res => {
|
|
|
- res.data.data.records.forEach(item => {
|
|
|
- if (item.cnName == 'Pickup fee') {
|
|
|
- this.form.tradingBoxItemsList.forEach(e => {
|
|
|
- this.feeCenterListD.push({
|
|
|
- pid: this.form.id,
|
|
|
- feesType: 1,
|
|
|
- dc: 'D',
|
|
|
- billType: '箱东',
|
|
|
- corpId: this.form.purchaseCompanyId,
|
|
|
- shortName: this.form.purchaseCompanyName,
|
|
|
- corpCnName: this.form.purchaseCompanyName,
|
|
|
- cntrNo: e.code,
|
|
|
- unitNo: e.boxType,
|
|
|
- curCode: item.curNo,
|
|
|
- exrate: this.getExchangeRate(item.curNo, 'D', 1),
|
|
|
- feeId: item.id,
|
|
|
- feeCode: item.code,
|
|
|
- feeCnName: item.cnName,
|
|
|
- price: this.form.pickupFee,
|
|
|
- quantity: 1,
|
|
|
- amountCNY: item.curNo == this.getLocalCurrency() ? this.form.pickupFee : 0,
|
|
|
- amountUSD: item.curNo != this.getLocalCurrency() ? this.form.pickupFee : 0,
|
|
|
- $cellEdit: true
|
|
|
- })
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
- })
|
|
|
-
|
|
|
- } else {
|
|
|
- bfeesList(1, 10, { cnName: 'Pickup fee' }).then(res => {
|
|
|
- res.data.data.records.forEach(item => {
|
|
|
- if (item.cnName == 'Pickup fee') {
|
|
|
- this.form.tradingBoxItemsList.forEach(e => {
|
|
|
- this.feeCenterListC.push({
|
|
|
- pid: this.form.id,
|
|
|
- feesType: 1,
|
|
|
- dc: 'C',
|
|
|
- billType: '箱东',
|
|
|
- corpId: this.form.purchaseCompanyId,
|
|
|
- shortName: this.form.purchaseCompanyName,
|
|
|
- corpCnName: this.form.purchaseCompanyName,
|
|
|
- cntrNo: e.code,
|
|
|
- unitNo: e.boxType,
|
|
|
- curCode: item.curNo,
|
|
|
- exrate: this.getExchangeRate(item.curNo, 'C', 1),
|
|
|
- feeId: item.id,
|
|
|
- feeCode: item.code,
|
|
|
- feeCnName: item.cnName,
|
|
|
- price: this.form.pickupFee,
|
|
|
- quantity: 1,
|
|
|
- amountCNY: item.curNo == this.getLocalCurrency() ? this.form.pickupFee : 0,
|
|
|
- amountUSD: item.curNo != this.getLocalCurrency() ? this.form.pickupFee : 0,
|
|
|
- $cellEdit: true
|
|
|
- })
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
-
|
|
|
+ this.$DialogForm.show({
|
|
|
+ title: 'OW批量导入费用',
|
|
|
+ width: '30%',
|
|
|
+ // data: this.assemblyForm.hmmEdi,
|
|
|
+ menuPosition: 'right',
|
|
|
+ option: {
|
|
|
+ submitText: '确定',
|
|
|
+ emptyText: '取消',
|
|
|
+ // labelWidth: 130,
|
|
|
+ column: [
|
|
|
+ {
|
|
|
+ label: "账期",
|
|
|
+ span: 24,
|
|
|
+ prop: "accountDate",
|
|
|
+ type: 'month',
|
|
|
+ format: 'yyyy-MM',
|
|
|
+ valueFormat: 'yyyy-MM',
|
|
|
+ rules: [{
|
|
|
+ required: true,
|
|
|
+ message: "选择场站",
|
|
|
+ trigger: "blur",
|
|
|
+ }],
|
|
|
+ },
|
|
|
+ ]
|
|
|
+ },
|
|
|
+ beforeClose: (done) => {
|
|
|
+ done()
|
|
|
+ },
|
|
|
+ callback: (res) => {
|
|
|
+ res.done()
|
|
|
+ let obj = {
|
|
|
+ accountDate: res.data.accountDate + '-01 00:00:00',
|
|
|
+ id: this.form.id
|
|
|
+ }
|
|
|
+ bfeesList(obj).then(res => {
|
|
|
+ this.$message.success("操作成功！");
|
|
|
+ this.getPick()
|
|
|
})
|
|
|
+ res.close()
|
|
|
}
|
|
|
})
|
|
|
+ // this.$confirm('是否批量导入费用?', '提示', {
|
|
|
+ // confirmButtonText: '确定',
|
|
|
+ // cancelButtonText: '取消',
|
|
|
+ // type: 'warning'
|
|
|
+ // }).then(() => {
|
|
|
+ // console.log(this.form.dc)
|
|
|
+ // if (this.form.dc == 'd') {
|
|
|
+ // bfeesList(1, 10, { cnName: 'Pickup fee' }).then(res => {
|
|
|
+ // res.data.data.records.forEach(item => {
|
|
|
+ // if (item.cnName == 'Pickup fee') {
|
|
|
+ // this.form.tradingBoxItemsList.forEach(e => {
|
|
|
+ // this.feeCenterListD.push({
|
|
|
+ // pid: this.form.id,
|
|
|
+ // feesType: 1,
|
|
|
+ // dc: 'D',
|
|
|
+ // billType: '箱东',
|
|
|
+ // corpId: this.form.purchaseCompanyId,
|
|
|
+ // shortName: this.form.purchaseCompanyName,
|
|
|
+ // corpCnName: this.form.purchaseCompanyName,
|
|
|
+ // cntrNo: e.code,
|
|
|
+ // unitNo: e.boxType,
|
|
|
+ // curCode: item.curNo,
|
|
|
+ // exrate: this.getExchangeRate(item.curNo, 'D', 1),
|
|
|
+ // feeId: item.id,
|
|
|
+ // feeCode: item.code,
|
|
|
+ // feeCnName: item.cnName,
|
|
|
+ // price: this.form.pickupFee,
|
|
|
+ // quantity: 1,
|
|
|
+ // amountCNY: item.curNo == this.getLocalCurrency() ? this.form.pickupFee : 0,
|
|
|
+ // amountUSD: item.curNo != this.getLocalCurrency() ? this.form.pickupFee : 0,
|
|
|
+ // $cellEdit: true
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+
|
|
|
+ // } else {
|
|
|
+ // bfeesList(1, 10, { cnName: 'Pickup fee' }).then(res => {
|
|
|
+ // res.data.data.records.forEach(item => {
|
|
|
+ // if (item.cnName == 'Pickup fee') {
|
|
|
+ // this.form.tradingBoxItemsList.forEach(e => {
|
|
|
+ // this.feeCenterListC.push({
|
|
|
+ // pid: this.form.id,
|
|
|
+ // feesType: 1,
|
|
|
+ // dc: 'C',
|
|
|
+ // billType: '箱东',
|
|
|
+ // corpId: this.form.purchaseCompanyId,
|
|
|
+ // shortName: this.form.purchaseCompanyName,
|
|
|
+ // corpCnName: this.form.purchaseCompanyName,
|
|
|
+ // cntrNo: e.code,
|
|
|
+ // unitNo: e.boxType,
|
|
|
+ // curCode: item.curNo,
|
|
|
+ // exrate: this.getExchangeRate(item.curNo, 'C', 1),
|
|
|
+ // feeId: item.id,
|
|
|
+ // feeCode: item.code,
|
|
|
+ // feeCnName: item.cnName,
|
|
|
+ // price: this.form.pickupFee,
|
|
|
+ // quantity: 1,
|
|
|
+ // amountCNY: item.curNo == this.getLocalCurrency() ? this.form.pickupFee : 0,
|
|
|
+ // amountUSD: item.curNo != this.getLocalCurrency() ? this.form.pickupFee : 0,
|
|
|
+ // $cellEdit: true
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // })
|
|
|
}
|
|
|
if (name == '批量修改POD场站') {
|
|
|
this.podForm = {}
|
|
|
@@ -3496,6 +3571,23 @@ export default {
|
|
|
mergeGenerateCost(obj).then(res => {
|
|
|
this.$message.success("操作成功");
|
|
|
this.getDetail(this.form.id)
|
|
|
+ this.getPick()
|
|
|
+ })
|
|
|
+ }
|
|
|
+ if (name == '撤销生成') {
|
|
|
+ for (let item of this.selecPickList) {
|
|
|
+ if (item.whetherGenerateCost == 0) {
|
|
|
+ return this.$message.error("请选择已生成明细");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ let obj = {
|
|
|
+ id: this.form.id,
|
|
|
+ feeCenterItemsList: this.selecPickList
|
|
|
+ }
|
|
|
+ revokeMergeGenerateCost(obj).then(res => {
|
|
|
+ this.$message.success("操作成功");
|
|
|
+ this.getDetail(this.form.id)
|
|
|
+ this.getPick()
|
|
|
})
|
|
|
}
|
|
|
if (name == '合并生成2') {
|
|
|
@@ -3511,6 +3603,23 @@ export default {
|
|
|
mergeGenerateCost(obj).then(res => {
|
|
|
this.$message.success("操作成功");
|
|
|
this.getDetail(this.form.id)
|
|
|
+ this.getPer()
|
|
|
+ })
|
|
|
+ }
|
|
|
+ if (name == '撤销生成2') {
|
|
|
+ for (let item of this.selecPickList) {
|
|
|
+ if (item.whetherGenerateCost == 0) {
|
|
|
+ return this.$message.error("请选择已生成明细");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ let obj = {
|
|
|
+ id: this.form.id,
|
|
|
+ feeCenterItemsList: this.selecPerList
|
|
|
+ }
|
|
|
+ revokeMergeGenerateCost(obj).then(res => {
|
|
|
+ this.$message.success("操作成功");
|
|
|
+ this.getDetail(this.form.id)
|
|
|
+ this.getPer()
|
|
|
})
|
|
|
}
|
|
|
},
|
Qukatie