|
@@ -68,7 +68,7 @@
|
|
|
placeholder="请选择"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item in tableOptionser"
|
|
|
+ v-for="item in tableOptioner"
|
|
|
:key="item.v ? item.v : item.planDepartureApt"
|
|
|
:label="item.k ? item.k : item.planDepartureApt"
|
|
|
:value="item.v ? item.v : item.planDepartureApt"
|
|
@@ -266,6 +266,7 @@ const tableOptionser = ref<Array>([
|
|
|
},
|
|
|
]); //弹窗下拉
|
|
|
const tableOption = ref<Array>([]); //弹窗下拉
|
|
|
+const tableOptioner = ref<Array>([]); //弹窗下拉
|
|
|
const tableForm = reactive({
|
|
|
ItemID: "",
|
|
|
dataStructureID: route.query.dataStructureID,
|
|
@@ -385,6 +386,18 @@ const delRemove = () => {
|
|
|
const delRest = () => {
|
|
|
flag.value = false;
|
|
|
};
|
|
|
+//获取弹框-下拉数据
|
|
|
+const getSelectData = async (id, name) => {
|
|
|
+ const { code, returnData } = await Query({
|
|
|
+ id,
|
|
|
+ dataContent: name ? [name] : name === null ? [null] : [],
|
|
|
+ });
|
|
|
+ if (code == 0) {
|
|
|
+ return returnData.listValues;
|
|
|
+ } else {
|
|
|
+ return [];
|
|
|
+ }
|
|
|
+};
|
|
|
//获取表格数据
|
|
|
const getQuery = async () => {
|
|
|
try {
|
|
@@ -406,6 +419,13 @@ const getQuery = async () => {
|
|
|
}
|
|
|
tableData.value.push(...returnData.listValues);
|
|
|
tableCols.value = returnData.columnSet;
|
|
|
+ returnData.columnSet.forEach((item) => {
|
|
|
+ if (item.listqueryTemplateID && item.columnName === "dataSourceName") {
|
|
|
+ tableOption.value = getSelectData(item.listqueryTemplateID);
|
|
|
+ } else if (item.listqueryTemplateID && item.columnName === "dataType") {
|
|
|
+ tableOptioner.value = getSelectData(item.listqueryTemplateID);
|
|
|
+ }
|
|
|
+ });
|
|
|
tableCols.value.forEach((element) => {
|
|
|
element.label = element.columnLabel;
|
|
|
element.key = element.columnName;
|