diff --git a/src/api/order/index.ts b/src/api/order/index.ts index 95b5e10..2f1317c 100644 --- a/src/api/order/index.ts +++ b/src/api/order/index.ts @@ -3,7 +3,9 @@ import { ModifyOrderForm, OrderInfoServicePageResult, OrderInfoVO, - OrderPageResult + OrderPageResult, + OrderServicePageResult, + OrderServiceVO, } from "@/api/order/types"; import request from "@/utils/request"; @@ -57,3 +59,27 @@ export function ModifyForm(data: ModifyOrderForm) { data, }); } +export function orderServiceVOPage( + orderId: number, + service: string, + data: PageQuery +): AxiosPromise { + return request({ + url: `/api/order-service/v1/order-service-parameter/${orderId}/${service}`, + method: "POST", + data, + }); +} + +export function updateOrderServiceParameter( + orderId: number, + service: string, + serviceFlag: string, + data: OrderServiceVO[] +) { + return request({ + url: `/api/order-service/v1/service-parameter-update/${orderId}/${service}/${serviceFlag}`, + method: "POST", + data, + }); +} diff --git a/src/api/order/types.ts b/src/api/order/types.ts index a17bfb9..26a9e4a 100644 --- a/src/api/order/types.ts +++ b/src/api/order/types.ts @@ -84,3 +84,16 @@ export interface ModifyOrderForm { orderCustomerKind?: string; } + +export interface OrderServiceVO { + orderId?: number; + + service?: string; + + argsName?: string; + + argsValueNew?: string; + + argsValueOld?: string; +} +export type OrderServicePageResult = PageResult; diff --git a/src/views/family/operate/order/components/ModifyOrder.vue b/src/views/family/operate/order/components/ModifyOrder.vue index 9216984..1c782f3 100644 --- a/src/views/family/operate/order/components/ModifyOrder.vue +++ b/src/views/family/operate/order/components/ModifyOrder.vue @@ -107,7 +107,16 @@
- + + +
+ @@ -136,9 +149,11 @@ import { } from "@/api/order"; import { InfoFilled } from "@element-plus/icons-vue"; import { FormInstance, FormRules } from "element-plus"; +import ModifyServiceParameter from "@/views/family/operate/order/components/ModifyServiceParameter.vue"; const loading = ref(false); const route = useRoute(); const ruleFormRef = ref(); +const modifyServiceRef = ref(); const formData = ref({}); let orderId: number = parseInt(route.params.orderId); const queryPage = ref({ @@ -188,6 +203,9 @@ const submitForm = async (formEl: FormInstance | undefined) => { } }); }; +const openServiceParameter = (row: OrderInfoServiceVO) => { + modifyServiceRef.value.openModify(row.orderId, row.service, row.serviceFlag); +}; onMounted(() => { loadModifyForm(); getOrderInfoServiceList(); diff --git a/src/views/family/operate/order/components/ModifyServiceParameter.vue b/src/views/family/operate/order/components/ModifyServiceParameter.vue new file mode 100644 index 0000000..ae29f03 --- /dev/null +++ b/src/views/family/operate/order/components/ModifyServiceParameter.vue @@ -0,0 +1,183 @@ + + + + + diff --git a/src/views/family/operate/order/components/OrderInfoEdit.vue b/src/views/family/operate/order/components/OrderInfoEdit.vue index 3a3af1b..7522cb0 100644 --- a/src/views/family/operate/order/components/OrderInfoEdit.vue +++ b/src/views/family/operate/order/components/OrderInfoEdit.vue @@ -307,7 +307,16 @@
- + + + +
@@ -337,6 +347,7 @@ import { updateOrderStatus, } from "@/api/order"; import { InfoFilled } from "@element-plus/icons-vue"; +import OrderServiceParameterTable from "@/views/family/operate/order/components/OrderServiceParameterTable.vue"; const route = useRoute(); const router = useRouter(); @@ -350,6 +361,7 @@ const queryPage = ref({ }); const total = ref(0); const orderServiceList = ref([]); +const serviceParameterRef = ref(); const getData = () => { loading.value = true; findOrderInfoById(orderId) @@ -393,6 +405,9 @@ const execute = () => { const skipModifyOrder = () => { router.push({ path: `/resources/modify-order/${orderId}` }); }; +const openServiceList = (service: string) => { + serviceParameterRef.value.openParameter(orderId, service); +}; onMounted(() => { getData(); getOrderInfoServiceList(); diff --git a/src/views/family/operate/order/components/OrderServiceParameterTable.vue b/src/views/family/operate/order/components/OrderServiceParameterTable.vue new file mode 100644 index 0000000..2090466 --- /dev/null +++ b/src/views/family/operate/order/components/OrderServiceParameterTable.vue @@ -0,0 +1,69 @@ + + + + +