From be2c2a6b12b22f2ec9a7630bc35692abebc14150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Fri, 12 Jul 2024 19:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A3=80=E7=B4=A2=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scInput/index.vue      |  2 +-
 src/components/scInput/inputVague.vue | 64 +++++++++++++++++++++++++++
 src/components/scSearch/index.vue     | 20 ++++++---
 src/scui.js                           |  2 +
 src/views/setting/company/index.vue   |  9 ++--
 5 files changed, 88 insertions(+), 9 deletions(-)
 create mode 100644 src/components/scInput/inputVague.vue

diff --git a/src/components/scInput/index.vue b/src/components/scInput/index.vue
index d99b25d..08f535c 100644
--- a/src/components/scInput/index.vue
+++ b/src/components/scInput/index.vue
@@ -1,5 +1,5 @@
 <!--
- * @Descripttion: 关键字组件
+ * @Descripttion: 输入框全等于检索组件
  * @Author: 龙运模
  * @Date: 2024年07月11日
  * @LastEditors: 龙运模
diff --git a/src/components/scInput/inputVague.vue b/src/components/scInput/inputVague.vue
new file mode 100644
index 0000000..6b65bc3
--- /dev/null
+++ b/src/components/scInput/inputVague.vue
@@ -0,0 +1,64 @@
+<!--
+ * @Descripttion: 输入框模糊检索组件
+ * @Author: 龙运模
+ * @Date: 2024年07月11日
+ * @LastEditors: 龙运模
+ * @LastEditTime:
+-->
+
+<template>
+	<div class="scDatePicker">
+		<el-input v-bind="$attrs" class="input" v-model="localText" @input="textChange" :size="size" :placeholder="placeholder" clearable></el-input>
+	</div>
+</template>
+
+<script>
+export default {
+	name: "inputVague",
+	props:{
+		activation_text: {
+			type: Object,
+			default: ()=>({ operator: "link", value: "" })
+		},
+		size:{ type: String, default: "small" },
+		placeholder:{type:String, default:"请输入关键字"},
+	},
+	watch:{
+		activation_text:{
+			handler(val){
+				if(val){
+					this.localText = val.value;
+				}
+			},
+			deep:true
+		}
+	},
+	data(){
+		return{
+			localText:'',
+		}
+	},
+	mounted() {
+
+	},
+	methods:{
+		textChange(e){
+			this.localText = e;
+			this.emitActivationText();
+		},
+		emitActivationText() {
+			this.$emit('update:activation_text', {
+				operator: this.activation_text.operator,
+				value: this.localText? this.localText:""
+			});
+			this.$emit('fetchData');
+		}
+	}
+}
+</script>
+
+<style scoped lang="scss">
+.scDatePicker{
+	width: 100%;
+}
+</style>
diff --git a/src/components/scSearch/index.vue b/src/components/scSearch/index.vue
index af9d6b7..2635dc2 100644
--- a/src/components/scSearch/index.vue
+++ b/src/components/scSearch/index.vue
@@ -2,11 +2,11 @@
 	<div v-for="item in columnList" :key="item">
 		<div class="searchItem" v-if="item.type == 'date'">
 			<label class="name">{{item.name}}</label>
-			<scDatePicker :size="size" v-model:activation_date="params.activation_date" start-placeholder="开始日期" end-placeholder="结束日期"></scDatePicker>
+			<scDatePicker :size="size" v-model:activation_date="params[item.code]" @visible-change="getSelect(item,$event)" start-placeholder="开始日期" end-placeholder="结束日期"></scDatePicker>
 		</div>
 		<div class="searchItem" v-if="item.type =='multiple'">
 			<label class="name">{{item.name}}</label>
-			<scMultipleSelect :size="size" v-model:activation_select="params.id" @fetchData="getSelect(item,$event)" :placeholder="item.placeholder" multiple collapse-tags filterable clearable>
+			<scMultipleSelect :size="size" v-model:activation_select="params[item.code]" @fetchData="getSelect(item,$event)" :placeholder="item.placeholder" multiple collapse-tags filterable clearable>
 				<el-option v-for="em in item.data" :key="em" :label="em.full_name" :value="em.id"></el-option>
 			</scMultipleSelect>
 		</div>
@@ -18,7 +18,17 @@
 		</div>
 		<div class="searchItem" v-if="item.type == 'text'">
 			<label class="name">{{item.name}}</label>
-			<scInput class="input" v-model:activation_text="keywordParams" @fetchData="getText(item,$event)" :placeholder="item.placeholder" :size="size"></scInput>
+			<div v-if="item.keyword">
+				<scInput class="input" v-model:activation_text="keywordParams" @fetchData="getText(item,$event)" :placeholder="item.placeholder" :size="size"></scInput>
+			</div>
+			<div v-else>
+				<div v-if="typeof item.code == 'string'">
+					<scInput class="input" v-model:activation_text="params[item.code]" @fetchData="getText(item,$event)" :placeholder="item.placeholder" :size="size"></scInput>
+				</div>
+				<div v-else>
+					<scVgInput class="input" v-model:activation_text="params[item.code]" @fetchData="getText(item,$event)" :placeholder="item.placeholder" :size="size"></scVgInput>
+				</div>
+			</div>
 		</div>
 	</div>
 </template>
@@ -96,7 +106,7 @@ export default {
 						grouped[item.code] = {};
 					}
 				}
-				if (item.type === 'text') {
+				if (item.type === 'text' && Array.isArray(item.code)) {
 					item.code.forEach(code => {
 						if(!grouped[code]){
 							grouped[code] = {};
@@ -123,7 +133,7 @@ export default {
 						operator:operator,
 						value:operator=='link'?"":[]
 					}
-					grouped[item.code] = operator==''?"":params;
+					grouped[item.code] = operator=='' || operator== 'link'?"":params;
 				}
 			})
 			return grouped
diff --git a/src/scui.js b/src/scui.js
index 2d0357f..459a5d2 100644
--- a/src/scui.js
+++ b/src/scui.js
@@ -24,6 +24,7 @@ import ossImgListUpload from "./components/scUpload/uploadListImg";
 import scDatePicker from "./components/scDatePicker";
 import scMultipleSelect from "./components/scMultipleSelect";
 import scInput from "./components/scInput";
+import scVgInput from "./components/scInput/inputVague";
 import scSearch from "./components/scSearch";
 
 import scStatusIndicator from './components/scMini/scStatusIndicator'
@@ -73,6 +74,7 @@ export default {
 		app.component('scDatePicker', scDatePicker);
 		app.component('scMultipleSelect', scMultipleSelect);
 		app.component('scInput', scInput);
+		app.component('scVgInput', scVgInput);
 		app.component('scSearch', scSearch);
 
 		//注册全局指令
diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue
index 38e4942..be50191 100644
--- a/src/views/setting/company/index.vue
+++ b/src/views/setting/company/index.vue
@@ -77,9 +77,12 @@ export default {
 			selection: [],
 			searchList:[
 				{name:'开通日期',type:'date',code:'activation_date'},
-				{name:'公司名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称",},
-				{name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",},
-				{name:'关键字',type:'text',code:['domain','name','address','owner','mobile'],keyword:true},
+				{name:'公司名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称"},
+				{name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态"},
+				{name:'手机号',type:'text',code:'mobile',placeholder:"请输入手机号"},
+				{name:'公司地址',type:'text',code:['address'],placeholder:"请输入公司地址"},
+				{name:'负责人',type:'text',code:['owner'],placeholder:"请输入负责人"},
+				{name:'关键字',type:'text',code:['domain','name'],keyword:true},
 			],
 			params: {},
 		}