From 1e65e680519a32480219e1866baa245df1a8fd17 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 16:19:36 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-admin/src/components/orderLog/edit.vue | 374 ++++++++++++++++++++++++++--------------------------
1 files changed, 187 insertions(+), 187 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderLog/edit.vue b/zy-asrs-admin/src/components/orderLog/edit.vue
index 7700b22..b7ff902 100644
--- a/zy-asrs-admin/src/components/orderLog/edit.vue
+++ b/zy-asrs-admin/src/components/orderLog/edit.vue
@@ -1,187 +1,187 @@
-<script setup>
-import { ref, nextTick, watch, defineProps } from 'vue';
-import { get, post, postBlob, postForm } from '@/utils/request.js'
-import { formatMessage } from '@/utils/localeUtils.js';
-import { message } from 'ant-design-vue';
-import OrderDetlComponent from '@/components/orderDetl/edit.vue';
-
-const formTable = ref(null);
-const submitButton = ref(null);
-const isSave = ref(true);
-const open = ref(false);
-const initFormData = {}
-let formData = ref(initFormData);
-const orderDetlChild = ref(null);
-
-const props = defineProps({
- ioModel: 1
-})
-
-const emit = defineEmits(['tableReload'])
-
-watch(open, async (newVal, oldVal) => {
- if (newVal) {
- await nextTick();// await dom update
- orderDetlChild.value.orderId = formData.value.id;
- }
-})
-
-const handleOk = (e) => {
- nextTick(() => {
- setTimeout(() => {
- submitButton.value.$el.click();
- }, 100);
- });
-};
-
-const onFinish = values => {
- // console.log('Success:', values);
- open.value = false;
-
- let param = {
- orderNo: formData.value.orderNo,
- orderType: formData.value.orderType,
- orderSettle: formData.value.orderSettle,
- list: orderDetlChild.value.tableData
- }
-
- if (!isSave.value) {
- param.deleteDetlId = orderDetlChild.value.deleteDetlId;
- param.orderId = formData.value.id;
- }
-
- post(isSave.value ? '/api/orderLog/save' : '/api/orderLog/update', param).then((resp) => {
- let result = resp.data;
- if (result.code === 200) {
- message.success(isSave.value ? formatMessage('page.add.success', '鏂板鎴愬姛') : formatMessage('page.update.success', '鏇存柊鎴愬姛'));
- } else {
- message.error(result.msg);
- }
- emit('tableReload', 'reload')
- nextTick(() => {
- formTable.value.resetFields()
- })
- })
-};
-const onFinishFailed = errorInfo => {
- console.log('Failed:', errorInfo);
-};
-
-const orderTypeQueryList = ref(null);
-orderTypeQuery();
-function orderTypeQuery() {
- postForm('/api/orderType/query', {
- type: props.ioModel
- }).then(resp => {
- let result = resp.data;
- orderTypeQueryList.value = result.data;
- })
-}
-const orderSettleQueryList = ref(null);
-orderSettleQuery();
-function orderSettleQuery() {
- postForm('/api/orderSettle/query', {}).then(resp => {
- let result = resp.data;
- orderSettleQueryList.value = result.data;
- })
-}
-const userQueryList = ref(null);
-userQuery();
-function userQuery() {
- postForm('/api/user/query', {}).then(resp => {
- let result = resp.data;
- userQueryList.value = result.data;
- })
-}
-
-defineExpose({
- open,
- formData,
- initFormData,
- isSave,
-})
-
-</script>
-
-<script>
-export default {
- name: '璁㈠崟-edit'
-}
-</script>
-
-<template>
- <div>
- <a-modal v-model:open="open"
- :title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
- style="width: 70%;">
- <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 2 }"
- :wrapper-col="{ span: 21 }" autocomplete="off" @finish="onFinish" @finishFailed="onFinishFailed">
- <a-form-item :label="formatMessage('db.man_order.order_no', '璁㈠崟缂栧彿')" name="orderNo">
- <a-input v-model:value="formData.orderNo" />
- </a-form-item>
- <!-- <a-form-item :label="formatMessage('db.man_order.order_time', '鍗曟嵁鏃ユ湡')" name="orderTime"
- style="width: 250px;">
- <a-input v-model:value="formData.orderTime" />
- </a-form-item> -->
- <a-form-item :label="formatMessage('db.man_order.order_type', '鍗曟嵁绫诲瀷')" name="orderType">
- <a-select v-model:value="formData.orderType" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
- style="width: 100%" show-search :options="orderTypeQueryList" optionFilterProp="label"
- optionLabelProp="label">
- </a-select>
- </a-form-item>
- <a-form-item :label="formatMessage('db.man_order.order_settle', '鍗曟嵁鐘舵��')" name="orderSettle">
- <a-select v-model:value="formData.orderSettle" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
- style="width: 100%" show-search :options="orderSettleQueryList" optionFilterProp="label"
- optionLabelProp="label">
- </a-select>
- </a-form-item>
- <!-- <a-form-item :label="formatMessage('db.man_order.status', '鐘舵��')" name="status" >
- <a-select v-model:value="formData.status" :options="[
- { label: '姝ｅ父', value: 1 },
- { label: '绂佺敤', value: 0 },
- ]">
- </a-select>
- </a-form-item> -->
- <!-- <a-form-item :label="formatMessage('db.man_order.create_time', '娣诲姞鏃堕棿')" name="createTime"
- style="width: 250px;">
- <a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss" />
- </a-form-item>
- <a-form-item :label="formatMessage('db.man_order.create_by', '娣诲姞浜哄憳')" name="createBy"
- style="width: 250px;">
- <a-select v-model:value="formData.createBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
- style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
- optionLabelProp="label">
- </a-select>
- </a-form-item>
- <a-form-item :label="formatMessage('db.man_order.update_time', '淇敼鏃堕棿')" name="updateTime"
- style="width: 250px;">
- <a-date-picker v-model:value="formData.updateTime" show-time format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss" />
- </a-form-item>
- <a-form-item :label="formatMessage('db.man_order.update_by', '淇敼浜哄憳')" name="updateBy"
- style="width: 250px;">
- <a-select v-model:value="formData.updateBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
- style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
- optionLabelProp="label">
- </a-select>
- </a-form-item> -->
- <!-- <a-form-item :label="formatMessage('db.man_order.memo', '澶囨敞')" name="memo" style="width: 250px;">
- <a-input v-model:value="formData.memo" />
- </a-form-item> -->
-
- <a-form-item :label="formatMessage('db.man_order.update_time', '璁㈠崟鏄庣粏')" name="orderDetl">
- <OrderDetlComponent ref="orderDetlChild" />
- </a-form-item>
-
- <a-form-item>
- <a-button type="primary" html-type="submit" ref="submitButton"
- style="visibility: hidden;">Submit</a-button>
- </a-form-item>
- </a-form>
-
- </a-modal>
- </div>
-</template>
-
-<style></style>
+<script setup>
+import { ref, nextTick, watch, defineProps } from 'vue';
+import { get, post, postBlob, postForm } from '@/utils/request.js'
+import { formatMessage } from '@/utils/localeUtils.js';
+import { message } from 'ant-design-vue';
+import OrderDetlComponent from '@/components/orderDetl/edit.vue';
+
+const formTable = ref(null);
+const submitButton = ref(null);
+const isSave = ref(true);
+const open = ref(false);
+const initFormData = {}
+let formData = ref(initFormData);
+const orderDetlChild = ref(null);
+
+const props = defineProps({
+ ioModel: 1
+})
+
+const emit = defineEmits(['tableReload'])
+
+watch(open, async (newVal, oldVal) => {
+ if (newVal) {
+ await nextTick();// await dom update
+ orderDetlChild.value.orderId = formData.value.id;
+ }
+})
+
+const handleOk = (e) => {
+ nextTick(() => {
+ setTimeout(() => {
+ submitButton.value.$el.click();
+ }, 100);
+ });
+};
+
+const onFinish = values => {
+ // console.log('Success:', values);
+ open.value = false;
+
+ let param = {
+ orderNo: formData.value.orderNo,
+ orderType: formData.value.orderType,
+ orderSettle: formData.value.orderSettle,
+ list: orderDetlChild.value.tableData
+ }
+
+ if (!isSave.value) {
+ param.deleteDetlId = orderDetlChild.value.deleteDetlId;
+ param.orderId = formData.value.id;
+ }
+
+ post(isSave.value ? '/api/orderLog/save' : '/api/orderLog/update', param).then((resp) => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(isSave.value ? formatMessage('page.add.success', '鏂板鎴愬姛') : formatMessage('page.update.success', '鏇存柊鎴愬姛'));
+ } else {
+ message.error(result.msg);
+ }
+ emit('tableReload', 'reload')
+ nextTick(() => {
+ formTable.value.resetFields()
+ })
+ })
+};
+const onFinishFailed = errorInfo => {
+ console.log('Failed:', errorInfo);
+};
+
+const orderTypeQueryList = ref(null);
+orderTypeQuery();
+function orderTypeQuery() {
+ postForm('/api/orderType/query', {
+ type: props.ioModel
+ }).then(resp => {
+ let result = resp.data;
+ orderTypeQueryList.value = result.data;
+ })
+}
+const orderSettleQueryList = ref(null);
+orderSettleQuery();
+function orderSettleQuery() {
+ postForm('/api/orderSettle/query', {}).then(resp => {
+ let result = resp.data;
+ orderSettleQueryList.value = result.data;
+ })
+}
+const userQueryList = ref(null);
+userQuery();
+function userQuery() {
+ postForm('/api/user/query', {}).then(resp => {
+ let result = resp.data;
+ userQueryList.value = result.data;
+ })
+}
+
+defineExpose({
+ open,
+ formData,
+ initFormData,
+ isSave,
+})
+
+</script>
+
+<script>
+export default {
+ name: '璁㈠崟-edit'
+}
+</script>
+
+<template>
+ <div>
+ <a-modal v-model:open="open"
+ :title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
+ style="width: 70%;">
+ <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 2 }"
+ :wrapper-col="{ span: 21 }" autocomplete="off" @finish="onFinish" @finishFailed="onFinishFailed">
+ <a-form-item :label="formatMessage('db.man_order.order_no', '璁㈠崟缂栧彿')" name="orderNo">
+ <a-input v-model:value="formData.orderNo" />
+ </a-form-item>
+ <!-- <a-form-item :label="formatMessage('db.man_order.order_time', '鍗曟嵁鏃ユ湡')" name="orderTime"
+ style="width: 250px;">
+ <a-input v-model:value="formData.orderTime" />
+ </a-form-item> -->
+ <a-form-item :label="formatMessage('db.man_order.order_type', '鍗曟嵁绫诲瀷')" name="orderType">
+ <a-select v-model:value="formData.orderType" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="orderTypeQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_order.order_settle', '鍗曟嵁鐘舵��')" name="orderSettle">
+ <a-select v-model:value="formData.orderSettle" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="orderSettleQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <!-- <a-form-item :label="formatMessage('db.man_order.status', '鐘舵��')" name="status" >
+ <a-select v-model:value="formData.status" :options="[
+ { label: '姝ｅ父', value: 1 },
+ { label: '绂佺敤', value: 0 },
+ ]">
+ </a-select>
+ </a-form-item> -->
+ <!-- <a-form-item :label="formatMessage('db.man_order.create_time', '娣诲姞鏃堕棿')" name="createTime"
+ style="width: 250px;">
+ <a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_order.create_by', '娣诲姞浜哄憳')" name="createBy"
+ style="width: 250px;">
+ <a-select v-model:value="formData.createBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_order.update_time', '淇敼鏃堕棿')" name="updateTime"
+ style="width: 250px;">
+ <a-date-picker v-model:value="formData.updateTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_order.update_by', '淇敼浜哄憳')" name="updateBy"
+ style="width: 250px;">
+ <a-select v-model:value="formData.updateBy" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
+ optionLabelProp="label">
+ </a-select>
+ </a-form-item> -->
+ <!-- <a-form-item :label="formatMessage('db.man_order.memo', '澶囨敞')" name="memo" style="width: 250px;">
+ <a-input v-model:value="formData.memo" />
+ </a-form-item> -->
+
+ <a-form-item :label="formatMessage('db.man_order.update_time', '璁㈠崟鏄庣粏')" name="orderDetl">
+ <OrderDetlComponent ref="orderDetlChild" />
+ </a-form-item>
+
+ <a-form-item>
+ <a-button type="primary" html-type="submit" ref="submitButton"
+ style="visibility: hidden;">Submit</a-button>
+ </a-form-item>
+ </a-form>
+
+ </a-modal>
+ </div>
+</template>
+
+<style></style>
--
Gitblit v1.9.1