|
@@ -190,6 +190,7 @@
|
|
|
@row-del="rowDel"
|
|
|
@selection-change="goodsSelectionChange"
|
|
|
@saveColumn="saveColumn"
|
|
|
+ @resetColumn="resetColumn"
|
|
|
:summary-method="summaryMethod"
|
|
|
:cell-style="cellStyle"
|
|
|
>
|
|
@@ -218,14 +219,21 @@
|
|
|
</span>
|
|
|
<span v-else> {{ row.cname }}</span>
|
|
|
</template>
|
|
|
- <template slot="partsList" slot-scope="{ row, index }">
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="text"
|
|
|
- @click="partrePick(row, index)"
|
|
|
- :disabled="disabled"
|
|
|
- >操作</el-button
|
|
|
- >
|
|
|
+ <template slot="partsDescribe" slot-scope="{ row, index }">
|
|
|
+ <span v-if="row.$cellEdit" style="display:flex">
|
|
|
+ <el-input
|
|
|
+ v-model="row.partsDescribe"
|
|
|
+ :readonly="true"
|
|
|
+ size="small"
|
|
|
+ placeholder="请点击右边按钮"
|
|
|
+ ></el-input>
|
|
|
+ <el-button
|
|
|
+ icon="el-icon-edit"
|
|
|
+ size="mini"
|
|
|
+ @click="partrePick(row, index)"
|
|
|
+ ></el-button>
|
|
|
+ </span>
|
|
|
+ <span v-else>{{ row.partsDescribe }}</span>
|
|
|
</template>
|
|
|
<template slot="itemType" slot-scope="{ row }">
|
|
|
<el-select
|
|
@@ -565,6 +573,7 @@ export default {
|
|
|
name: "detailsPageEdit",
|
|
|
data() {
|
|
|
return {
|
|
|
+ oldExchange: null,
|
|
|
treeStyle: "height:" + (window.innerHeight - 315) + "px",
|
|
|
configuration: {
|
|
|
multipleChoices: false,
|
|
@@ -992,6 +1001,7 @@ export default {
|
|
|
if (e.dictValue == "USD") {
|
|
|
this.form.exchangeRate = e.remark;
|
|
|
this.oldform.exchangeRate = e.remark;
|
|
|
+ this.oldExchange = e.remark;
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -1226,7 +1236,7 @@ export default {
|
|
|
this.data.forEach(e => {
|
|
|
e.freight = transformCal(e.freight, this.oldExchange, row);
|
|
|
e.insurance = transformCal(e.insurance, this.oldExchange, row);
|
|
|
- e.price = sellingCal(e.productPrice, row);
|
|
|
+ e.price = sellingCal(e.productPrice, row);
|
|
|
e.amount = amountCal(
|
|
|
e.price,
|
|
|
e.orderQuantity,
|
|
@@ -1445,6 +1455,7 @@ export default {
|
|
|
this.olddata = this.deepClone(res.data.data.orderItemsList);
|
|
|
this.oldorderFeesList = this.deepClone(res.data.data.orderFeesList);
|
|
|
this.oldorderFilesList = this.deepClone(res.data.data.orderFilesList);
|
|
|
+ this.oldExchange = this.deepClone(this.form.exchangeRate);
|
|
|
})
|
|
|
.finally(() => {
|
|
|
this.showBut = true;
|
|
@@ -1497,6 +1508,7 @@ export default {
|
|
|
this.oldorderFilesList = this.deepClone(
|
|
|
res.data.data.orderFilesList
|
|
|
);
|
|
|
+ this.oldExchange = this.deepClone(this.form.exchangeRate);
|
|
|
if (status == "goBack") {
|
|
|
this.$emit("goBack");
|
|
|
}
|
|
@@ -1610,6 +1622,18 @@ export default {
|
|
|
this.$refs.crud.$refs.dialogColumn.columnBox = false;
|
|
|
}
|
|
|
},
|
|
|
+ async resetColumn() {
|
|
|
+ const inSave = await this.delColumnData(
|
|
|
+ this.getColumnName(5),
|
|
|
+ tableOption
|
|
|
+ );
|
|
|
+ if (inSave) {
|
|
|
+ this.$message.success("重置成功");
|
|
|
+ this.tableOption = tableOption;
|
|
|
+ //关闭窗口
|
|
|
+ this.$refs.crud.$refs.dialogColumn.columnBox = false;
|
|
|
+ }
|
|
|
+ },
|
|
|
summaryMethod({ columns, data }) {
|
|
|
const sums = [];
|
|
|
if (columns.length > 0) {
|