浏览代码

reactor:element-plus版本更新;

zhangchong 1 年之前
父节点
当前提交
32d60ce445

+ 1 - 1
package.json

@@ -25,7 +25,7 @@
 		"axios": "^1.4.0",
 		"dayjs": "^1.11.9",
 		"echarts": "^5.5.0",
-		"element-plus": "~2.4.4",
+		"element-plus": "^2.7.1",
 		"file-saver": "^2.0.5",
 		"html-docx-js-typescript": "^0.1.5",
 		"html2canvas": "^1.4.1",

+ 0 - 2
src/theme/element.scss

@@ -359,11 +359,9 @@
 }
 /* Select 选择器默认宽度
 ------------------------------- */
-/*
 .el-select {
 	--el-select-width: 220px;
 }
-*/
 // hover颜色样式加深
 .el-cascader-node:not(.is-disabled):focus,
 .el-cascader-node:not(.is-disabled):hover {

+ 13 - 6
src/views/business/order/index.vue

@@ -3,13 +3,20 @@
 		<el-card shadow="never">
 			<div class="flex-center-align mb20">
 				<span style="color: var(--el-text-color-regular); display: inline-block; width: 100px; text-align: right; padding-right: 12px">快捷查询</span>
-				<el-radio-group v-model="fastSearch" @change="fastSearchChange">
-					<el-radio-button label="all">全部</el-radio-button>
-					<el-radio-button label="city">市工单</el-radio-button>
-					<el-radio-button label="province">省工单</el-radio-button>
-				</el-radio-group>
+        <el-segmented v-model="fastSearch" :options="[
+          {
+            label:'全部',
+            value:'all'
+          },{
+            label:'市工单',
+            value:'city'
+          },{
+            label:'省工单',
+            value:'province'
+          }
+        ]" @change="fastSearchChange"/>
 				<el-checkbox-group v-model="checkList" class="ml15" @change="changeCheckList">
-					<el-checkbox label="IsSensitiveWord">敏感类工单</el-checkbox>
+					<el-checkbox value="IsSensitiveWord">敏感类工单</el-checkbox>
 				</el-checkbox-group>
 			</div>
 			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent label-width="100px">

+ 30 - 11
src/views/judicial/order/index.vue

@@ -3,13 +3,32 @@
 		<el-card shadow="never">
 			<div class="flex-center-align mb20">
 				<span style="color: var(--el-text-color-regular); display: inline-block; width: 100px; text-align: right; padding-right: 12px">快捷查询</span>
-				<el-radio-group v-model="fastSearch" @change="fastSearchChange">
-					<el-radio-button label="all">全部</el-radio-button>
-					<el-radio-button label="IsTheClueTrue">线索属实</el-radio-button>
-					<el-radio-button label="NoTheClueTrue">线索不属实</el-radio-button>
-					<el-radio-button label="IsPassTheBuckOrder">推诿工单</el-radio-button>
-					<el-radio-button label="IsEnforcementOrder">行政执法类工单</el-radio-button>
-				</el-radio-group>
+				<el-segmented
+					v-model="fastSearch"
+					:options="[
+						{
+							label: '全部',
+							value: 'all',
+						},
+						{
+							label: '线索属实',
+							value: 'IsTheClueTrue',
+						},
+						{
+							label: '线索不属实',
+							value: 'NoTheClueTrue',
+						},
+						{
+							label: '推诿工单',
+							value: 'IsPassTheBuckOrder',
+						},
+						{
+							label: '行政执法类工单',
+							value: 'IsEnforcementOrder',
+						},
+					]"
+					@change="fastSearchChange"
+				/>
 			</div>
 			<el-form :model="state.queryParams" ref="ruleFormRef" @submit.native.prevent label-width="100px">
 				<el-row :gutter="10">
@@ -361,9 +380,9 @@
 				<template #title="{ row }">
 					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
