diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 7fc5dd1..f78267d 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -51,7 +51,8 @@ export default defineComponent({ // 表单label宽度 labelWidth: propTypes.oneOfType([String, Number]).def('auto'), // 是否 loading 数据中 add by 芋艿 - vLoading: propTypes.bool.def(false) + vLoading: propTypes.bool.def(false), + inlineBlock: propTypes.bool.def(false) }, emits: ['register'], setup(props, { slots, expose, emit }) { @@ -289,6 +290,7 @@ export default defineComponent({ model={props.isCustom ? props.model : formModel} class={prefixCls} v-loading={props.vLoading} + style={props.inlineBlock ? 'display: inline' : ''} > {{ // 如果需要自定义,就什么都不渲染,而是提供默认插槽 diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index a9f2ebc..c60109b 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -38,6 +38,7 @@ const props = defineProps({ // 伸缩的界限字段 expandField: propTypes.string.def(''), inline: propTypes.bool.def(true), + inlineBlock: propTypes.bool.def(false), model: { type: Object as PropType, default: () => ({}) @@ -154,6 +155,7 @@ initSearch()
审核 @@ -107,6 +111,7 @@ :total="total" @pagination="getList" /> + @@ -115,6 +120,10 @@ import * as AfterSaleApi from '@/api/clue/afterSale' import { getSimpleUserList as getUserOption } from '@/api/system/user' import { useUserStore } from '@/store/modules/user' +import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue' + +const afterSaleAuditDialog = ref() + const userStore = useUserStore() const message = useMessage() // 消息弹窗 @@ -168,8 +177,8 @@ async function getList() { } } -function batchAudit() { - console.log(123) +function batchAudit(row) { + afterSaleAuditDialog.value.open(row) } function handleDetail(id) { @@ -188,8 +197,8 @@ async function handleCancel(id) { console.log(err) } } -function handleAudit(id) { - console.log(id) +function handleAudit(row) { + afterSaleAuditDialog.value.open(row) } function getOptions() { diff --git a/src/views/Clue/Order/Comp/DialogAfterSale.vue b/src/views/Clue/Order/Comp/DialogAfterSale.vue index c8f1081..d943a54 100644 --- a/src/views/Clue/Order/Comp/DialogAfterSale.vue +++ b/src/views/Clue/Order/Comp/DialogAfterSale.vue @@ -14,8 +14,8 @@ 新增售后 - - + + + + + + + + 通过 + 驳回 + + + + + + + + + + diff --git a/src/views/Clue/Order/Comp/DialogFeebackAudit.vue b/src/views/Clue/Order/Comp/DialogFeebackAudit.vue new file mode 100644 index 0000000..e2ec956 --- /dev/null +++ b/src/views/Clue/Order/Comp/DialogFeebackAudit.vue @@ -0,0 +1,125 @@ + + diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue index 36c2771..64420b8 100644 --- a/src/views/Clue/Order/Comp/OrderList.vue +++ b/src/views/Clue/Order/Comp/OrderList.vue @@ -2,9 +2,15 @@
- + - + @@ -113,9 +119,13 @@ import * as FeebackApi from '@/api/clue/payment' import { getSimpleUserList as getUserOption } from '@/api/system/user' import { useUserStore } from '@/store/modules/user' +import DialogFeebackAudit from './DialogFeebackAudit.vue' + const userStore = useUserStore() const message = useMessage() // 消息弹窗 +const feebackDialog = ref() + const currentUserId = userStore.getUser.id const searchForm = ref({ @@ -186,8 +196,8 @@ async function handleCancel(id) { console.log(err) } } -function handleAudit(id) { - console.log(id) +function handleAudit(row) { + feebackDialog.value.open(row) } function getOptions() {