From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了,单据状态还是作业中,现在作业中的单据是可以删除的,我不小心把这个单据删除了,怎么恢复? 36.每个界面点下一页都没反应,点第二页是有变化的,之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息(客户名称、收件人、地址、电话等),现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致

---
 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: '姝e父', 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