From 99c496e9a8453475a8e4b0f683c691ecc146c580 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Thu, 3 Jul 2025 17:17:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(sip):=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BF=A1=E6=81=AF=E5=92=8C=E8=AE=A2=E5=8D=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=AD=20BG=20=E5=92=8C=E8=A1=8C=E4=B8=9A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新项目信息和订单信息页面中 BG 和行业选择框的样式 - 移除只读属性，允许用户选择 BG 和行业 - 更新 SQL 查询，使用项目信息表中的 BG 和行业字段 - 修复订单信息中更新项目 BG 和行业的问题 --- .../resources/templates/project/info/add.html | 18 +++++++-------- .../templates/project/info/edit.html | 20 ++++++++-------- .../templates/project/order/add.html | 18 +++++++-------- .../templates/project/order/edit.html | 16 ++++++------- .../templates/system/customer/info.html | 23 ++++++++++++++++++- .../impl/ProjectOrderInfoServiceImpl.java | 14 +++++------ .../mapper/sip/ProjectInfoMapper.xml | 10 ++++---- .../mapper/sip/ProjectOrderInfoMapper.xml | 4 ++-- 8 files changed, 72 insertions(+), 51 deletions(-) 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 f6e0cd7a..0a61e875 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/add.html @@ -95,9 +95,9 @@ label { margin-bottom: 0 !important; } - [name="bgProperty"], #industryTypeBox select { - pointer-events: none; - } + /*[name="bgProperty"], #industryTypeBox select {*/ + /* pointer-events: none;*/ + /*}*/
@@ -118,7 +118,7 @@ BG + @@ -593,7 +593,7 @@ str += ` ` }) $('#industryTypeBox').html(` - ${str} 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 4f7302e7..e4495abf 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/edit.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/edit.html @@ -103,9 +103,9 @@ .white-bg{ padding: 0px 50px; } - [name="bgProperty"], #industryTypeBox select { - pointer-events: none; - } + /*[name="bgProperty"], #industryTypeBox select {*/ + /* pointer-events: none;*/ + /*}*/
@@ -133,7 +133,7 @@ @@ -513,9 +513,9 @@ $('[name="customerName"]').val(rows[0].customerName); $('[name="customerUserName"]').val(rows[0].contactPerson); $('[name="customerPhone"]').val(rows[0].contactPhone); - $('[name="bgProperty"]').val(rows[0].bgProperty); - changeBg() - $('[name="industryType"]').val(rows[0].industryType); + // $('[name="bgProperty"]').val(rows[0].bgProperty); + // changeBg() + // $('[name="industryType"]').val(rows[0].industryType); $.modal.close(index); } @@ -657,7 +657,7 @@ str += ` ` }) $('#industryTypeBox').html(` - ${str} @@ -669,7 +669,7 @@ str += ` ` }) $('#industryTypeBox').html(` - ${str} 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 671944d6..36cb6aa6 100644 --- a/ruoyi-admin/src/main/resources/templates/project/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/order/add.html @@ -79,9 +79,9 @@ position: relative; } - [name="bgProperty"], #industryTypeBox select { - pointer-events: none; - } + /*[name="bgProperty"], #industryTypeBox select {*/ + /* pointer-events: none;*/ + /*}*/ #projectNameBox { margin-left: 20px; @@ -137,19 +137,19 @@ - BG* + BG - 行业* + 行业 @@ -665,7 +665,7 @@ str += ` ` }) $('#industryTypeBox').html(` - ${str} @@ -677,7 +677,7 @@ str += ` ` }) $('#industryTypeBox').html(` - ${str} diff --git a/ruoyi-admin/src/main/resources/templates/project/order/edit.html b/ruoyi-admin/src/main/resources/templates/project/order/edit.html index 27d109eb..21210ca7 100644 --- a/ruoyi-admin/src/main/resources/templates/project/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/project/order/edit.html @@ -73,9 +73,9 @@ position: relative; } - [name="bgProperty"], #industryTypeBox select { - pointer-events: none; - } + /*[name="bgProperty"], #industryTypeBox select {*/ + /* pointer-events: none;*/ + /*}*/ #projectNameBox { margin-left: 20px; @@ -138,8 +138,8 @@ BG - @@ -701,7 +701,7 @@ str += ` ` }) $('#industryTypeBox').html(` - ${str} @@ -713,7 +713,7 @@ str += ` ` }) $('#industryTypeBox').html(` - ${str} diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/info.html b/ruoyi-admin/src/main/resources/templates/system/customer/info.html index 8cba5749..a242e5de 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/info.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/info.html @@ -7,6 +7,9 @@ .select-list li p, .select-list li label:not(.radio-box){ width: 95px; } + .bootstrap-table table { + table-layout: fixed; + }
@@ -68,12 +71,13 @@ 导出
-
+
+