From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +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/order/order/edit.vue | 61 +++++++++---------------------
1 files changed, 18 insertions(+), 43 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/edit.vue b/zy-asrs-admin/src/components/order/order/edit.vue
index f3a5589..283a282 100644
--- a/zy-asrs-admin/src/components/order/order/edit.vue
+++ b/zy-asrs-admin/src/components/order/order/edit.vue
@@ -25,7 +25,7 @@
orderDetlChild.value.orderId = formData.value.id;
orderDetlChild.value.isAdd = isSave.value;
orderNoQuery();
- }else {
+ } else {
orderDetlChild.value.orderId = null;
}
})
@@ -46,6 +46,9 @@
orderNo: formData.value.orderNo,
orderType: formData.value.orderType,
orderSettle: formData.value.orderSettle,
+ address: formData.value.address,
+ phone: formData.value.phone,
+ customer: formData.value.customer,
list: orderDetlChild.value.tableData
}
@@ -132,61 +135,33 @@
<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 v-if="!isSave" :label="formatMessage('db.man_order.order_settle', '鍗曟嵁鐘舵��')" name="orderSettle">
+ <a-form-item v-if="!isSave" :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> -->
-
+ <div>
+ <a-form-item :label="formatMessage('db.man_order.order_no', '瀹㈡埛鍚嶇О')" name="customer">
+ <a-input v-model:value="formData.customer" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_order.order_no', '鏀惰揣鍦板潃')" name="address">
+ <a-input v-model:value="formData.address" />
+ </a-form-item>
+ <a-form-item :label="formatMessage('db.man_order.order_no', '鐢佃瘽')" name="phone">
+ <a-input v-model:value="formData.phone" />
+ </a-form-item>
+ </div>
<a-form-item :label="formatMessage('db.man_order.update_time', '璁㈠崟鏄庣粏')" name="orderDetl">
- <OrderDetlComponent ref="orderDetlChild" v-if="open" />
+ <OrderDetlComponent ref="orderDetlChild" v-if="open" :ioModel="props.ioModel" />
</a-form-item>
-
<a-form-item>
<a-button type="primary" html-type="submit" ref="submitButton"
style="visibility: hidden;">Submit</a-button>
--
Gitblit v1.9.1