|
|
@@ -84,7 +84,7 @@
|
|
|
>{{ $t("btn118n.transferApply") }}
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
- v-if="form.id && form.transferOrderStatus == '已转单'&&(roleName.includes('admin')||roleName.includes('总部'))"
|
|
|
+ v-if="form.id && form.transferOrderStatus == '已转单' && (roleName.includes('admin') || roleName.includes('总部'))"
|
|
|
size="small"
|
|
|
type="danger"
|
|
|
@click.stop="allClick('撤销转单')"
|
|
|
@@ -349,16 +349,31 @@
|
|
|
</bcorps>
|
|
|
<bcorpstypedefine v-show="item.slot == 'bcorpstypedefine'"> </bcorpstypedefine>
|
|
|
</search-query>
|
|
|
- <el-input
|
|
|
- v-else
|
|
|
- type="age"
|
|
|
- style="width: 100%;"
|
|
|
- v-model="form[item.prop]"
|
|
|
- size="small"
|
|
|
- autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled || item.disabled"
|
|
|
- :placeholder="item.text || ''"
|
|
|
- ></el-input>
|
|
|
+ <div v-else style="display: flex;">
|
|
|
+ <el-input
|
|
|
+ type="age"
|
|
|
+ style="width: 100%;"
|
|
|
+ v-model="form[item.prop]"
|
|
|
+ size="small"
|
|
|
+ autocomplete="off"
|
|
|
+ :disabled="detailData.seeDisabled || item.disabled"
|
|
|
+ :placeholder="item.text || ''"
|
|
|
+ ></el-input>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ size="small"
|
|
|
+ style="margin-left: 6px;"
|
|
|
+ :disabled="
|
|
|
+ !form.id ||
|
|
|
+ !form.hblno ||
|
|
|
+ form.billStatus == 1 ||
|
|
|
+ form.status > 0 ||
|
|
|
+ form.preContainersList.filter(item => item.containerNumberStatus == '已选择').length > 0
|
|
|
+ "
|
|
|
+ @click="allClick('申请修改')"
|
|
|
+ >申请修改</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
@@ -415,8 +430,13 @@
|
|
|
</el-tabs>
|
|
|
</basic-container>
|
|
|
<basic-container :showBtn="true" v-show="activeName == 'first' || activeName == 'third'">
|
|
|
- <formbottom :assemblyForm="form" :generateBillsfalse="generateBillsfalse" :disabled="showLock" :detailData="detailData"
|
|
|
- @billsDetailfun="billsDetailfun(form.id)"></formbottom>
|
|
|
+ <formbottom
|
|
|
+ :assemblyForm="form"
|
|
|
+ :generateBillsfalse="generateBillsfalse"
|
|
|
+ :disabled="showLock"
|
|
|
+ :detailData="detailData"
|
|
|
+ @billsDetailfun="billsDetailfun(form.id)"
|
|
|
+ ></formbottom>
|
|
|
</basic-container>
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
@@ -607,6 +627,7 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<bill-lading ref="billLading" :oldForm="form" @upDate="billsDetailfun(form.id)"></bill-lading>
|
|
|
+ <ship-copy ref="copy" :businessType="SE" @copyData="copyData"></ship-copy>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -653,7 +674,8 @@ import {
|
|
|
revokeLockOrder,
|
|
|
synchronizeDataMM,
|
|
|
verifyData,
|
|
|
- updateVerifyData
|
|
|
+ updateVerifyData,
|
|
|
+ updateHblno
|
|
|
} from "@/api/iosBasicData/bills";
|
|
|
import { dateFormat } from "@/util/date";
|
|
|
import { validatenull } from "@/util/validate";
|
|
|
@@ -671,6 +693,7 @@ import { isProcurement } from "@/api/basicData/configuration";
|
|
|
import billLading from "./assembly/billLading.vue";
|
|
|
import customsInformation from "./assembly/customsInformation.vue";
|
|
|
import { submit } from "@/api/iosBasicData/sailingSchedule.js";
|
|
|
+import shipCopy from "@/components/iosbasic-data/shipCopy.vue";
|
|
|
import _ from "lodash";
|
|
|
export default {
|
|
|
name: "海运出口(F)",
|
|
|
@@ -694,7 +717,8 @@ export default {
|
|
|
editypes,
|
|
|
dicSelect,
|
|
|
billLading,
|
|
|
- customsInformation
|
|
|
+ customsInformation,
|
|
|
+ shipCopy
|
|
|
},
|
|
|
props: {
|
|
|
detailData: {
|
|
|
@@ -1139,7 +1163,7 @@ export default {
|
|
|
billsListAllData: {
|
|
|
// 执行方法
|
|
|
handler(oldValue, newValue) {
|
|
|
- if (oldValue.length && this.form.billType == "MM") {
|
|
|
+ if (oldValue.length && this.form.billType == "MM" && this.form.billStatus != 1) {
|
|
|
this.basicData.column.forEach((item, index) => {
|
|
|
if (index == 3) {
|
|
|
item.forEach(row => {
|
|
|
@@ -1294,70 +1318,74 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ copyData(row) {
|
|
|
+ this.billsCopyBillsfun(row.id, row.checkbox, row.billType);
|
|
|
+ },
|
|
|
CopyDocumentsfun() {
|
|
|
if (!this.form.id) {
|
|
|
return this.$message.error("请保存数据");
|
|
|
}
|
|
|
- this.$DialogForm.show({
|
|
|
- title: "复制单据",
|
|
|
- width: "300px",
|
|
|
- menuPosition: "right",
|
|
|
- data: { checkbox: "复制费用,复制箱型箱量" },
|
|
|
- option: {
|
|
|
- submitText: "确认",
|
|
|
- emptyText: "取消",
|
|
|
- span: 24,
|
|
|
- column: [
|
|
|
- {
|
|
|
- label: "单据类型",
|
|
|
- prop: "billType",
|
|
|
- type: "select",
|
|
|
- value: this.form.billType,
|
|
|
- dicData: [
|
|
|
- {
|
|
|
- label: "直单",
|
|
|
- value: "DD"
|
|
|
- },
|
|
|
- {
|
|
|
- label: "主单",
|
|
|
- value: "MM"
|
|
|
- },
|
|
|
- {
|
|
|
- label: "分单",
|
|
|
- value: "MH"
|
|
|
- }
|
|
|
- ],
|
|
|
- dataType: "string",
|
|
|
- span: 24
|
|
|
- },
|
|
|
- {
|
|
|
- label: "复制类型",
|
|
|
- prop: "checkbox",
|
|
|
- type: "checkbox",
|
|
|
- dicData: [
|
|
|
- {
|
|
|
- label: "复制费用",
|
|
|
- value: "复制费用"
|
|
|
- },
|
|
|
- {
|
|
|
- label: "复制箱型箱量",
|
|
|
- value: "复制箱型箱量"
|
|
|
- }
|
|
|
- ],
|
|
|
- dataType: "string",
|
|
|
- span: 24
|
|
|
- }
|
|
|
- ]
|
|
|
- },
|
|
|
- beforeClose: done => {
|
|
|
- done();
|
|
|
- },
|
|
|
- callback: res => {
|
|
|
- res.done();
|
|
|
- this.billsCopyBillsfun(this.form.id, res.data.checkbox, res.data.billType);
|
|
|
- res.close();
|
|
|
- }
|
|
|
- });
|
|
|
+ this.$refs.copy.openDialog(this.form)
|
|
|
+ // this.$DialogForm.show({
|
|
|
+ // title: "复制单据",
|
|
|
+ // width: "300px",
|
|
|
+ // menuPosition: "right",
|
|
|
+ // data: { checkbox: "复制费用,复制箱型箱量" },
|
|
|
+ // option: {
|
|
|
+ // submitText: "确认",
|
|
|
+ // emptyText: "取消",
|
|
|
+ // span: 24,
|
|
|
+ // column: [
|
|
|
+ // {
|
|
|
+ // label: "单据类型",
|
|
|
+ // prop: "billType",
|
|
|
+ // type: "select",
|
|
|
+ // value: this.form.billType,
|
|
|
+ // dicData: [
|
|
|
+ // {
|
|
|
+ // label: "直单",
|
|
|
+ // value: "DD"
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // label: "主单",
|
|
|
+ // value: "MM"
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // label: "分单",
|
|
|
+ // value: "MH"
|
|
|
+ // }
|
|
|
+ // ],
|
|
|
+ // dataType: "string",
|
|
|
+ // span: 24
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // label: "复制类型",
|
|
|
+ // prop: "checkbox",
|
|
|
+ // type: "checkbox",
|
|
|
+ // dicData: [
|
|
|
+ // {
|
|
|
+ // label: "复制费用",
|
|
|
+ // value: "复制费用"
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // label: "复制箱型箱量",
|
|
|
+ // value: "复制箱型箱量"
|
|
|
+ // }
|
|
|
+ // ],
|
|
|
+ // dataType: "string",
|
|
|
+ // span: 24
|
|
|
+ // }
|
|
|
+ // ]
|
|
|
+ // },
|
|
|
+ // beforeClose: done => {
|
|
|
+ // done();
|
|
|
+ // },
|
|
|
+ // callback: res => {
|
|
|
+ // res.done();
|
|
|
+ // this.billsCopyBillsfun(this.form.id, res.data.checkbox, res.data.billType);
|
|
|
+ // res.close();
|
|
|
+ // }
|
|
|
+ // });
|
|
|
},
|
|
|
//文档导入
|
|
|
importData(row) {
|
|
|
@@ -1431,6 +1459,56 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
allClick(name) {
|
|
|
+ if (name == "申请修改") {
|
|
|
+ this.$DialogForm.show({
|
|
|
+ title: "修改HB/L NO",
|
|
|
+ width: "30%",
|
|
|
+ data: {
|
|
|
+ oldHblno: this.form.hblno
|
|
|
+ },
|
|
|
+ menuPosition: "right",
|
|
|
+ option: {
|
|
|
+ submitText: "确定",
|
|
|
+ emptyText: "取消",
|
|
|
+ labelWidth: 110,
|
|
|
+ column: [
|
|
|
+ {
|
|
|
+ label: "HB/L NO",
|
|
|
+ span: 24,
|
|
|
+ prop: "oldHblno",
|
|
|
+ disabled: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "NEW HB/L NO",
|
|
|
+ span: 24,
|
|
|
+ prop: "hblno",
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请输入 NEW HB/L NO",
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ },
|
|
|
+ beforeClose: done => {
|
|
|
+ done();
|
|
|
+ },
|
|
|
+ callback: res => {
|
|
|
+ res.done();
|
|
|
+ let obj = {
|
|
|
+ id: this.form.id,
|
|
|
+ hblno: res.data.hblno
|
|
|
+ };
|
|
|
+ updateHblno(obj).then(res => {
|
|
|
+ this.$message.success("操作成功");
|
|
|
+ this.billsDetailfun(this.form.id);
|
|
|
+ });
|
|
|
+ res.close();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
if (name == "物流提交") {
|
|
|
this.logisticsForm = {
|
|
|
shippingCompanyId: null
|
|
|
@@ -3133,7 +3211,7 @@ export default {
|
|
|
// 应收
|
|
|
for (let item of this.form.feeCenterListD) {
|
|
|
// 判断是否生成了账单
|
|
|
- if (item.accStatus == 1) {
|
|
|
+ if (item.accStatus == 1 && this.form.billStatus != 1) {
|
|
|
this.columnforfun("corpCnName").disabled = true;
|
|
|
// this.columnforfun('srcType').disabled = true
|
|
|
this.columnforfun("mblno").disabled = true;
|
|
|
@@ -3141,6 +3219,11 @@ export default {
|
|
|
// this.columnforfun('refno').disabled = true
|
|
|
this.generateBillsfalse = true;
|
|
|
}
|
|
|
+ // if (this.form.billStatus == 1) {
|
|
|
+ // this.columnforfun("corpCnName").disabled = false;
|
|
|
+ // this.columnforfun("mblno").disabled = false;
|
|
|
+ // this.columnforfun("bookingNo").disabled = false;
|
|
|
+ // }
|
|
|
if (item.curCode == this.getLocalCurrency()) {
|
|
|
this.$set(item, "rmbAmount", item.amount);
|
|
|
this.$set(item, "usdAmount", "");
|
|
|
@@ -3158,7 +3241,7 @@ export default {
|
|
|
// 应付
|
|
|
for (let item of this.form.feeCenterListC) {
|
|
|
// 判断是否生成了账单
|
|
|
- if (item.accStatus == 1) {
|
|
|
+ if (item.accStatus == 1 && this.form.billStatus != 1) {
|
|
|
this.generateBillsfalse = true;
|
|
|
this.columnforfun("corpCnName").disabled = true;
|
|
|
// this.columnforfun('srcType').disabled = true
|
|
|
@@ -3166,6 +3249,11 @@ export default {
|
|
|
this.columnforfun("bookingNo").disabled = true;
|
|
|
// this.columnforfun('refno').disabled = true
|
|
|
}
|
|
|
+ // if (this.form.billStatus == 1) {
|
|
|
+ // this.columnforfun("corpCnName").disabled = false;
|
|
|
+ // this.columnforfun("mblno").disabled = false;
|
|
|
+ // this.columnforfun("bookingNo").disabled = false;
|
|
|
+ // }
|
|
|
if (item.curCode == this.getLocalCurrency()) {
|
|
|
this.$set(item, "rmbAmount", item.amount);
|
|
|
this.$set(item, "usdAmount", "");
|
|
|
@@ -3228,7 +3316,7 @@ export default {
|
|
|
if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
|
|
|
this.detailData.seeDisabled = true;
|
|
|
} else {
|
|
|
- if (this.isCutOffDate && this.form.cyTrailerTime&&this.form.boxBelongsTo=='SOC') {
|
|
|
+ if (this.isCutOffDate && this.form.cyTrailerTime && this.form.boxBelongsTo == "SOC") {
|
|
|
const cutOffDate = new Date(this.form.cyTrailerTime);
|
|
|
const newDate = new Date(dateFormat(new Date(), "yyyy-MM-dd"));
|
|
|
if (newDate > cutOffDate) {
|
|
|
@@ -3245,7 +3333,7 @@ export default {
|
|
|
|
|
|
// this.columnforfun('operatorName').disabled = true
|
|
|
// this.columnforfun('accDeptName').disabled = true
|
|
|
- if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
|
|
|
+ if ((this.form.status == 1 || this.form.status == 2 || this.form.status == 3) && this.form.billStatus != 1) {
|
|
|
this.columnforfun("corpCnName").disabled = true;
|
|
|
// this.columnforfun('srcType').disabled = true
|
|
|
this.columnforfun("mblno").disabled = true;
|
|
|
@@ -3285,7 +3373,7 @@ export default {
|
|
|
// 应收
|
|
|
for (let item of this.form.feeCenterListD) {
|
|
|
// 判断是否生成了账单
|
|
|
- if (item.accStatus == 1) {
|
|
|
+ if (item.accStatus == 1 && this.form.billStatus != 1) {
|
|
|
this.generateBillsfalse = true;
|
|
|
this.columnforfun("corpCnName").disabled = true;
|
|
|
// this.columnforfun('srcType').disabled = true
|
|
|
@@ -3293,6 +3381,11 @@ export default {
|
|
|
this.columnforfun("bookingNo").disabled = true;
|
|
|
// this.columnforfun('refno').disabled = true
|
|
|
}
|
|
|
+ // if (this.form.billStatus == 1) {
|
|
|
+ // this.columnforfun("corpCnName").disabled = false;
|
|
|
+ // this.columnforfun("mblno").disabled = false;
|
|
|
+ // this.columnforfun("bookingNo").disabled = false;
|
|
|
+ // }
|
|
|
if (item.curCode == this.getLocalCurrency()) {
|
|
|
this.$set(item, "rmbAmount", item.amount);
|
|
|
this.$set(item, "usdAmount", "");
|
|
|
@@ -3309,7 +3402,7 @@ export default {
|
|
|
// 应付
|
|
|
for (let item of this.form.feeCenterListC) {
|
|
|
// 判断是否生成了账单
|
|
|
- if (item.accStatus == 1) {
|
|
|
+ if (item.accStatus == 1 && this.form.billStatus != 1) {
|
|
|
this.generateBillsfalse = true;
|
|
|
this.columnforfun("corpCnName").disabled = true;
|
|
|
// this.columnforfun('srcType').disabled = true
|
|
|
@@ -3317,6 +3410,11 @@ export default {
|
|
|
this.columnforfun("bookingNo").disabled = true;
|
|
|
// this.columnforfun('refno').disabled = true
|
|
|
}
|
|
|
+ // if (this.form.billStatus == 1) {
|
|
|
+ // this.columnforfun("corpCnName").disabled = false;
|
|
|
+ // this.columnforfun("mblno").disabled = false;
|
|
|
+ // this.columnforfun("bookingNo").disabled = false;
|
|
|
+ // }
|
|
|
if (item.curCode == this.getLocalCurrency()) {
|
|
|
this.$set(item, "rmbAmount", item.amount);
|
|
|
this.$set(item, "usdAmount", "");
|