Merge branch 'dev' into release

.env.development

@@ -3,11 +3,11 @@ VITE_MODE_NAME=development
 # 防止部署多套系统到同一域名不同目录时，变量共用的问题 设置不同的前缀
 VITE_STORAGE_NAME=dev
 # 基础请求地址
-VITE_API_URL=http://110.188.24.28:50300
+VITE_API_URL=http://110.188.24.28:50100
 # 数据共享平台请求地址
 VITE_DATASHARE_API_YRL=http://ds.12345lm.cn
 # socket API
-VITE_API_SOCKET_URL=http://110.188.24.28:50300/hubs/hotline
+VITE_API_SOCKET_URL=http://110.188.24.28:50100/hubs/hotline
 # 上传 API
 VITE_API_UPLOAD_URL=http://110.188.24.28:50120
 # 文件上传地址前缀

src/components/OrderDetail/index.vue

@@ -310,43 +310,43 @@
 				<el-row :gutter="10">
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<el-form-item label="回访状态">
-							{{ state.ruleForm?.orderVisits[0]?.visitStateText }}
+							{{ state.ruleForm?.orderVisits[state.ruleForm?.orderVisits.length - 1]?.visitStateText }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<el-form-item label="回访方式">
-							{{ state.ruleForm?.orderVisits[0]?.visitTypeText }}
+							{{ state.ruleForm?.orderVisits[state.ruleForm?.orderVisits.length - 1]?.visitTypeText }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<el-form-item label="当前回访人">
-							{{ state.ruleForm?.orderVisits[0]?.employeeName }}
+							{{ state.ruleForm?.orderVisits[state.ruleForm?.orderVisits.length - 1]?.employeeName }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<el-form-item label="回访任务创建时间" label-width="130px">
-							{{ formatDate(state.ruleForm?.orderVisits[0]?.creationTime, 'YYYY-mm-dd HH:MM:SS') }}
+							{{ formatDate(state.ruleForm?.orderVisits[state.ruleForm?.orderVisits.length - 1]?.creationTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<el-form-item label="回访时间">
-							{{ formatDate(state.ruleForm?.orderVisits[0]?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}
+							{{ formatDate(state.ruleForm?.orderVisits[state.ruleForm?.orderVisits.length - 1]?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 						<el-form-item label="回访标签">
 							<span v-if="state.ruleForm?.orderVisits[0]?.isPutThrough !== null">{{
-								state.ruleForm?.orderVisits[0]?.isPutThrough ? '已接通' : '未接通'
+								state.ruleForm?.orderVisits[state.ruleForm?.orderVisits.length - 1]?.isPutThrough ? '已接通' : '未接通'
 							}}</span>
 						</el-form-item>
 					</el-col>
 				</el-row>
-				<el-row v-for="item in state.ruleForm?.orderVisits[0]?.orderVisitDetails" :key="item.id" :gutter="10">
+				<el-row v-for="item in state.ruleForm?.orderVisits[state.ruleForm?.orderVisits.length - 1]?.orderVisitDetails" :key="item.id" :gutter="10">
 					<!-- 务员评价 -->
 					<template v-if="item.visitTarget === 10">
 						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 							<el-divider content-position="left">
-								<el-text tag="b" size="large"> 话务员回访 </el-text>
+								<el-text tag="b" size="large" type="primary"> 话务员回访 </el-text>
 							</el-divider>
 						</el-col>
 						<el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
@@ -369,7 +369,7 @@
 					<template v-if="item.visitTarget === 20">
 						<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 							<el-divider content-position="left">
-								<el-text tag="b" size="large"> {{ item.visitOrgName }} </el-text>
+								<el-text tag="b" size="large" type="primary"> {{ item.visitOrgName }} </el-text>
 							</el-divider>
 						</el-col>
 						<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">

src/views/todo/seats/accept/Citizen-portrait.vue

@@ -39,7 +39,7 @@
 							<span class="flex-1">{{ state.order.handOrderNum }}</span>
 						</p>
 						<p class="form-item">
-							<span class="form-label" style="width:65px">不满意工单:</span>
+							<span class="form-label" style="width:75px">不满意工单:</span>
 							<span class="flex-1">{{ state.order.dissatisfactionNum }}</span>
 						</p>
 					</div>
@@ -251,11 +251,10 @@ defineExpose({
 			.form-item {
 				display: flex;
 				margin-bottom: 10px;
-        font-size: var(--el-font-size-extra-small);
         align-items:baseline;
 				.form-label {
 					margin-right: 5px;
-          width: 55px;
+          width: 60px;
 				}
 				.flex-1 {
 					flex: 1;

src/views/todo/seats/accept/Copy.vue

@@ -190,7 +190,6 @@ const queryList = async () => {
 			.catch((err) => {
 				state.loading = false;
 			});
-		state.loading = false;
 	} catch (e) {
 		state.loading = false;
 	}