|
@@ -22,7 +22,12 @@
|
|
|
<el-button type="info" @click="saveSell" size="small"
|
|
<el-button type="info" @click="saveSell" size="small"
|
|
|
>生成销售单</el-button
|
|
>生成销售单</el-button
|
|
|
>
|
|
>
|
|
|
- <el-button type="success" disabled size="small">
|
|
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ type="success"
|
|
|
|
|
+ :disabled="!form.id"
|
|
|
|
|
+ size="small"
|
|
|
|
|
+ @click="copyDoc"
|
|
|
|
|
+ >
|
|
|
复制单据
|
|
复制单据
|
|
|
</el-button>
|
|
</el-button>
|
|
|
<el-button
|
|
<el-button
|
|
@@ -969,6 +974,9 @@ export default {
|
|
|
cellStyle() {
|
|
cellStyle() {
|
|
|
return "padding:0;height:40px;";
|
|
return "padding:0;height:40px;";
|
|
|
},
|
|
},
|
|
|
|
|
+ copyDoc() {
|
|
|
|
|
+ this.$emit('copyOrder',this.form.id)
|
|
|
|
|
+ },
|
|
|
getCorpData(row) {
|
|
getCorpData(row) {
|
|
|
this.form.corpAttn = null;
|
|
this.form.corpAttn = null;
|
|
|
this.form.corpTel = null;
|
|
this.form.corpTel = null;
|
|
@@ -1600,6 +1608,45 @@ export default {
|
|
|
this.pageLoading = true;
|
|
this.pageLoading = true;
|
|
|
detail(id)
|
|
detail(id)
|
|
|
.then(res => {
|
|
.then(res => {
|
|
|
|
|
+ if (this.detailData.status == "copy") {
|
|
|
|
|
+ delete res.data.data.id;
|
|
|
|
|
+ delete res.data.data.sysNo;
|
|
|
|
|
+ delete res.data.data.orderNo;
|
|
|
|
|
+ delete res.data.data.orgOrderNo;
|
|
|
|
|
+ delete res.data.data.createTime;
|
|
|
|
|
+ delete res.data.data.createUser;
|
|
|
|
|
+ delete res.data.data.createUserName;
|
|
|
|
|
+ delete res.data.data.updateTime;
|
|
|
|
|
+ delete res.data.data.updateUser;
|
|
|
|
|
+ delete res.data.data.updateUserName;
|
|
|
|
|
+ delete res.data.data.morderNo;
|
|
|
|
|
+ delete res.data.data.status;
|
|
|
|
|
+ delete res.data.data.ifEnquiry;
|
|
|
|
|
+ delete res.data.data.ifShipping;
|
|
|
|
|
+ res.data.data.orderStatus = "录入";
|
|
|
|
|
+ res.data.data.orderItemsList.forEach(e => {
|
|
|
|
|
+ delete e.id;
|
|
|
|
|
+ delete e.pid;
|
|
|
|
|
+ delete e.createTime;
|
|
|
|
|
+ delete e.createUser;
|
|
|
|
|
+ delete e.updateTime;
|
|
|
|
|
+ delete e.updateUser;
|
|
|
|
|
+ delete e.orgOrderNo;
|
|
|
|
|
+ delete e.srcId;
|
|
|
|
|
+ delete e.status;
|
|
|
|
|
+ delete e.isDeleted;
|
|
|
|
|
+ });
|
|
|
|
|
+ res.data.data.orderFeesList.forEach(e => {
|
|
|
|
|
+ delete e.id;
|
|
|
|
|
+ delete e.pid;
|
|
|
|
|
+ delete e.createTime;
|
|
|
|
|
+ delete e.createUser;
|
|
|
|
|
+ delete e.updateTime;
|
|
|
|
|
+ delete e.updateUser;
|
|
|
|
|
+ delete e.status;
|
|
|
|
|
+ delete e.isDeleted;
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
this.form = res.data.data;
|
|
this.form = res.data.data;
|
|
|
this.data = res.data.data.orderItemsList;
|
|
this.data = res.data.data.orderItemsList;
|
|
|
this.orderFeesList = res.data.data.orderFeesList;
|
|
this.orderFeesList = res.data.data.orderFeesList;
|
|
@@ -1665,7 +1712,7 @@ export default {
|
|
|
return this.$message.error(`请正确输入第${i + 1}行的汇率`);
|
|
return this.$message.error(`请正确输入第${i + 1}行的汇率`);
|
|
|
}
|
|
}
|
|
|
if (orderFeesList[i].feesType == 1) {
|
|
if (orderFeesList[i].feesType == 1) {
|
|
|
- reSum=_.add(
|
|
|
|
|
|
|
+ reSum = _.add(
|
|
|
reSum,
|
|
reSum,
|
|
|
_.multiply(
|
|
_.multiply(
|
|
|
numCal(orderFeesList[i].amount),
|
|
numCal(orderFeesList[i].amount),
|
|
@@ -1673,8 +1720,8 @@ export default {
|
|
|
)
|
|
)
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
- if (orderFeesList[i].feesType == 2) {
|
|
|
|
|
- paySum=_.add(
|
|
|
|
|
|
|
+ if (orderFeesList[i].feesType == 2) {
|
|
|
|
|
+ paySum = _.add(
|
|
|
paySum,
|
|
paySum,
|
|
|
_.multiply(
|
|
_.multiply(
|
|
|
numCal(orderFeesList[i].amount),
|
|
numCal(orderFeesList[i].amount),
|
|
@@ -1683,7 +1730,12 @@ export default {
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- this.form.singleTicketMargin=STGPCal(amountSum,reSum,costSum,paySum)
|
|
|
|
|
|
|
+ this.form.singleTicketMargin = STGPCal(
|
|
|
|
|
+ amountSum,
|
|
|
|
|
+ reSum,
|
|
|
|
|
+ costSum,
|
|
|
|
|
+ paySum
|
|
|
|
|
+ );
|
|
|
this.subLoading = true;
|
|
this.subLoading = true;
|
|
|
submit({
|
|
submit({
|
|
|
...this.form,
|
|
...this.form,
|
|
@@ -1718,6 +1770,7 @@ export default {
|
|
|
//返回列表
|
|
//返回列表
|
|
|
backToList() {
|
|
backToList() {
|
|
|
let orderFeesList = this.$refs.feeInfo.submitData();
|
|
let orderFeesList = this.$refs.feeInfo.submitData();
|
|
|
|
|
+ console.log(orderFeesList, this.oldorderFeesList);
|
|
|
if (
|
|
if (
|
|
|
contrastObj(this.form, this.oldform) ||
|
|
contrastObj(this.form, this.oldform) ||
|
|
|
contrastList(this.data, this.olddata) ||
|
|
contrastList(this.data, this.olddata) ||
|