|
|
@@ -323,7 +323,13 @@
|
|
|
v-for="item in tableOptions[item.columnName]"
|
|
|
:key="item.v ? item.v : item.planDepartureApt"
|
|
|
:label="item.k ? item.k : item.planDepartureApt"
|
|
|
- :value="item.v ? item.v : item.planDepartureApt"
|
|
|
+ :value="
|
|
|
+ item.setlabel === 'positionDescribe'
|
|
|
+ ? item.k
|
|
|
+ : item.v
|
|
|
+ ? item.v
|
|
|
+ : item.planDepartureApt
|
|
|
+ "
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
@@ -801,10 +807,33 @@ export default {
|
|
|
this.rowTitle = titleColumn.columnName;
|
|
|
}
|
|
|
this.tableData.push(...returnData.listValues);
|
|
|
+ // console.log(this.tableOptions.endNode, "11111");
|
|
|
this.tableCols = returnData.columnSet;
|
|
|
this.serviceId = returnData.submitID;
|
|
|
setTimeout(() => {
|
|
|
this.initTableData();
|
|
|
+ setTimeout(() => {
|
|
|
+ this.tableData.forEach((element) => {
|
|
|
+ console.log(this.tableOptions.calculationBasis);
|
|
|
+ if (this.tableOptions.beginNode) {
|
|
|
+ this.tableOptions.beginNode.forEach((res) => {
|
|
|
+ if (res.v === element.beginNode) {
|
|
|
+ element.beginNode = res.k;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.tableOptions.endNode.forEach((res) => {
|
|
|
+ if (res.v == element.endNode) {
|
|
|
+ element.endNode = res.k;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.tableOptions.calculationBasis.forEach((res) => {
|
|
|
+ if (res.v == element.calculationBasis) {
|
|
|
+ element.calculationBasis = res.k;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }, 400);
|
|
|
this.loading = false;
|
|
|
}, 100);
|
|
|
} else {
|
|
|
@@ -864,8 +893,6 @@ export default {
|
|
|
//初始化表格
|
|
|
initTableData() {
|
|
|
this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
|
|
|
- //
|
|
|
- // debugger;
|
|
|
this.tableDataCopy = _.cloneDeep(this.tableData);
|
|
|
const datas = _.cloneDeep(this.tableColsCopy);
|
|
|
// const reqUts = [];
|
|
|
@@ -1035,43 +1062,19 @@ export default {
|
|
|
row.queryTemplateColumnSetID
|
|
|
);
|
|
|
this.tableForm = JSON.parse(JSON.stringify(data));
|
|
|
- // if (this.tableForm.beginNode) {
|
|
|
- // const datas = _.cloneDeep(this.tableColsCopy);
|
|
|
- // datas.forEach(async (item) => {
|
|
|
- // if (item.columnLabel === "开始位置") {
|
|
|
- // this.tableOptions.beginPosition = await this.getSelectData(
|
|
|
- // item.listqueryTemplateID,
|
|
|
- // this.tableForm.beginNode
|
|
|
- // );
|
|
|
- // this.asShow = false;
|
|
|
- // this.asShow = true;
|
|
|
- // }
|
|
|
- // });
|
|
|
- // }
|
|
|
- // if (this.tableForm.endNode) {
|
|
|
- // const datas = _.cloneDeep(this.tableColsCopy);
|
|
|
- // datas.forEach(async (item) => {
|
|
|
- // if (item.columnLabel === "结束位置") {
|
|
|
- // this.tableOptions.endPosition = await this.getSelectData(
|
|
|
- // item.listqueryTemplateID,
|
|
|
- // this.tableForm.endNode
|
|
|
- // );
|
|
|
- // this.asShow = false;
|
|
|
- // this.asShow = true;
|
|
|
- // }
|
|
|
- // });
|
|
|
- // }
|
|
|
- // this.tableForm =this.tableForm;
|
|
|
- // Object.entries(tableForm).forEach(([key, value]) => {
|
|
|
- // this.tableForm[key] = value
|
|
|
- // })
|
|
|
} else {
|
|
|
this.tableForm = JSON.parse(JSON.stringify(row));
|
|
|
+ console.log(this.tableOptions.beginNode, "1111111");
|
|
|
if (this.tableForm.beginNode) {
|
|
|
const datas = _.cloneDeep(this.tableColsCopy);
|
|
|
// const reqUts = [];
|
|
|
datas.forEach(async (item) => {
|
|
|
if (item.columnLabel === "开始位置") {
|
|
|
+ this.tableOptions.beginNode.forEach((element) => {
|
|
|
+ if (this.tableForm.beginNode == element.k) {
|
|
|
+ this.tableForm.beginNode = element.v;
|
|
|
+ }
|
|
|
+ });
|
|
|
this.tableOptions.beginPosition = await this.getSelectData(
|
|
|
item.listqueryTemplateID,
|
|
|
this.tableForm.beginNode
|
|
|
@@ -1086,6 +1089,11 @@ export default {
|
|
|
// const reqUts = [];
|
|
|
datas.forEach(async (item) => {
|
|
|
if (item.columnLabel === "结束位置") {
|
|
|
+ this.tableOptions.endNode.forEach((element) => {
|
|
|
+ if (this.tableForm.endNode == element.k) {
|
|
|
+ this.tableForm.endNode = element.v;
|
|
|
+ }
|
|
|
+ });
|
|
|
this.tableOptions.endPosition = await this.getSelectData(
|
|
|
item.listqueryTemplateID,
|
|
|
this.tableForm.endNode
|
|
|
@@ -1095,6 +1103,13 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+ if (this.tableOptions.calculationBasis) {
|
|
|
+ this.tableOptions.calculationBasis.forEach((res) => {
|
|
|
+ if (res.k == element.calculationBasis) {
|
|
|
+ this.tableForm.calculationBasis = res.v;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
this.flag = true;
|
|
|
this.tableType = "edit";
|
