Merge branch 'master' into dev

# Conflicts:
#	src/views/tels/callLog/index.vue

src/views/tels/callLog/index.vue

@@ -199,56 +199,7 @@ const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/
 
 const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
-const columns = ref<any[]>([
-	{ prop: 'cpn', label: '主叫', width: 120 },
-	{ prop: 'cdpn', label: '被叫', width: 120 },
-	{ prop: 'ringTimes', label: '响铃次数', width: 110 },
-	{ prop: 'gateway', label: '中继号', width: 120 },
-	{ prop: 'duration', label: '通话时间(秒)', width: 120 },
-	{ prop: 'onStateText', label: '通话结果' },
-	{ prop: 'callDirectionText', label: '电话方向' },
-	{ prop: 'endByText', label: '挂机类型', width: 120 },
-	{
-		prop: 'beginIvrTime',
-		label: 'ivr开始时间',
-		width: 170,
-		render: (scope) => <span>{formatDate(scope.row.beginIvrTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
-	},
-	{
-		prop: 'endIvrTime',
-		label: 'ivr结束时间',
-		width: 170,
-		render: (scope) => <span>{formatDate(scope.row.endIvrTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
-	},
-	{
-		prop: 'beginQueueTime',
-		label: '队列开始时间',
-		width: 170,
-		render: (scope) => <span>{formatDate(scope.row.beginQueueTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
-	},
-	{
-		prop: 'endQueueTime',
-		label: '队列结束时间',
-		width: 170,
-		render: (scope) => {
-			return <span>{formatDate(scope.row.endQueueTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
-		},
-	},
-	{
-		prop: 'createdTime',
-		label: '开始时间',
-		width: 170,
-		render: (scope) => <span>{formatDate(scope.row.createdTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
-	},
-	{
-		prop: 'answeredTime',
-		label: '接通时间',
-		width: 170,
-		render: (scope) => <span>{formatDate(scope.row.answeredTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
-	},
-	{ prop: 'overTime', label: '挂断时间', width: 170, render: (scope) => <span>{formatDate(scope.row.overTime, 'YYYY-mm-dd HH:MM:SS')}</span> },
-	{ prop: 'operation', label: '操作', fixed: 'right', width: 240, align: 'center' },
-]);
+const columns = ref<any[]>([]);
 // 定义变量内容
 const state = reactive({
 	queryParams: {
@@ -312,6 +263,19 @@ const allColumns = [
 	{ prop: 'onStateText', label: '通话结果' },
 	{ prop: 'callDirectionText', label: '电话方向' },
 	{ prop: 'endByText', label: '挂机类型', width: 120 },
+  {
+    prop: 'createdTime',
+    label: '开始时间',
+    width: 170,
+    render: (scope) => <span>{formatDate(scope.row.createdTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
+  },
+  {
+    prop: 'answeredTime',
+    label: '接通时间',
+    width: 170,
+    render: (scope) => <span>{formatDate(scope.row.answeredTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
+  },
+  { prop: 'overTime', label: '挂断时间', width: 170, render: (scope) => <span>{formatDate(scope.row.overTime, 'YYYY-mm-dd HH:MM:SS')}</span> },
 	{
 		prop: 'beginIvrTime',
 		label: 'ivr开始时间',
@@ -354,19 +318,6 @@ const allColumns = [
 			return <span>{formatDate(scope.row.endRingTimg, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
 	},
-	{
-		prop: 'createdTime',
-		label: '开始时间',
-		width: 170,
-		render: (scope) => <span>{formatDate(scope.row.createdTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
-	},
-	{
-		prop: 'answeredTime',
-		label: '接通时间',
-		width: 170,
-		render: (scope) => <span>{formatDate(scope.row.answeredTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
-	},
-	{ prop: 'overTime', label: '挂断时间', width: 170, render: (scope) => <span>{formatDate(scope.row.overTime, 'YYYY-mm-dd HH:MM:SS')}</span> },
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 310, align: 'center' },
 ];
 // 呼入表头
@@ -380,6 +331,19 @@ const inColumns = [
 	{ prop: 'userName', label: '话务员', width: 120 },
 	{ prop: 'duration', label: '通话时间(秒)', width: 120 },
 	{ prop: 'endByText', label: '挂机类型', width: 120 },
+  {
+    prop: 'createdTime',
+    label: '开始时间',
+    width: 170,
+    render: (scope) => <span>{formatDate(scope.row.createdTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
+  },
+  {
+    prop: 'answeredTime',
+    label: '接通时间',
+    width: 170,
+    render: (scope) => <span>{formatDate(scope.row.answeredTime, ' YYYY-mm-dd HH:MM:SS')}</span>,
+  },
+  { prop: 'overTime', label: '挂断结束时间', width: 170, render: (scope) => <span>{formatDate(scope.row.overTime, 'YYYY-mm-dd HH:MM:SS')}</span> },
 	{
 		prop: 'beginIvrTime',
 		label: 'ivr开始时间',
@@ -422,19 +386,6 @@ const inColumns = [
 			return <span>{formatDate(scope.row.endRingTimg, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
 	},
-	{
-		prop: 'createdTime',
-		label: '开始时间',
-		width: 170,
-		render: (scope) => <span>{formatDate(scope.row.createdTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
-	},
-	{
-		prop: 'answeredTime',
-		label: '接通时间',
-		width: 170,
-		render: (scope) => <span>{formatDate(scope.row.answeredTime, ' YYYY-mm-dd HH:MM:SS')}</span>,
-	},
-	{ prop: 'overTime', label: '挂断结束时间', width: 170, render: (scope) => <span>{formatDate(scope.row.overTime, 'YYYY-mm-dd HH:MM:SS')}</span> },
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 310, align: 'center' },
 ];
 // 呼出表头
@@ -469,7 +420,13 @@ const noColumns = [
 	{ prop: 'gateway', label: '中继号码', width: 120 },
 	{ prop: 'userName', label: '话务员' },
 	{ prop: 'callDirectionText', label: '电话方向' },
-	{ prop: 'endByText', label: '挂机类型', width: 120 },
+  {
+    prop: 'createdTime',
+    label: '开始时间',
+    width: 170,
+    render: (scope) => <span>{formatDate(scope.row.createdTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
+  },
+  { prop: 'overTime', label: '挂断时间', width: 170, render: (scope) => <span>{formatDate(scope.row.overTime, 'YYYY-mm-dd HH:MM:SS')}</span> },
 	{
 		prop: 'beginIvrTime',
 		label: 'ivr开始时间',
@@ -512,13 +469,6 @@ const noColumns = [
 			return <span>{formatDate(scope.row.endRingTimg, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
 	},
-	{
-		prop: 'createdTime',
-		label: '开始时间',
-		width: 170,
-		render: (scope) => <span>{formatDate(scope.row.createdTime, 'YYYY-mm-dd HH:MM:SS')}</span>,
-	},
-	{ prop: 'overTime', label: '挂断时间', width: 170, render: (scope) => <span>{formatDate(scope.row.overTime, 'YYYY-mm-dd HH:MM:SS')}</span> },
 ];
 const changeTba = () => {
 	ruleFormRef.value.resetFields();