-        <template #isTheClueTrue="{row}">
-          <span>{{ row.isTheClueTrue !== null ? (row.isTheClueTrue ? '是' : '否') : '' }}</span>
-        </template>
+				<template #isTheClueTrue="{ row }">
+					<span>{{ row.isTheClueTrue !== null ? (row.isTheClueTrue ? '是' : '否') : '' }}</span>
+				</template>
 				<template #employeeName="{ row }">
 					<span
 						>{{ row.acceptorName }} <span v-if="row.acceptorStaffNo">[{{ row.acceptorStaffNo }}]</span>
@@ -538,7 +557,7 @@ const columns = ref<any[]>([
 	{
 		prop: 'isTheClueTrue',
 		label: '线索是否属实',
-		width: 120
+		width: 120,
 	},
 	{ prop: 'eventTypeName', label: '事项类型', width: 200 },
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 180, align: 'center' },

+ 5 - 5
src/views/todo/seats/accept/Voice-assistant.vue

@@ -518,15 +518,15 @@ const subscribe = () => {
 const staticMessage = other.deepClone(messageList.value);
 const filterMessage = (type: string) => {
 	switch (type) {
-		case '市民':
+    case 'all':
+      showMessageList.value = staticMessage;
+      break;
+		case 'user':
 			showMessageList.value = staticMessage.filter((item: any) => item.body.content.callSentenceInfo.role === 'user');
 			break;
-		case '坐席':
+		case 'agent':
 			showMessageList.value = staticMessage.filter((item: any) => item.body.content.callSentenceInfo.role === 'agent');
 			break;
-		case '全部':
-			showMessageList.value = staticMessage;
-			break;
 		default:
 			showMessageList.value = staticMessage;
 			break;

+ 31 - 18
src/views/todo/seats/accept/index.vue

@@ -7,11 +7,24 @@
 					<el-card shadow="never">
 						<div class="flex-center-between pb10">
 							<p class="border-title mb10">语音助手</p>
-							<el-radio-group v-model="voiceType" @change="changeVoiceType">
-								<el-radio-button label="全部" />
-								<el-radio-button label="市民" />
-								<el-radio-button label="坐席" />
-							</el-radio-group>
+							<el-segmented
+								v-model="voiceType"
+								:options="[
+									{
+										label: '全部',
+										value: 'all',
+									},
+									{
+										label: '市民',
+										value: 'user',
+									},
+									{
+										label: '坐席',
+										value: 'agent',
+									},
+								]"
+								@change="changeVoiceType"
+							/>
 						</div>
 						<voice-assistant @orderOverwrite="orderOverwrite" ref="voiceAssistantRef" />
 					</el-card>
@@ -49,8 +62,8 @@
 													(val) => {
 														ruleFormRef.resetFields('fromPhone');
 														state.ruleForm.fromPhone = null;
-														state.ruleForm.sourceChannel = val.dicDataName;
-														state.ruleForm.sourceChannelCode = val.dicDataValue;
+														state.ruleForm.sourceChannel = val?.dicDataName ?? null;
+														state.ruleForm.sourceChannelCode = val?.dicDataValue ?? null;
 													}
 												"
 											>
@@ -152,14 +165,14 @@
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 									<el-form-item label="来电人性别" prop="fromGender" :rules="[{ required: true, message: '请选择来电人性别', trigger: 'change' }]">
 										<el-radio-group v-model="state.ruleForm.fromGender">
-											<el-radio :label="item.key" v-for="item in state.genderOptions" :key="item.key">{{ item.value }}</el-radio>
+											<el-radio :value="item.key" v-for="item in state.genderOptions" :key="item.key">{{ item.value }}</el-radio>
 										</el-radio-group>
 									</el-form-item>
 								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 									<el-form-item label="来电人身份" prop="identityType" :rules="[{ required: true, message: '请选择来电人身份', trigger: 'change' }]">
 										<el-radio-group v-model="state.ruleForm.identityType" @change="selectIdentity">
-											<el-radio :label="item.key" v-for="item in state.identityTypeOptions" :key="item.key">{{ item.value }}</el-radio>
+											<el-radio :value="item.key" v-for="item in state.identityTypeOptions" :key="item.key">{{ item.value }}</el-radio>
 										</el-radio-group>
 									</el-form-item>
 								</el-col>
@@ -172,8 +185,8 @@
 											clearable
 											value-key="dicDataValue"
 											@change="(val:any) => {
-											state.ruleForm.licenceType = val.dicDataName;
-											state.ruleForm.licenceTypeCode = val.dicDataValue
+											state.ruleForm.licenceType = val?.dicDataName ?? null;
+											state.ruleForm.licenceTypeCode = val?.dicDataName ?? null;
 										}"
 										>
 											<el-option v-for="item in state.licenceTypeOptions" :key="item.dicDataValue" :label="item.dicDataName" :value="item" />
@@ -206,8 +219,8 @@
 											clearable
 											value-key="dicDataValue"
 											@change="(val:any) => {
-											state.ruleForm.ageRange = val.dicDataName;
-											state.ruleForm.ageRangeCode = val.dicDataValue
+											state.ruleForm.ageRange = val?.dicDataName ?? null;
+											state.ruleForm.ageRangeCode = val?.dicDataValue ?? null;
 										}"
 										>
 											<el-option v-for="item in state.ageRangeOptions" :key="item.dicDataValue" :label="item.dicDataName" :value="item" />
@@ -304,8 +317,8 @@
 											clearable
 											value-key="dicDataValue"
 											@change="(val:any) => {
-											state.ruleForm.pushType = val.dicDataName;
-											state.ruleForm.pushTypeCode = val.dicDataValue
+											state.ruleForm.pushType = val?.dicDataName ?? null;
+											state.ruleForm.pushTypeCode = val?.dicDataValue ?? null;
 										}"
 										>
 											<el-option v-for="item in state.pushTypeOptions" :key="item.dicDataValue" :label="item.dicDataName" :value="item" />
