update order 订单详情tag

This commit is contained in:
lb 2023-07-31 15:14:54 +08:00
parent 03f65dd6c2
commit 7a21e908a4
4 changed files with 673 additions and 317 deletions

View File

@ -5,8 +5,7 @@
:fullscreen="fullscreen" :fullscreen="fullscreen"
:visible="visible" :visible="visible"
@close="handleClose" @close="handleClose"
:destroy-on-close="false" @closed="$emit('destroy')">
:close-on-click-modal="configs.clickModalToClose ?? false">
<div slot="title" style="background: #eee; padding: 8px; text-align: center; border-bottom: 1px solid #ccc"> <div slot="title" style="background: #eee; padding: 8px; text-align: center; border-bottom: 1px solid #ccc">
<el-checkbox-group v-model="activeTab" @change="handleTabClick"> <el-checkbox-group v-model="activeTab" @change="handleTabClick">
<el-checkbox-button :true-label="1">子订单进度</el-checkbox-button> <el-checkbox-button :true-label="1">子订单进度</el-checkbox-button>
@ -102,10 +101,6 @@ export default {
handleClose() { handleClose() {
this.visible = false; this.visible = false;
setTimeout(() => {
this.$emit("destroy-dialog");
}, 200);
}, },
}, },
}; };

View File

@ -40,6 +40,14 @@
@destroy="renderDialog = false" @destroy="renderDialog = false"
@refreshDataList="getAList(Object.assign({}, listQuery, extraSearchConditions, params))" /> @refreshDataList="getAList(Object.assign({}, listQuery, extraSearchConditions, params))" />
<DialogWithMenu
modal-append-to-body
ref="menu-dialog"
v-if="renderMenuDialog"
fullscreen
@destroy="renderMenuDialog = false"
@refreshDataList="getAList(Object.assign({}, listQuery, extraSearchConditions, params))" />
<DialogUpload <DialogUpload
ref="uploadDialog" ref="uploadDialog"
v-if="uploadDialogVisible" v-if="uploadDialogVisible"
@ -63,11 +71,12 @@ import DialogUpload from "@/components/DialogUpload.vue";
import moment from "moment"; import moment from "moment";
import Overlay from "@/components/Overlay.vue"; import Overlay from "@/components/Overlay.vue";
import OrderEditDialog from "./order--edit.vue"; import OrderEditDialog from "./order--edit.vue";
import DialogWithMenu from "./DialogWithMenu.vue";
// const dictList = JSON.parse(localStorage.getItem("dictList")); // const dictList = JSON.parse(localStorage.getItem("dictList"));
export default { export default {
name: "ListSectionWithHead", name: "ListSectionWithHead",
components: { OrderEditDialog, BaseSearchForm, BaseListTable, DialogJustForm, DialogUpload, Overlay }, components: { OrderEditDialog, BaseSearchForm, DialogWithMenu, BaseListTable, DialogJustForm, DialogUpload, Overlay },
props: { props: {
headConfig: { headConfig: {
type: Object, type: Object,
@ -76,6 +85,10 @@ export default {
form: null, form: null,
}), }),
}, },
dialogConfig: {
type: Object,
default: null,
},
tableConfig: { tableConfig: {
type: Object, type: Object,
default: () => ({ default: () => ({

View File

@ -505,7 +505,7 @@
<script> <script>
import { pick as __pick } from "@/utils/filters"; import { pick as __pick } from "@/utils/filters";
import moment from "moment"; // import moment from "moment";
import InputsArea from "./InputsArea.vue"; import InputsArea from "./InputsArea.vue";
export default { export default {
@ -766,8 +766,6 @@ export default {
await this.prepareSelectOptions(); await this.prepareSelectOptions();
if (this.$refs.dataForm) { if (this.$refs.dataForm) {
// console.log("[DialogJustForm] clearing form validation...");
// dialog dataForm [0]
this.$refs.dataForm.clearValidate(); this.$refs.dataForm.clearValidate();
} }

File diff suppressed because it is too large Load Diff