From d741a030f3c3764f1af666b366bdc5a584a4ea66 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Sun, 29 Sep 2024 20:42:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=93=81=E7=BB=9F=E8=AE=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/basis/SampleAllManageMapper.xml   |  8 +++++++
 .../static/js/sampleAll/sampleAllManage.js    | 24 +++++++++++++++++++
 .../pages/sampleAll/sampleAllManage.html      | 15 ++++++++++--
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mappers/basis/SampleAllManageMapper.xml b/src/main/resources/mappers/basis/SampleAllManageMapper.xml
index 8d4a8f1..5d109f6 100644
--- a/src/main/resources/mappers/basis/SampleAllManageMapper.xml
+++ b/src/main/resources/mappers/basis/SampleAllManageMapper.xml
@@ -7,6 +7,8 @@
 		ted.id,
 		tsd.dev_type_name as sampleTools,
 		ted.dev_code as devCode,
+		ted.manufacturer as factoryName,
+		ted.dev_status as devStatus,
 		tsd.customer_code as customerCode,
 		tsd.dev_module as devModule,
 		tc.custom_name as customName,
@@ -32,6 +34,12 @@
 		<if test="sampleTools != null and sampleTools != ''">
 			and tsd.dev_type_name like concat('%',#{sampleTools}, '%')
 		</if>
+		<if test="devCode != null and devCode != ''">
+			and ted.dev_code like concat('%',#{devCode}, '%')
+		</if>
+		<if test="customerCode != null and customerCode != ''">
+			and tsd.customer_code like concat('%',#{customerCode}, '%')
+		</if>
 		<if test="keyWord != null and keyWord != ''">
 			AND (
 			ted.dev_code like concat('%', #{keyWord}, '%') OR
diff --git a/src/main/resources/static/js/sampleAll/sampleAllManage.js b/src/main/resources/static/js/sampleAll/sampleAllManage.js
index a3c35a4..6363cba 100644
--- a/src/main/resources/static/js/sampleAll/sampleAllManage.js
+++ b/src/main/resources/static/js/sampleAll/sampleAllManage.js
@@ -130,6 +130,26 @@ function initTable(dataList, limit, page) {
                         return `<div class="ellipsis" title="${d.devModule}">${d.devModule}</div>`;
                     }
                 },
+                {
+                    field: "factoryName",
+                    // width: 150,
+                    title: "生产厂家",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.factoryName}">${d.factoryName}</div>`;
+                    }
+                },
+                {
+                    field: "devStatus",
+                    // width: 150,
+                    title: "外观状态",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.devStatus}">${d.devStatus}</div>`;
+                    }
+                },
                 {
                     field: "customName",
                     // width: 175,
@@ -270,6 +290,8 @@ function getReqParams(page, limit, type) {
             page: page + "",
             limit: limit + "",
             sampleTools: selectedText,
+            devCode: $('#devCode').val(),
+            customerCode: $('#customerCode').val(),
             keyWord:$('#keyWord').val()
         };
     } else {
@@ -277,6 +299,8 @@ function getReqParams(page, limit, type) {
             page: '1',
             limit: '10',
             sampleTools: '',
+            devCode: '',
+            customerCode: '',
             keyWord: ''
         };
     }
diff --git a/src/main/resources/static/pages/sampleAll/sampleAllManage.html b/src/main/resources/static/pages/sampleAll/sampleAllManage.html
index c6471bd..b85b017 100644
--- a/src/main/resources/static/pages/sampleAll/sampleAllManage.html
+++ b/src/main/resources/static/pages/sampleAll/sampleAllManage.html
@@ -30,14 +30,25 @@
                     </div>
                 </div>
 
+                <div class="layui-inline" style="padding: 0 0 0 10px;">
+                    <div class="layui-input-inline">
+                        <input type="text" id="devCode" maxlength="30" class="layui-input" autocomplete="off" placeholder="请输入样品编号">
+                    </div>
+                </div>
+
+                <div class="layui-inline" style="padding: 0 0 0 10px;">
+                    <div class="layui-input-inline">
+                        <input type="text" id="customerCode" maxlength="30" class="layui-input" autocomplete="off" placeholder="请输入样品编号">
+                    </div>
+                </div>
+
                 <div class="layui-inline" style="padding: 0 0 0 10px;">
                     <div class="layui-input-inline">
                         <input type="text" id="keyWord" maxlength="30" class="layui-input" autocomplete="off" placeholder="请输入关键字">
                     </div>
                 </div>
 
-
-                <div class="layui-inline btns" style="width: 65%">
+                <div class="layui-inline btns" >
                     <button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="query(1)">查询
                     </button>
                 </div>