From 4e19262b7ed123c5dbe6c00e6c63a158daaab5e3 Mon Sep 17 00:00:00 2001
From: wangjiuyun <1595161655@qq.com>
Date: Fri, 6 Jun 2025 10:01:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=97=AE=E9=A2=98=EF=BC=8C=E5=90=88=E5=90=8C=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/manage/delivery/delivery.html   |  1 +
 .../resources/templates/project/info/add.html | 17 +++++++-------
 .../templates/project/info/edit.html          | 17 +++++++-------
 .../templates/project/order/add.html          | 23 ++++++++++---------
 .../templates/project/order/order.html        | 12 ++++++++--
 5 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
index 828c4b70..928d40b2 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
@@ -28,6 +28,7 @@
                             <li>
                                 <label>物流公司：</label>
                                 <select name="logisticsCompany" class="form-control" th:with="type=${@dict.getType('logistics_company')}">
+                                    <option value="">请选择</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
diff --git a/ruoyi-admin/src/main/resources/templates/project/info/add.html b/ruoyi-admin/src/main/resources/templates/project/info/add.html
index dca9366a..dda1ee0f 100644
--- a/ruoyi-admin/src/main/resources/templates/project/info/add.html
+++ b/ruoyi-admin/src/main/resources/templates/project/info/add.html
@@ -448,7 +448,7 @@
 
 </tr>`)
         $('#productTable tbody').append(tr)
-        initSearchProduct()
+        initSearchProduct('1')
         initPrice()
     }
     function addProduct2() {
@@ -471,7 +471,7 @@
 
 </tr>`)
         $('#productTable2 tbody').append(tr)
-        initSearchProduct()
+        initSearchProduct('2')
         initPrice()
     }
     function addProduct3() {
@@ -494,7 +494,7 @@
 
 </tr>`)
         $('#productTable3 tbody').append(tr)
-        initSearchProduct()
+        initSearchProduct('11,22')
         initPrice()
     }
 
@@ -511,14 +511,14 @@
 
     }
 
-    function initSearchProduct() {
+    function initSearchProduct(type) {
         $('.productTable .productBomCode').on('input', function () {
             let val = $(this).val()
-            searchProduct(val, 'code', this)
+            searchProduct(val, 'code', this,type)
         })
         $('.productTable .model').on('input', function () {
             let val = $(this).val()
-            searchProduct(val, 'model', this)
+            searchProduct(val, 'model', this,type)
         })
         $('.productTable .delRow').on('click', function () {
             let ele = $(this)
@@ -538,7 +538,7 @@
         })
     }
 
-    function searchProduct(val, type, ele) {
+    function searchProduct(val, type, ele,typeId) {
         if (!val) {
             $(ele).parent().parent().find('.productBomCode').val('')
             $(ele).parent().parent().find('.model').val('')
@@ -548,7 +548,8 @@
         let data = {
             pageSize: 10,
             pageNum: 1,
-            isTable: 0
+            isTable: 0,
+            type:typeId
         }
         if (type == 'code') {
             data.productCode = val
diff --git a/ruoyi-admin/src/main/resources/templates/project/info/edit.html b/ruoyi-admin/src/main/resources/templates/project/info/edit.html
index fbfa5547..c440e13f 100644
--- a/ruoyi-admin/src/main/resources/templates/project/info/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/project/info/edit.html
@@ -502,7 +502,7 @@
 
 </tr>`)
         $('#productTable tbody').append(tr)
-        initSearchProduct()
+        initSearchProduct('1')
         initPrice()
     }
     function addProduct2(data) {
@@ -525,7 +525,7 @@
 
 </tr>`)
         $('#productTable2 tbody').append(tr)
-        initSearchProduct()
+        initSearchProduct('2')
         initPrice()
     }
     function addProduct3(data) {
@@ -548,7 +548,7 @@
 
 </tr>`)
         $('#productTable3 tbody').append(tr)
-        initSearchProduct()
+        initSearchProduct('11,22')
         initPrice()
     }
     function addLog(data) {
@@ -564,14 +564,14 @@
 
     }
 
