From 6ea3d5caa30f460f1eb9c3880d90f41275c3c274 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 03 七月 2025 09:25:08 +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 | 44 ++++++++------------------------------------
1 files changed, 8 insertions(+), 36 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..abd0d30 100644
--- a/zy-asrs-admin/src/components/order/order/edit.vue
+++ b/zy-asrs-admin/src/components/order/order/edit.vue
@@ -132,10 +132,6 @@
<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"
@@ -148,45 +144,21 @@
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 :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.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 :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.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 :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.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 :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.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" v-if="open" />
</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