From 9bd420a67a4ad1b4ea31b08634da66269b9b2dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Tue, 13 Aug 2024 23:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/orders.js                   |  8 +-
 src/components/scSearch/index.vue         |  6 +-
 src/views/login/index.vue                 |  2 +-
 src/views/order/dataConfirm/emailSync.vue |  3 +-
 src/views/order/dataConfirm/index.vue     | 94 +++++++++++++++--------
 src/views/setting/company/index.vue       |  2 +-
 src/views/setting/log/index.vue           |  2 +-
 src/views/setting/user/index.vue          |  2 +-
 8 files changed, 76 insertions(+), 43 deletions(-)

diff --git a/src/api/model/orders.js b/src/api/model/orders.js
index ebecf2d..ea2f239 100644
--- a/src/api/model/orders.js
+++ b/src/api/model/orders.js
@@ -53,7 +53,13 @@ export default {
 					return await http.post(this.url, params);
 				},
 			},
-
+			selectField:{
+				url: `${config.API_URL}/mail.select.field.list`,
+				name: "数据确认检索下拉",
+				post: async function (params) {
+					return await http.post(this.url, params);
+				},
+			},
 		},
 		maintenance:{
 			list:{
diff --git a/src/components/scSearch/index.vue b/src/components/scSearch/index.vue
index 921960f..ebd2dba 100644
--- a/src/components/scSearch/index.vue
+++ b/src/components/scSearch/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-for="item in columnList" :key="item">
-		<div class="searchItem" v-if="item.type == 'date'">
+		<div class="searchItem" v-if="item.type == 'date' && ((item.isOpen && item.show) || item.show)">
 			<label class="name">{{item.name}}</label>
 			<scDatePicker :size="size" v-model:activation_date="params[item.code]" @visible-change="getSelect(item,$event)" start-placeholder="开始日期" end-placeholder="结束日期"></scDatePicker>
 		</div>
@@ -12,8 +12,8 @@
 		</div>
 		<div class="searchItem" v-if="item.type == 'select' && ((item.isOpen && item.show) || item.show)">
 			<label class="name">{{item.name}}</label>
-			<el-select class="input" :size="size" v-model="params.active_status" @visible-change="getSelect(item,$event)" :placeholder="item.placeholder" filterable clearable>
-				<el-option v-for="em in item.data" :key="em" :label="em.label" :value="em.active_status"></el-option>
+			<el-select class="input" :size="size" v-model="params[item.code]" @visible-change="getSelect(item,$event)" :placeholder="item.placeholder" filterable clearable>
+				<el-option v-for="em in item.data" :key="em" :label="em.label" :value="em[item.code[0]] || em.active_status"></el-option>
 			</el-select>
 		</div>
 		<div class="searchItem" v-if="item.type == 'text' && ((item.isOpen && item.show) || item.show)">
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 34814d5..056c0cd 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -157,7 +157,7 @@
 			align-items: center;
 		}
 		h2{
-			height: 40px;
+			height: 36px;
 			display: flex;
 			align-items: baseline;
 			font-size: 24px;
diff --git a/src/views/order/dataConfirm/emailSync.vue b/src/views/order/dataConfirm/emailSync.vue
index 9c3bd06..3340d77 100644
--- a/src/views/order/dataConfirm/emailSync.vue
+++ b/src/views/order/dataConfirm/emailSync.vue
@@ -4,7 +4,7 @@
 		title=""
 		trigger="click"
 		content=""
-		width="120"
+		width="300"
 		v-bind="$attrs"
 		:visible="show"
 	>
@@ -51,7 +51,6 @@ export default {
 	methods:{
 		getWsResult(res){
 			if(res.data && (res.data.type == 16)){
-				this.refreshShow = true;
 				this.$emit('updateSync', res.data);
 			}
 		},
diff --git a/src/views/order/dataConfirm/index.vue b/src/views/order/dataConfirm/index.vue
index cad958a..97f0558 100644
--- a/src/views/order/dataConfirm/index.vue
+++ b/src/views/order/dataConfirm/index.vue
@@ -9,7 +9,7 @@
 						<span class="item notStarted">未确认</span>
 						<span class="item part">部分确认</span>
 					</span>
-					<emailSync @refreshDom="refreshDom" :show="refreshShow" :text="syncText">
+					<emailSync @updateSync="refreshDom" :show="refreshShow" :text="syncText">
 						<span class="refreshEmail" @click="manualClick"><el-icon><sc-icon-Refresh/></el-icon></span>
 					</emailSync>
 				</el-header>
@@ -194,30 +194,33 @@ export default {
 			emailId:'',
 			searchShow:false,
 			searchList:[
-				{name:'单号',type:'text',code:['sn'],placeholder:"请输入单号",isOpen:true,show:true},
-				{name:'SN号',type:'text',code:['serial_number'],placeholder:"请输入SN号",isOpen:true,show:true},
-				{name:'Aliid',type:'text',code:['aliid'],placeholder:"请输入Aliid",isOpen:true,show:true},
-				{name:'PE确认日期',type:'date',code:'pe_confirmation_time'},
-				{name:'故障类型',type:'select',code:'fault_type',data:[],placeholder:"请选择故障类型",show:true},
-				{name:'近期维修',type:'text',code:['recent_repair'],placeholder:"请输入近期维修",isOpen:true,show:true},
-				{name:'机架',type:'select',code:'rack',data:[],placeholder:"请选择机架",isOpen:true,show:true},
-				{name:'机型',type:'select',code:['serial_number'],data:[],placeholder:"请选择机型",isOpen:true,show:true},
-				{name:'阿里机型',type:'select',code:['serial_number'],data:[],placeholder:"请选择阿里机型",isOpen:true,show:true},
-				{name:'通知时间',type:'date',code:['serial_number'],isOpen:true,show:true},
-				{name:'描述',type:'text',code:['serial_number'],placeholder:"请输入描述",isOpen:true,show:true},
-				{name:'维修分类',type:'select',code:['serial_number'],placeholder:"请选择维修分类",isOpen:true,show:true},
-				{name:'预约时间',type:'date',code:['serial_number'],isOpen:true,show:true},
-				{name:'过保时间',type:'date',code:['serial_number'],isOpen:true,show:true},
-				{name:'4BD SLA 截止时间',type:'date',code:['serial_number'],isOpen:true,show:true},
-				{name:'15BD SLA 截止时间',type:'date',code:['serial_number'],isOpen:true,show:true},
-				{name:'序列号',type:'text',code:['serial_number'],placeholder:"请输入序列号",isOpen:true,show:true},
-				{name:'厂商',type:'select',code:['serial_number'],data:[],placeholder:"请选择厂商",isOpen:true,show:true},
-				{name:'型号',type:'select',code:['serial_number'],data:[],placeholder:"请选择型号",isOpen:true,show:true},
-				{name:'槽位号',type:'text',code:['serial_number'],placeholder:"请输入槽位号",isOpen:true,show:true},
-				{name:'固件版本号',type:'text',code:['serial_number'],placeholder:"请输入固件版本号",isOpen:true,show:true},
-				{name:'物料编号',type:'text',code:['serial_number'],placeholder:"请输入物料编号",isOpen:true,show:true},
-				{name:'速率',type:'text',code:['serial_number'],placeholder:"请输入速率",isOpen:true,show:true},
-				{name:'类型',type:'select',code:['type'],data:[],placeholder:"请输选择类型",isOpen:true,show:true},
+				{name:'是否确认',type:'select',code:['is_confirm'],data:[],placeholder:"请选择",isOpen:true,show:false},
+				{name:'单号',type:'text',code:['sn'],placeholder:"请输入单号",isOpen:true,show:false},
+				{name:'SN号',type:'text',code:['serial_number'],placeholder:"请输入SN号",isOpen:true,show:false},
+				{name:'Aliid',type:'text',code:['aliid'],placeholder:"请输入Aliid",isOpen:true,show:false},
+				{name:'PE确认日期',type:'date',code:'pe_confirmation_time',show:true},
+				{name:'故障类型',type:'select',code:['fault_type'],data:[],placeholder:"请选择故障类型",isOpen:true,show:false},
+				{name:'近期维修',type:'select',code:['recent_repair'],data:[],placeholder:"请输入近期维修",isOpen:true,show:false},
+				{name:'机架',type:'select',code:['rack'],data:[],placeholder:"请选择机架",isOpen:true,show:false},
+				{name:'机型',type:'select',code:['model'],data:[],placeholder:"请选择机型",isOpen:true,show:false},
+				{name:'阿里机型',type:'select',code:['ali_model'],data:[],placeholder:"请选择阿里机型",isOpen:true,show:false},
+				{name:'通知时间',type:'date',code:['notification_time'],show:true},
+				{name:'描述',type:'text',code:['description'],placeholder:"请输入描述",isOpen:true,show:false},
+				{name:'维修分类',type:'select',code:['maintenance_category'],data:[],placeholder:"请选择维修分类",isOpen:true,show:false},
+				{name:'预约时间',type:'date',code:['scheduled_time'],show:true},
+				{name:'过保时间',type:'date',code:['warranty_expiry_time'],show:true},
+				{name:'4BD SLA 截止时间',type:'date',code:['4bd_sla_expiry_time'],isOpen:true,show:false},
+				{name:'15BD SLA 截止时间',type:'date',code:['15bd_sla_expiry_time'],isOpen:true,show:false},
+				{name:'序列号',type:'text',code:['manufacturer_serial_number'],placeholder:"请输入序列号",isOpen:true,show:false},
+				{name:'厂商',type:'select',code:['manufacturer'],data:[],placeholder:"请选择厂商",isOpen:true,show:false},
+				{name:'型号',type:'select',code:['product_model'],data:[],placeholder:"请选择型号",isOpen:true,show:false},
+				{name:'槽位号',type:'text',code:['slot_number'],placeholder:"请输入槽位号",isOpen:true,show:false},
+				{name:'固件版本号',type:'text',code:['firmware_version'],placeholder:"请输入固件版本号",isOpen:true,show:false},
+				{name:'大小',type:'select',code:['size'],data:[],placeholder:"请输入大小",isOpen:true,show:false},
+				{name:'物料编号',type:'text',code:['material_number'],placeholder:"请输入物料编号",isOpen:true,show:false},
+				{name:'速率',type:'select',code:['speed'],data:[],placeholder:"请输入速率",isOpen:true,show:false},
+				{name:'类型',type:'select',code:['type'],data:[],placeholder:"请输选择类型",isOpen:true,show:false},
+				{name:'创建时间',type:'date',code:['created_at'],isOpen:true,show:false},
 			],
 			emailParams: {},
 			toggleIndex: 0,
@@ -353,13 +356,16 @@ export default {
 			}
 		},
 		async manualClick() {
-			const res = await this.$API.orders.order.mail.manual.post();
-			if(res.code == 200){
-				await this.getData();
-			}
+			await this.$API.orders.order.mail.manual.post();
 		},
-		refreshDom(res){
-			this.syncText = res;
+		refreshDom(params){
+			if(params.type == 16){
+				this.refreshShow = params.current == params.limit?false:true
+				this.syncText = params.msg;
+				if(params.status == 1){
+					this.getData();
+				}
+			}
 		},
 		seeEmail(){
 			this.$router.push({
@@ -370,8 +376,30 @@ export default {
 			})
 		},
 
-		getSelectData(){
-
+		async getSelectData(item) {
+			let {data, params} = item;
+			let searchParams = this.$TOOL.objCopy(params);
+			searchParams.field = ""
+			if(typeof data.code === String){
+				searchParams.field = data.code;
+			}else{
+				searchParams.field = data.code[0];
+			}
+			if(data.type == 'select'){
+				const res = await this.$API.orders.order.mail.selectField.post(searchParams);
+				if(res.code == 200){
+					if(res.data && res.data.length>0){
+						res.data.forEach(item=>{
+							item.label = item[data.code];
+						})
+					}
+					this.searchList.forEach(item=>{
+						if(item.code == data.code){
+							item.data = res.data;
+						}
+					})
+				}
+			}
 		},
 		searchShowClick(){
 			this.searchShow = !this.searchShow;
diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue
index fe2b696..8bfac1f 100644
--- a/src/views/setting/company/index.vue
+++ b/src/views/setting/company/index.vue
@@ -101,7 +101,7 @@ export default {
 			exportShow:false,
 			searchShow:false,
 			searchList:[
-				{name:'开通日期',type:'date',code:'activation_date'},
+				{name:'开通日期',type:'date',code:'activation_date',show:true},
 				{name:'公司名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称",show:true},
 				{name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",show:true},
 				{name:'手机号',type:'text',code:['mobile'],placeholder:"请输入手机号",isOpen:true,show:false},
diff --git a/src/views/setting/log/index.vue b/src/views/setting/log/index.vue
index 1cca487..d21b1b3 100644
--- a/src/views/setting/log/index.vue
+++ b/src/views/setting/log/index.vue
@@ -44,7 +44,7 @@
 				},
 				exportShow:false,
 				searchList:[
-					{name:'操作日期',type:'date',code:'created_at'},
+					{name:'操作日期',type:'date',code:'created_at',show:true},
 					{name:'操作功能',type:'multiple',code:'type', data:[], placeholder:"请选择功能",show:true},
 					{name:'关键字',type:'text',code:['remark','ip','location','creator_name'],keyword:true,show:true},
 				],
diff --git a/src/views/setting/user/index.vue b/src/views/setting/user/index.vue
index e55e24a..2119ad2 100644
--- a/src/views/setting/user/index.vue
+++ b/src/views/setting/user/index.vue
@@ -127,7 +127,7 @@
 				exportShow:false,
 				searchShow:false,
 				searchList:[
-					{name:'创建日期',type:'date',code:'activation_date'},
+					{name:'创建日期',type:'date',code:'activation_date',show:true},
 					{name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",show:true},
 					{name:'联系方式',type:'text',code:['mobile'],placeholder:"请输入手机号",isOpen:true,show:false},
 					{name:'姓名',type:'text',code:['name'],placeholder:"请输入姓名",isOpen:true,show:false},