Эх сурвалжийг харах

reactor:退回审批是否允许再退回修改为布尔值;

zhangchong 7 сар өмнө
parent
commit
1f492f3696

+ 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
 # 数据共享平台请求地址

+ 1 - 1
src/views/business/return/audit.vue

@@ -220,7 +220,7 @@ const handleQuery = () => {
 	queryList();
 };
 /** 获取列表 */
-const requestParams = ref({});
+const requestParams = ref<EmptyObjectType>({});
 const queryList = () => {
 	state.loading = true;
 	requestParams.value = Other.deepClone(state.queryParams);

+ 1 - 1
src/views/business/return/components/Return-audit.vue

@@ -35,7 +35,7 @@
 							</el-radio-group>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" v-if="['ZiGong'].includes(themeConfig.appScope)">
+					<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" v-if="['ZiGong'].includes(themeConfig.appScope) && state.orderDetail.isReturnAgainShow">
 						<el-form-item label="是否允许再退回" prop="isReturnAgain" :rules="[{ required: true, message: '请选择是否允许再退回', trigger: 'change' }]" label-width="120px">
 							<el-radio-group v-model="state.ruleForm.isReturnAgain">
 								<el-radio :value="true">允许</el-radio>

+ 2 - 1
src/views/tels/phoneAction.vue

@@ -56,7 +56,8 @@ const proTableRef = ref<RefType>(); // 表格ref
 // 表格配置项
 const columns = ref<any[]>([
 	{ prop: 'userName', label: '坐席人员' },
-	{ prop: 'telNo', label: '工号' },
+	{ prop: 'telNo', label: '分机号' },
+	{ prop: 'staffNo', label: '工号' },
 	{ prop: 'groupId', label: '工作组', minWith: 150 },
 	{ prop: 'operateStateText', label: '动作类型', width: 200 },
 	{