Quellcode durchsuchen

Merge branch 'release' into dev

zhangchong vor 7 Monaten
Ursprung
Commit
3520c9abab

+ 2 - 2
.env.development

@@ -3,9 +3,9 @@ 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
 # 业务系统socket请求地址
-VITE_API_SOCKET_URL=http://110.188.24.28:50300/hubs/hotline
+VITE_API_SOCKET_URL=http://110.188.24.28:50100/hubs/hotline
 # 业务系统文件上传上传请求地址
 VITE_API_UPLOAD_URL=http://open.fs.12345lm.cn
 # 数据共享平台请求地址

+ 12 - 7
src/views/business/visit/component/Visit-batch.vue

@@ -80,12 +80,7 @@
 								collapse-tags
 								clearable
 								collapse-tags-tooltip
-								@change="
-									(val) => {
-										state.ruleForm.orgNoSatisfiedReason.value = val?.dicDataName;
-										state.ruleForm.orgNoSatisfiedReason.key = val?.dicDataValue;
-									}
-								"
+								@change="selectReason"
 							>
 								<el-option v-for="items in dissatisfiedReason" :key="items.dicDataValue" :label="items.dicDataName" :value="items" />
 							</el-select>
@@ -142,7 +137,7 @@
 <script setup lang="ts">
 import { defineAsyncComponent, reactive, ref } from 'vue';
 import { ElNotification, FormInstance } from 'element-plus';
-import { visitAddBaseData, visitAddBatch, visitTurnSatisfaction } from '@/api/business/visit';
+import { visitAddBaseData, visitAddBatch } from '@/api/business/visit';
 import { useUserInfo } from '@/stores/userInfo';
 import { storeToRefs } from 'pinia';
 import { commonEnum } from '@/utils/constants';
@@ -212,6 +207,16 @@ const dialogRef = ref<RefType>(); // 弹窗ref
 const mouseup = () => {
 	state.transform = dialogRef.value.dialogContentRef.$el.style.transform;
 };
+// 选择不满意原本
+const selectReason = (val: any) => {
+	state.ruleForm.orgNoSatisfiedReason = val.map((item: any) => {
+		return {
+			...item,
+			value: item.dicDataName,
+			key: item.dicDataValue,
+		};
+	});
+};
 // 保存
 const onAudit = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;

+ 2 - 1
src/views/business/visit/component/Visit-detail.vue

@@ -271,7 +271,7 @@
 													:prop="`visitDetails.${index}.voiceEvaluate`"
 													:rules="[{ required: true, message: '请选择语音评价', trigger: 'change' }]"
 												>
-													<el-radio-group v-model="item.viceEvaluate">
+													<el-radio-group v-model="item.voiceEvaluate">
 														<el-radio v-for="items in viceEvaluate" :key="items.key" :label="items.value" :value="items.key">{{
 															items.value
 														}}</el-radio>
@@ -660,6 +660,7 @@ const selectReason = (val: any, index: number | string) => {
 			key: item.dicDataValue,
 		};
 	});
+	console.log(state.ruleForm.visitDetails[index].orgNoSatisfiedReason,'111')
 };
 const close = () => {
 	ruleFormRef.value?.clearValidate();