|
@@ -172,7 +172,7 @@
|
|
|
placeholder="请选择"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item in tableOptionser"
|
|
|
+ v-for="item in tableOptionse"
|
|
|
:key="item.v ? item.v : item.planDepartureApt"
|
|
|
:label="item.k ? item.k : item.planDepartureApt"
|
|
|
:value="item.v ? item.v : item.planDepartureApt"
|
|
@@ -204,7 +204,11 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="字段排序" size="default">
|
|
|
- <el-select
|
|
|
+ <el-input
|
|
|
+ v-model="tableForm.orderNumber"
|
|
|
+ placeholder="请输入字段排序"
|
|
|
+ />
|
|
|
+ <!-- <el-select
|
|
|
style="width: 100%"
|
|
|
v-model="tableForm.orderNumber"
|
|
|
class="input-shadow"
|
|
@@ -220,7 +224,7 @@
|
|
|
:value="item.v ? item.v : item.planDepartureApt"
|
|
|
>
|
|
|
</el-option>
|
|
|
- </el-select>
|
|
|
+ </el-select> -->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -259,6 +263,7 @@ const tableOptionser = ref<Array>([
|
|
|
v: "0",
|
|
|
},
|
|
|
]); //弹窗下拉
|
|
|
+const tableOptionse = ref<Array>([]);
|
|
|
const tableForm = reactive({
|
|
|
queryTemplateColumnSetID: "",
|
|
|
queryTemplateID: route.query.queryTemplateID,
|
|
@@ -420,6 +425,14 @@ const getQuery = async () => {
|
|
|
}
|
|
|
tableData.value.push(...returnData.listValues);
|
|
|
tableCols.value = returnData.columnSet;
|
|
|
+ returnData.columnSet.forEach((item) => {
|
|
|
+ if (
|
|
|
+ item.listqueryTemplateID &&
|
|
|
+ item.columnName === "listqueryTemplateID"
|
|
|
+ ) {
|
|
|
+ getSelectData(item.listqueryTemplateID);
|
|
|
+ }
|
|
|
+ });
|
|
|
tableCols.value.forEach((element) => {
|
|
|
element.label = element.columnLabel;
|
|
|
element.key = element.columnName;
|
|
@@ -435,6 +448,18 @@ const getQuery = async () => {
|
|
|
page.value--;
|
|
|
}
|
|
|
};
|
|
|
+//获取弹框-下拉数据
|
|
|
+const getSelectData = async (id, name) => {
|
|
|
+ const { code, returnData } = await Query({
|
|
|
+ id,
|
|
|
+ dataContent: name ? [name] : name === null ? [null] : [],
|
|
|
+ });
|
|
|
+ if (code == 0) {
|
|
|
+ tableOptionse.value = returnData.listValues;
|
|
|
+ } else {
|
|
|
+ tableOptionse.value = [];
|
|
|
+ }
|
|
|
+};
|
|
|
//确认提交
|
|
|
const queryTemplateColumnForm: any = ref(null);
|
|
|
const submitForm = () => {
|