From 582a8ffb734e9b06536eef02ce90e1c1e01ee5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Wed, 14 Aug 2024 20:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=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/views/order/dataConfirm/index.vue | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/views/order/dataConfirm/index.vue b/src/views/order/dataConfirm/index.vue
index 97f0558..c24296e 100644
--- a/src/views/order/dataConfirm/index.vue
+++ b/src/views/order/dataConfirm/index.vue
@@ -10,7 +10,7 @@
 						<span class="item part">部分确认</span>
 					</span>
 					<emailSync @updateSync="refreshDom" :show="refreshShow" :text="syncText">
-						<span class="refreshEmail" @click="manualClick"><el-icon><sc-icon-Refresh/></el-icon></span>
+						<span class="refreshEmail" @click="manualClick"><el-icon size="16px"><sc-icon-Refresh/></el-icon></span>
 					</emailSync>
 				</el-header>
 				<el-main class="nopadding" v-loading="listLoading" element-loading-text="加载中...">
@@ -68,7 +68,8 @@
 					</div>
 					<el-table class="scTable" :header-cell-class-name="setClassName" :data="emailData.rows" ref="table" :row-key="rowKey" :key="toggleIndex" :header-cell-style="{'background': '#F5F7FA','color':'#606266'}" @selection-change="selectionChange"  stripe :size="size">
 						<el-table-column type="selection" align="center" width="45" :selectable="selectable"></el-table-column>
-						<el-table-column label="序号" align="center" type="index"></el-table-column>
+<!--						<sc-table-column label="序号" align="center" type="index"></sc-table-column>-->
+						<el-table-column label="序号" align="center" type="index" :index-method="customIndexMethod"></el-table-column>
 						<template v-for="(item, index) in userColumn" :key="index">
 							<template v-if="item.prop == 'description'">
 								<el-table-column v-if="!item.hide" :column-key="item.prop" :label="item.label" :prop="item.prop" :width="item.width" :sortable="item.sortable" :fixed="item.fixed" :filters="item.filters">
@@ -93,7 +94,7 @@
 								<el-table-column v-if="!item.hide" :column-key="item.prop" :label="item.label" :prop="item.prop" :width="item.width" :sortable="item.sortable" :fixed="item.fixed" :filters="item.filters" show-overflow-tooltip>
 									<template #default="scope">
 										<slot :name="item.prop" v-bind="scope">
-											{{scope.row[item.prop]}}
+											{{item.prop == 'is_confirm'?scope.row[item.prop]?'已确认':'未确认':scope.row[item.prop]}}
 										</slot>
 									</template>
 								</el-table-column>
@@ -193,6 +194,7 @@ export default {
 
 			emailId:'',
 			searchShow:false,
+			searchData:{},
 			searchList:[
 				{name:'是否确认',type:'select',code:['is_confirm'],data:[],placeholder:"请选择",isOpen:true,show:false},
 				{name:'单号',type:'text',code:['sn'],placeholder:"请输入单号",isOpen:true,show:false},
@@ -263,6 +265,10 @@ export default {
 		this.getData();
 	},
 	methods: {
+		customIndexMethod(index){
+			const start = (this.currentPage - 1) * this.scPageSize + 1;
+			return 	start + index
+		},
 		setClassName({ column }) {
 			if (column.type == 'selection' && this.isAllDisabled) {
 				return 'all-disabled'
@@ -302,14 +308,17 @@ export default {
 
 		emailChange(item,isChange) {
 			this.emailId = isChange?item.id:this.emailId>0?this.emailId:item.id;
+			this.searchData = {};
+			this.$refs.scSearch.reload();
 			this.getEmailData();
 		},
 		async getEmailData() {
-			let params = {
+			let params = Object.assign({},{
 				mail_data_id: this.emailId,
 				pageSize:this.scPageSize,
 				page:this.currentPage
-			}
+			},this.searchData);
+
 			this.loading = true;
 			const res = await this.$API.orders.order.mail.detail.post(params);
 			if (res.code == 200) {
@@ -378,7 +387,9 @@ export default {
 
 		async getSelectData(item) {
 			let {data, params} = item;
+			this.searchData = params;
 			let searchParams = this.$TOOL.objCopy(params);
+			searchParams.mail_data_id = this.emailId;
 			searchParams.field = ""
 			if(typeof data.code === String){
 				searchParams.field = data.code;
@@ -413,6 +424,8 @@ export default {
 			this.getEmailData();
 		},
 		reset(){
+			this.searchData = {};
+			this.$refs.scSearch.reload();
 			this.getEmailData();
 		},
 		downFile(info){