From 1745146eee12a2d7cb1526604d713af903c298e7 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 17 Jun 2024 09:58:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=AE=A1=E7=90=86-=E5=B7=B2=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E7=8A=B6=E6=80=81=E4=B8=8D=E8=83=BD=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89=E7=BB=91=E5=AE=9A,=20=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=B4=E4=BF=AE=E5=91=98=20=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=B1=9E=E6=80=A7=20=E5=9B=9E=E6=98=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/warehouseManage/machinery/type/index.vue | 7 +++++++
 sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
index e85aa74a..d717878e 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
@@ -396,6 +396,7 @@
                             <el-select
                                 v-model="form.propId"
                                 filterable
+                                clearable
                                 placeholder="请选择资产属性"
                                 style="width: 100%"
                             >
@@ -856,6 +857,12 @@ export default {
             this.reset()
             const typeId = row.typeId || this.ids
             getMaType(typeId).then((response) => {
+                if (response.data.propId == 0) {
+                    response.data.propId = null
+                }
+                if (response.data.repairUserId == 0) {
+                    response.data.repairUserId = null
+                }
                 this.form = response.data
                 if (this.form.documentUrl) {
                     let file = {
diff --git a/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue b/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
index 294f38ea..1a2377d7 100644
--- a/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
@@ -182,7 +182,7 @@
                 :data="labelList"
                 @selection-change="handleSelectionChange"
             >
-                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column type="selection" width="55" align="center" :selectable="(row, index) => row.status != '1'" />
                 <el-table-column
                     align="center"
                     label="序号"

From 63327236d5c845ae5a7030399d950328c1784050 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 17 Jun 2024 10:24:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E6=94=AF=E6=8C=81=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/components/Crontab/day.vue               |  2 +-
 sgzb-ui/src/components/Crontab/hour.vue              |  2 +-
 sgzb-ui/src/components/Crontab/min.vue               |  2 +-
 sgzb-ui/src/components/Crontab/month.vue             |  2 +-
 sgzb-ui/src/components/Crontab/second.vue            |  2 +-
 sgzb-ui/src/components/Crontab/week.vue              | 10 +++++-----
 sgzb-ui/src/components/Crontab/year.vue              |  2 +-
 .../constructionSite/constructionSite.vue            |  1 +
 .../src/views/claimAndRefund/receive/agreement.vue   |  2 ++
 .../src/views/claimAndRefund/receive/receiveOut.vue  |  2 ++
 .../views/claimAndRefund/secondStore/inStoreBook.vue |  2 ++
 .../claimAndRefund/secondStore/outStoreBook.vue      |  2 ++
 .../views/claimAndRefund/secondStore/secondStore.vue |  2 ++
 .../picking/apply/component/AddPicking.vue           |  1 +
 .../views/claimAndreturn/picking/outbound/index.vue  |  1 +
 .../return/apply/component/addReturn.vue             |  1 +
 sgzb-ui/src/views/store/label/labelBinding.vue       |  2 ++
 .../views/store/newBuy/newDevices/newDevicesCode.vue |  1 +
 sgzb-ui/src/views/stquery/backRecord.vue             |  2 ++
 sgzb-ui/src/views/stquery/deviceFixQuery.vue         |  2 ++
 sgzb-ui/src/views/stquery/deviceScrapQuery.vue       |  2 ++
 sgzb-ui/src/views/stquery/leaseRecord.vue            |  2 ++
 sgzb-ui/src/views/stquery/projUsingRecord.vue        |  2 ++
 sgzb-ui/src/views/system/dict/data.vue               |  2 +-
 sgzb-ui/src/views/system/menu/index.vue              |  2 +-
 sgzb-ui/src/views/system/role/index.vue              |  2 ++
 sgzb-ui/src/views/tool/build/RightPanel.vue          |  8 ++++++--
 sgzb-ui/src/views/tool/build/TreeNodeDialog.vue      |  1 +
 sgzb-ui/src/views/tool/gen/editTable.vue             |  6 +++---
 sgzb-ui/src/views/tool/gen/genInfoForm.vue           | 12 ++++++------
 .../src/views/warehouseManage/tagBind/bind/index.vue |  1 +
 31 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/sgzb-ui/src/components/Crontab/day.vue b/sgzb-ui/src/components/Crontab/day.vue
index fe3eaf0c..f6c4026d 100644
--- a/sgzb-ui/src/components/Crontab/day.vue
+++ b/sgzb-ui/src/components/Crontab/day.vue
@@ -44,7 +44,7 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="7">
 				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+				<el-select filterable clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
 					<el-option v-for="item in 31" :key="item" :value="item">{{item}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/sgzb-ui/src/components/Crontab/hour.vue b/sgzb-ui/src/components/Crontab/hour.vue
index 4b1f1fcd..098b7112 100644
--- a/sgzb-ui/src/components/Crontab/hour.vue
+++ b/sgzb-ui/src/components/Crontab/hour.vue
@@ -25,7 +25,7 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
 				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+				<el-select filterable clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
 					<el-option v-for="item in 24" :key="item" :value="item-1">{{item-1}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/sgzb-ui/src/components/Crontab/min.vue b/sgzb-ui/src/components/Crontab/min.vue
index 43cab900..2aea6f20 100644
--- a/sgzb-ui/src/components/Crontab/min.vue
+++ b/sgzb-ui/src/components/Crontab/min.vue
@@ -25,7 +25,7 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
 				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+				<el-select filterable clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
 					<el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/sgzb-ui/src/components/Crontab/month.vue b/sgzb-ui/src/components/Crontab/month.vue
index fd0ac384..8f1fde6a 100644
--- a/sgzb-ui/src/components/Crontab/month.vue
+++ b/sgzb-ui/src/components/Crontab/month.vue
@@ -25,7 +25,7 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
 				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+				<el-select filterable clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
 					<el-option v-for="item in 12" :key="item" :value="item">{{item}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/sgzb-ui/src/components/Crontab/second.vue b/sgzb-ui/src/components/Crontab/second.vue
index e7b77617..c6cba63a 100644
--- a/sgzb-ui/src/components/Crontab/second.vue
+++ b/sgzb-ui/src/components/Crontab/second.vue
@@ -25,7 +25,7 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
 				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+				<el-select filterable clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
 					<el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/sgzb-ui/src/components/Crontab/week.vue b/sgzb-ui/src/components/Crontab/week.vue
index 1cec700e..3ccfa895 100644
--- a/sgzb-ui/src/components/Crontab/week.vue
+++ b/sgzb-ui/src/components/Crontab/week.vue
@@ -15,7 +15,7 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="3">
 				周期从星期
-				<el-select clearable v-model="cycle01">
+				<el-select filterable clearable v-model="cycle01">
 					<el-option
 						v-for="(item,index) of weekList"
 						:key="index"
@@ -25,7 +25,7 @@
 					>{{item.value}}</el-option>
 				</el-select>
 				-
-				<el-select clearable v-model="cycle02">
+				<el-select filterable clearable v-model="cycle02">
 					<el-option
 						v-for="(item,index) of weekList"
 						:key="index"
@@ -41,7 +41,7 @@
 			<el-radio v-model='radioValue' :label="4">
 				第
 				<el-input-number v-model='average01' :min="1" :max="4" /> 周的星期
-				<el-select clearable v-model="average02">
+				<el-select filterable clearable v-model="average02">
 					<el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
 				</el-select>
 			</el-radio>
@@ -50,7 +50,7 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="5">
 				本月最后一个星期
-				<el-select clearable v-model="weekday">
+				<el-select filterable clearable v-model="weekday">
 					<el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
 				</el-select>
 			</el-radio>
@@ -59,7 +59,7 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="6">
 				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+				<el-select filterable clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
 					<el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="String(item.key)">{{item.value}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/sgzb-ui/src/components/Crontab/year.vue b/sgzb-ui/src/components/Crontab/year.vue
index 5487a6c7..29c6f9b7 100644
--- a/sgzb-ui/src/components/Crontab/year.vue
+++ b/sgzb-ui/src/components/Crontab/year.vue
@@ -32,7 +32,7 @@
 		<el-form-item>
 			<el-radio :label="5" v-model='radioValue'>
 				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple>
+				<el-select filterable clearable v-model="checkboxList" placeholder="可多选" multiple>
 					<el-option v-for="item in 9" :key="item" :value="item - 1 + fullYear" :label="item -1 + fullYear" />
 				</el-select>
 			</el-radio>
diff --git a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
index 24eb35bd..ab0e0e01 100644
--- a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
+++ b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
@@ -23,6 +23,7 @@
                     v-model="queryParams.unitId"
                     placeholder="请选择单位名称"
                     clearable
+                    filterable
                 >
                     <el-option
                         v-for="item in unitList"
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
index b77f0863..54e9f379 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
@@ -34,6 +34,7 @@
                         v-model="queryParams.unitId"
                         placeholder="请选择往来单位"
                         clearable
+                        filterable
                     >
                         <el-option
                             v-for="(item, i) in unitList"
@@ -48,6 +49,7 @@
                         v-model="queryParams.projectId"
                         placeholder="请选择工程名称"
                         clearable
+                        filterable
                     >
                         <el-option
                             v-for="(item, i) in projectList"
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index 18319932..a73416a4 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -22,6 +22,7 @@
                     v-model="queryParams.unitId"
                     placeholder="请选择单位名称"
                     clearable
+                    filterable
                 >
                     <el-option
                         v-for="item in unitList"
@@ -52,6 +53,7 @@
                     v-model="queryParams.taskStatus"
                     placeholder="请选择出库状态"
                     clearable
+                    filterable
                 >
                     <el-option
                         v-for="item in statusList"
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
index e132449a..b26619b1 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
@@ -23,6 +23,7 @@
                     v-model="queryParams.unitId"
                     placeholder="请选择单位名称"
                     clearable
+                    filterable
                 >
                     <el-option
                         v-for="item in unitList"
@@ -38,6 +39,7 @@
                     v-model="queryParams.proId"
                     placeholder="请选择工程名称"
                     clearable
+                    filterable
                 >
                     <el-option
                         v-for="item in proList"
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
index 8554396a..65d6f151 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
@@ -23,6 +23,7 @@
                     v-model="queryParams.unitId"
                     placeholder="请选择单位名称"
                     clearable
+                    filterable
                 >
                     <el-option
                         v-for="item in unitList"
@@ -38,6 +39,7 @@
                     v-model="queryParams.proId"
                     placeholder="请选择工程名称"
                     clearable
+                    filterable
                 >
                     <el-option
                         v-for="item in proList"
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
index 485430a6..48637ac7 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
@@ -22,6 +22,7 @@
                     v-model="queryParams.unitId"
                     placeholder="请选择单位名称"
                     clearable
+                    filterable
                 >
                     <el-option
                         v-for="item in unitList"
@@ -37,6 +38,7 @@
                     v-model="queryParams.proId"
                     placeholder="请选择工程名称"
                     clearable
+                    filterable
                 >
                     <el-option
                         v-for="item in proList"
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
index af1af8cc..11db4e93 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
@@ -62,6 +62,7 @@
                         :disabled="leaseApplyDetails.length > 0"
                         placeholder="请选择设备类型"
                         clearable
+                        filterable
                     >
                         <el-option label="机具设备" value="101"></el-option>
                         <el-option label="调试设备" value="102"></el-option>
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index 38e674e9..a359e353 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -53,6 +53,7 @@
                     v-model="queryParams.taskStatus"
                     placeholder="请选择出库状态"
                     clearable
+                    filterable
                 >
                     <el-option
                         v-for="item in statusList"
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
index 728e4e90..cacd5599 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
@@ -59,6 +59,7 @@
                     :disabled="leaseApplyDetails.length > 0"
                     placeholder="请选择设备类型"
                     clearable
+                    filterable
                 >
                     <el-option label="机具设备" value="101"></el-option>
                     <el-option label="调试设备" value="102"></el-option>
diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue
index d85be694..9fdea39d 100644
--- a/sgzb-ui/src/views/store/label/labelBinding.vue
+++ b/sgzb-ui/src/views/store/label/labelBinding.vue
@@ -59,6 +59,7 @@
                             v-model="queryParams.isBind"
                             placeholder="请选择绑定状态"
                             clearable
+                            filterable
                             style="width: 240px"
                         >
                             <el-option label="已绑定" value="1" />
@@ -392,6 +393,7 @@
                         v-model="cform.labelType"
                         placeholder="请选择标签类型"
                         style="width: 100%"
+                        filterable
                     >
                         <el-option
                             v-for="item in labelTypeList"
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index 3a476e97..ed34fc5f 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -222,6 +222,7 @@
                                 placeholder="是否为固定资产"
                                 @change="fillingCodeList"
                                 clearable
+                                filterable
                                 allow-create
                             >
                                 <el-option label="是" value="0" />
diff --git a/sgzb-ui/src/views/stquery/backRecord.vue b/sgzb-ui/src/views/stquery/backRecord.vue
index c6a237c4..d6fe3d31 100644
--- a/sgzb-ui/src/views/stquery/backRecord.vue
+++ b/sgzb-ui/src/views/stquery/backRecord.vue
@@ -22,6 +22,7 @@
             <el-form-item label="往来单位" prop="unitId">
                 <el-select
                     v-model="queryParams.unitId"
+                    filterable
                     clearable
                     @change="GetProData"
                     style="width: 240px"
@@ -38,6 +39,7 @@
             <el-form-item label="工程名称" prop="proId">
                 <el-select
                     v-model="queryParams.proId"
+                    filterable
                     clearable
                     @change="GetUnitData"
                     style="width: 240px"
diff --git a/sgzb-ui/src/views/stquery/deviceFixQuery.vue b/sgzb-ui/src/views/stquery/deviceFixQuery.vue
index a7a8fe19..e9250079 100644
--- a/sgzb-ui/src/views/stquery/deviceFixQuery.vue
+++ b/sgzb-ui/src/views/stquery/deviceFixQuery.vue
@@ -11,6 +11,7 @@
             <el-form-item label="往来单位">
                 <el-select
                     v-model="queryParams.unitId"
+                    filterable
                     clearable
                     @change="GetProData"
                     style="width: 240px"
@@ -28,6 +29,7 @@
             <el-form-item label="工程名称">
                 <el-select
                     v-model="queryParams.proId"
+                    filterable
                     clearable
                     @change="GetUnitData"
                     style="width: 240px"
diff --git a/sgzb-ui/src/views/stquery/deviceScrapQuery.vue b/sgzb-ui/src/views/stquery/deviceScrapQuery.vue
index 9f5a3064..149009cf 100644
--- a/sgzb-ui/src/views/stquery/deviceScrapQuery.vue
+++ b/sgzb-ui/src/views/stquery/deviceScrapQuery.vue
@@ -22,6 +22,7 @@
             <el-form-item label="往来单位">
                 <el-select
                     v-model="queryParams.unitId"
+                    filterable
                     clearable
                     @change="GetProData"
                     style="width: 240px"
@@ -39,6 +40,7 @@
             <el-form-item label="工程名称">
                 <el-select
                     v-model="queryParams.proId"
+                    filterable
                     clearable
                     @change="GetUnitData"
                     style="width: 240px"
diff --git a/sgzb-ui/src/views/stquery/leaseRecord.vue b/sgzb-ui/src/views/stquery/leaseRecord.vue
index f13812af..629b4f3b 100644
--- a/sgzb-ui/src/views/stquery/leaseRecord.vue
+++ b/sgzb-ui/src/views/stquery/leaseRecord.vue
@@ -22,6 +22,7 @@
             <el-form-item label="往来单位" prop="unitId">
                 <el-select
                     v-model="queryParams.unitId"
+                    filterable
                     clearable
                     @change="GetProData"
                     style="width: 240px"
@@ -38,6 +39,7 @@
             <el-form-item label="工程名称" prop="proId">
                 <el-select
                     v-model="queryParams.proId"
+                    filterable
                     clearable
                     @change="GetUnitData"
                     style="width: 240px"
diff --git a/sgzb-ui/src/views/stquery/projUsingRecord.vue b/sgzb-ui/src/views/stquery/projUsingRecord.vue
index 962f4e6e..029502a4 100644
--- a/sgzb-ui/src/views/stquery/projUsingRecord.vue
+++ b/sgzb-ui/src/views/stquery/projUsingRecord.vue
@@ -22,6 +22,7 @@
             <el-form-item label="选择单位">
                 <el-select
                     v-model="queryParams.unitId"
+                    filterable
                     clearable
                     @change="GetProData"
                     style="width: 240px"
@@ -39,6 +40,7 @@
             <el-form-item label="工程名称">
                 <el-select
                     v-model="queryParams.proId"
+                    filterable
                     clearable
                     @change="GetUnitData"
                     style="width: 240px"
diff --git a/sgzb-ui/src/views/system/dict/data.vue b/sgzb-ui/src/views/system/dict/data.vue
index 78924c76..46006893 100644
--- a/sgzb-ui/src/views/system/dict/data.vue
+++ b/sgzb-ui/src/views/system/dict/data.vue
@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
+        <el-select v-model="queryParams.status" placeholder="数据状态" clearable filterable>
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
diff --git a/sgzb-ui/src/views/system/menu/index.vue b/sgzb-ui/src/views/system/menu/index.vue
index f2073a81..458aaf63 100644
--- a/sgzb-ui/src/views/system/menu/index.vue
+++ b/sgzb-ui/src/views/system/menu/index.vue
@@ -5,7 +5,7 @@
         <el-input v-model="queryParams.menuName" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
+        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable filterable>
           <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
             :value="dict.value" />
         </el-select>
diff --git a/sgzb-ui/src/views/system/role/index.vue b/sgzb-ui/src/views/system/role/index.vue
index d64d6d19..f7906e17 100644
--- a/sgzb-ui/src/views/system/role/index.vue
+++ b/sgzb-ui/src/views/system/role/index.vue
@@ -30,6 +30,7 @@
                     v-model="queryParams.status"
                     placeholder="角色状态"
                     clearable
+                    filterable
                     style="width: 240px"
                 >
                     <el-option
@@ -343,6 +344,7 @@
                     <el-select
                         v-model="form.dataScope"
                         @change="dataScopeSelectChange"
+                        filterable
                     >
                         <el-option
                             v-for="item in dataScopeOptions"
diff --git a/sgzb-ui/src/views/tool/build/RightPanel.vue b/sgzb-ui/src/views/tool/build/RightPanel.vue
index c2760eb5..1ad967e6 100644
--- a/sgzb-ui/src/views/tool/build/RightPanel.vue
+++ b/sgzb-ui/src/views/tool/build/RightPanel.vue
@@ -15,6 +15,7 @@
             <el-select
               v-model="activeData.tagIcon"
               placeholder="请选择组件类型"
+              filterable
               :style="{width: '100%'}"
               @change="tagChange"
             >
@@ -62,7 +63,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item v-if="activeData.justify!==undefined&&activeData.type==='flex'" label="水平排列">
-            <el-select v-model="activeData.justify" placeholder="请选择水平排列" :style="{width: '100%'}">
+            <el-select v-model="activeData.justify" placeholder="请选择水平排列" :style="{width: '100%'}" filterable>
               <el-option
                 v-for="(item, index) in justifyOptions"
                 :key="index"
@@ -192,6 +193,7 @@
             <el-select
               v-model="activeData.type"
               placeholder="请选择时间类型"
+              filterable
               :style="{ width: '100%' }"
               @change="dateTypeChange"
             >
@@ -210,6 +212,7 @@
             <el-select
               v-model="activeData.accept"
               placeholder="请选择文件类型"
+              filterable
               :style="{ width: '100%' }"
               clearable
             >
@@ -224,7 +227,7 @@
           </el-form-item>
           <el-form-item v-if="activeData.fileSize !== undefined" label="文件大小">
             <el-input v-model.number="activeData.fileSize" placeholder="请输入文件大小">
-              <el-select slot="append" v-model="activeData.sizeUnit" :style="{ width: '66px' }">
+              <el-select slot="append" v-model="activeData.sizeUnit" filterable :style="{ width: '66px' }">
                 <el-option label="KB" value="KB" />
                 <el-option label="MB" value="MB" />
                 <el-option label="GB" value="GB" />
@@ -395,6 +398,7 @@
             <el-select
               v-model="activeData['color-format']"
               placeholder="请选择颜色格式"
+              filterable
               :style="{ width: '100%' }"
               @change="colorFormatChange"
             >
diff --git a/sgzb-ui/src/views/tool/build/TreeNodeDialog.vue b/sgzb-ui/src/views/tool/build/TreeNodeDialog.vue
index fa7f0b28..12d7d1d4 100644
--- a/sgzb-ui/src/views/tool/build/TreeNodeDialog.vue
+++ b/sgzb-ui/src/views/tool/build/TreeNodeDialog.vue
@@ -41,6 +41,7 @@
                 <el-select
                   slot="append"
                   v-model="dataType"
+                  filterable
                   :style="{width: '100px'}"
                 >
                   <el-option
diff --git a/sgzb-ui/src/views/tool/gen/editTable.vue b/sgzb-ui/src/views/tool/gen/editTable.vue
index 951497a7..bb763df6 100644
--- a/sgzb-ui/src/views/tool/gen/editTable.vue
+++ b/sgzb-ui/src/views/tool/gen/editTable.vue
@@ -26,7 +26,7 @@
           />
           <el-table-column label="Java类型" min-width="11%">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.javaType">
+              <el-select v-model="scope.row.javaType" filterable>
                 <el-option label="Long" value="Long" />
                 <el-option label="String" value="String" />
                 <el-option label="Integer" value="Integer" />
@@ -65,7 +65,7 @@
           </el-table-column>
           <el-table-column label="查询方式" min-width="10%">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.queryType">
+              <el-select v-model="scope.row.queryType" filterable>
                 <el-option label="=" value="EQ" />
                 <el-option label="!=" value="NE" />
                 <el-option label=">" value="GT" />
@@ -84,7 +84,7 @@
           </el-table-column>
           <el-table-column label="显示类型" min-width="12%">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.htmlType">
+              <el-select v-model="scope.row.htmlType" filterable>
                 <el-option label="文本框" value="input" />
                 <el-option label="文本域" value="textarea" />
                 <el-option label="下拉框" value="select" />
diff --git a/sgzb-ui/src/views/tool/gen/genInfoForm.vue b/sgzb-ui/src/views/tool/gen/genInfoForm.vue
index 6017df7a..39e6d14d 100644
--- a/sgzb-ui/src/views/tool/gen/genInfoForm.vue
+++ b/sgzb-ui/src/views/tool/gen/genInfoForm.vue
@@ -4,7 +4,7 @@
       <el-col :span="12">
         <el-form-item prop="tplCategory">
           <span slot="label">生成模板</span>
-          <el-select v-model="info.tplCategory" @change="tplSelectChange">
+          <el-select v-model="info.tplCategory" @change="tplSelectChange" filterable>
             <el-option label="单表（增删改查）" value="crud" />
             <el-option label="树表（增删改查）" value="tree" />
             <el-option label="主子表（增删改查）" value="sub" />
@@ -125,7 +125,7 @@
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
-          <el-select v-model="info.treeCode" placeholder="请选择">
+          <el-select v-model="info.treeCode" placeholder="请选择" filterable>
             <el-option
               v-for="(column, index) in info.columns"
               :key="index"
@@ -143,7 +143,7 @@
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
-          <el-select v-model="info.treeParentCode" placeholder="请选择">
+          <el-select v-model="info.treeParentCode" placeholder="请选择" filterable>
             <el-option
               v-for="(column, index) in info.columns"
               :key="index"
@@ -161,7 +161,7 @@
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
-          <el-select v-model="info.treeName" placeholder="请选择">
+          <el-select v-model="info.treeName" placeholder="请选择" filterable>
             <el-option
               v-for="(column, index) in info.columns"
               :key="index"
@@ -182,7 +182,7 @@
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
-          <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
+          <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange" filterable>
             <el-option
               v-for="(table, index) in tables"
               :key="index"
@@ -200,7 +200,7 @@
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
-          <el-select v-model="info.subTableFkName" placeholder="请选择">
+          <el-select v-model="info.subTableFkName" placeholder="请选择" filterable>
             <el-option
               v-for="(column, index) in subColumns"
               :key="index"
diff --git a/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue b/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
index 1a2377d7..5d24b5e6 100644
--- a/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
@@ -396,6 +396,7 @@
                         v-model="cform.labelType"
                         placeholder="请选择标签类型"
                         style="width: 100%"
+                        filterable
                     >
                         <el-option
                             v-for="item in labelTypeList"