-    function initSearchProduct() {
+    function initSearchProduct(type) {
         $('.productTable .productBomCode').on('input', function () {
             let val = $(this).val()
-            searchProduct(val, 'code', this)
+            searchProduct(val, 'code', this,type)
         })
         $('.productTable .model').on('input', function () {
             let val = $(this).val()
-            searchProduct(val, 'model', this)
+            searchProduct(val, 'model', this,type)
         })
         $('.productTable .delRow').on('click', function () {
             let ele = $(this)
@@ -592,7 +592,7 @@
 
     }
 
-    function searchProduct(val, type, ele) {
+    function searchProduct(val, type, ele,typeId) {
         if (!val) {
             $(ele).parent().parent().find('.productBomCode').val('')
             $(ele).parent().parent().find('.model').val('')
@@ -602,7 +602,8 @@
         let data = {
             pageSize: 10,
             pageNum: 1,
-            isTable: 0
+            isTable: 0,
+            type:typeId
         }
         if (type == 'code') {
             data.productCode = val
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/add.html b/ruoyi-admin/src/main/resources/templates/project/order/add.html
index 24039fb6..0feb90fd 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/add.html
@@ -336,7 +336,7 @@
 <th:block th:include="include :: jquery-cxselect-js"/>
 
 <script th:inline="javascript">
-    var prefix = ctx + "sip/project"
+    var prefix = ctx + "project/order"
     $("#form-product-add").validate({
         focusCleanup: true
     });
@@ -502,7 +502,7 @@
 
 </tr>`)
         $('#productTable tbody').append(tr)
-        initSearchProduct()
+        initSearchProduct('1')
         initPrice()
     }
 
@@ -526,7 +526,7 @@
 
 </tr>`)
         $('#productTable2 tbody').append(tr)
-        initSearchProduct()
+        initSearchProduct('2')
         initPrice()
     }
 
@@ -550,7 +550,7 @@
 
 </tr>`)
         $('#productTable3 tbody').append(tr)
-        initSearchProduct()
+        initSearchProduct('11,22')
         initPrice()
     }
 
@@ -567,14 +567,14 @@
 
     }
 
-    function initSearchProduct() {
+    function initSearchProduct(type) {
         $('.productTable .productBomCode').on('input', function () {
             let val = $(this).val()
-            searchProduct(val, 'code', this)
+            searchProduct(val, 'code', this,type)
         })
         $('.productTable .model').on('input', function () {
             let val = $(this).val()
-            searchProduct(val, 'model', this)
+            searchProduct(val, 'model', this,type)
         })
         $('.productTable .delRow').on('click', function () {
             let ele = $(this)
@@ -594,7 +594,7 @@
         })
     }
 
-    function searchProduct(val, type, ele) {
+    function searchProduct(val, type, ele,typeId) {
         if (!val) {
             $(ele).parent().parent().find('.productBomCode').val('')
             $(ele).parent().parent().find('.model').val('')
@@ -604,7 +604,8 @@
         let data = {
             pageSize: 10,
             pageNum: 1,
-            isTable: 0
+            isTable: 0,
+            type:typeId
         }
         if (type == 'code') {
             data.productCode = val
@@ -710,7 +711,7 @@
 
     function downloadTem() {
         var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象
-        window.location.href = prefix + "/list/export"
+        window.location.href = prefix + "/contract/export?fileName=文件1.xlsx"
         $.modal.closeLoading()
     }
     document.getElementById('uploadInput').addEventListener('change', function (event) {
@@ -718,7 +719,7 @@
         let data = new FormData()
         data.append('file', file)
         var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象
-        xhr.open('POST', prefix + '/list/readData', true); // 设置请求类型和URL
+        xhr.open('POST', prefix + '/importContractData', true); // 设置请求类型和URL
         // 当请求完成时执行的回调函数
         xhr.onload = function (res) {
             let data = JSON.parse(res.currentTarget.response)
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/order.html b/ruoyi-admin/src/main/resources/templates/project/order/order.html
index 6d4eb3ef..7e8f958f 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/order.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/order.html
@@ -11,8 +11,16 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>订单信息：</label>
-                                <input type="text" name="projectId" placeholder="项目编号/项目名称/项目负责人" />
+                                <label>项目编号：</label>
+                                <input type="text" name="projectCode" placeholder="项目编号" />
+                            </li>
+                            <li>
+                                <label>项目名称：</label>
+                                <input type="text" name="projectName" placeholder="项目名称" />
+                            </li>
+                            <li>
+                                <label>项目负责人：</label>
+                                <input type="text" name="dutyName" placeholder="项目负责人" />
                             </li>
                             <li id="element1">
                                 <label>属地：</label>