@@ -478,8 +491,8 @@
 										:rules="[{ required: true, message: '请选择是否行政执法工单', trigger: 'change' }]"
 									>
 										<el-radio-group v-model="state.ruleForm.isEnforcementOrder">
-											<el-radio :label="true">是</el-radio>
-											<el-radio :label="false">否</el-radio>
+											<el-radio :value="true">是</el-radio>
+											<el-radio :value="false">否</el-radio>
 										</el-radio-group>
 									</el-form-item>
 								</el-col>
@@ -684,7 +697,7 @@ state.ruleForm.acceptorStaffNo = userInfos.value.staffNo; // 员工工号
 const route = useRoute(); // 路由
 const router = useRouter(); // 路由
 
-const voiceType = ref('全部');
+const voiceType = ref('all');
 // 选择坐席还是市民通话内容
 const voiceAssistantRef = ref<RefType>();
 const changeVoiceType = () => {

+ 4 - 4
yarn.lock

@@ -2288,10 +2288,10 @@ electron-to-chromium@^1.4.601, electron-to-chromium@^1.4.668:
   resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.701.tgz#7335e5761331774b4dea54cd24a1b84861d45cdf"
   integrity sha512-K3WPQ36bUOtXg/1+69bFlFOvdSm0/0bGqmsfPDLRXLanoKXdA+pIWuf/VbA9b+2CwBFuONgl4NEz4OEm+OJOKA==
 
-element-plus@~2.4.4:
-  version "2.4.4"
-  resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.4.4.tgz"
-  integrity sha512-TlKubXJgxwhER0dw+8ULn9hr9kZjraV4R6Q/eidwWUwCKxwXYPBGmMKsZ/85tlxlhMYbcLZd/YZh6G3QkHX4fg==
+element-plus@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.7.1.tgz#c6d7328e9fa72bbb29751874b6e439b693c1bcd4"
+  integrity sha512-yk/vXFwJp0flMrd2kfcR0XlumhwtPjB19HJvwcf0n3DvRE7UK8LeSK14LVghSzk0TzPsFFElweMnZEEv7+MYuQ==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.3.1"