From 5cc8591166c7cc0ceea4ac0b27cda6bd04bc663d Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Mon, 14 Apr 2025 14:40:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为订单录入页面的代表处编码和代理商编码字段添加树形选择功能
- 修复订单列表删除时间字段的错误拼写
---
 .../resources/templates/manage/order/add.html | 47 +++++++++++++++++--
 .../mapper/manage/OrderInfoMapper.xml         |  2 +-
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/add.html b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
index baf05d34..5288099d 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
@@ -86,7 +86,11 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">代表处编码：</label>
                     <div class="col-sm-8">
-                        <input name="orderDept" class="form-control" type="text" required>
+                        <div class="input-group">
+                            <input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTree()" id="treeName"  required>
+                            <input name="orderDept"  type="hidden"   id="treeId"/>
+                            <span class="input-group-addon"><i class="fa fa-search"></i></span>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -94,7 +98,8 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">代理商编码：</label>
                     <div class="col-sm-8">
-                        <input name="partenerDept" class="form-control" type="text" required>
+                        <input name="partenerDept" type="hidden"   id="treeId1" class="form-control"  required>
+                        <input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTreePartener()" id="treeName1"  required>
                     </div>
                 </div>
             </div>
@@ -225,12 +230,48 @@
             };
             $.table.init(options);
         });
-
+        function selectDeptTree() {
+            var deptId = $.common.isEmpty($("#treeId").val()) ? "100" : $("#treeId").val();
+            console.log(deptId)
+            var url = ctx + "system/user/selectDeptTree/" + deptId;
+            var options = {
+                title: '选择部门',
+                width: "380",
+                url: url,
+                callBack: doSubmit
+            };
+            $.modal.openOptions(options);
+        }
+        function doSubmit(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId").val(body.find('#treeId').val());
+            $("#treeName").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
+        function selectDeptTreePartener() {
+            var deptId = $.common.isEmpty($("#treeId1").val()) ? "100" : $("#treeId1").val();
+            console.log(deptId)
+            var url = ctx + "system/user/selectDeptTree/" + deptId;
+            var options = {
+                title: '选择部门',
+                width: "380",
+                url: url,
+                callBack: doSubmitPartener
+            };
+            $.modal.openOptions(options);
+        }
+        function doSubmitPartener(index, layero){
+            var body = $.modal.getChildFrame(index);
+            $("#treeId1").val(body.find('#treeId').val());
+            $("#treeName1").val(body.find('#treeName').val());
+            $.modal.close(index);
+        }
         function addRow() {
             var count = $("#" + table.options.id).bootstrapTable('getData').length;
             var row = {
                 index: $.table.serialNumber(count),
                 productId: "",
+                productCode: "",
                 quantity: "",
                 price: "",
                 amount: "",
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
index b6ae7040..052c54ab 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
@@ -232,7 +232,7 @@
     </delete>
 
     <delete id="deleteOrderListByOrderIds" parameterType="String">
-        update   order_list set  status=1,delete_at=now() where order_id in
+        update   order_list set  status=1,deleted_at=now() where order_id in
         <foreach item="orderId" collection="array" open="(" separator="," close=")">
             #{orderId}
         </foreach>