zhangchong 2 роки тому
батько
коміт
0a43cdf9f6

+ 11 - 5
src/views/business/order/accept/orderEdit.vue

@@ -13,7 +13,7 @@
 						label-width="110px"
 						label-position="right"
 						scroll-to-error
-						v-loading="state.historyOrderLoading"
+						v-loading="state.formLoading"
 					>
 						<p class="border-title mb10">来电信息</p>
 						<el-row :gutter="0">
@@ -204,7 +204,7 @@
 							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 								<el-form-item label="" prop="acceptSms" :rules="[{ required: false, message: '请选择', trigger: 'blur' }]">
-									<el-checkbox v-model="state.ruleForm.acceptSms" label="受理短信" :disabled="state.ruleForm.needContact"/>
+									<el-checkbox v-model="state.ruleForm.acceptSms" label="受理短信" :disabled="state.ruleForm.needContact" />
 									<el-checkbox
 										v-model="state.ruleForm.needContact"
 										label="无需联系"
@@ -544,7 +544,7 @@
 			</el-col>
 		</el-row>
 		<!-- 拓展表单 -->
-		<ExpandForm ref="ExpandFormRef" @saveExpandForm="saveExpandForm" />
+		<ExpandForm ref="ExpandFormRef" @saveExpandForm="saveExpandForm" v-if="state.expandFormMouted"/>
 		<!-- 历史工单 -->
 		<History ref="HistoryOrderRef" @saveSlect="saveSlect" />
 		<!-- 提交流程 -->
@@ -588,8 +588,8 @@ const state = reactive<any>({
 		duplicateTitle: '',
 		duplicateId: '',
 		content: '',
-		acceptSms:false,
-		needContact:false
+		acceptSms: false,
+		needContact: false,
 	},
 	formLoading: false, // 表单加载状态
 	historyOrderLoading: false, // 历史工单加载状态
@@ -637,6 +637,7 @@ const state = reactive<any>({
 	},
 	knowledgeTotal: 0, // 知识库总条数
 	fileList: [],
+	expandFormMouted:false,
 });
 const ruleFormRef = ref();
 const queryParamsRef = ref();
@@ -945,6 +946,7 @@ const onSupplySubmit = () => {
 onMounted(async () => {
 	nextTick(async () => {
 		if (route.params.id) {
+			state.formLoading = true;
 			state.historyOrderLoading = true;
 			state.loading = true;
 			try {
@@ -988,6 +990,7 @@ onMounted(async () => {
 							};
 						}
 					});
+					state.expandFormMouted = true;
 				}
 				if (response.result.duplicateId) {
 					// 是否重复
@@ -1017,14 +1020,17 @@ onMounted(async () => {
 				};
 				knowretrievalPaged(state.ruleForm.hotspot);
 				state.historyOrderLoading = false;
+				state.formLoading = false;
 				state.loading = false;
 			} catch (error) {
 				state.historyOrderLoading = false;
+				state.formLoading = false;
 				state.loading = false;
 			}
 		} else {
 			ElMessage.warning('参数有误,请重新进入');
 			state.historyOrderLoading = false;
+			state.formLoading = false;
 			state.loading = false;
 		}
 	});

+ 3 - 3
src/views/business/order/components/ExpandForm.vue

@@ -658,8 +658,9 @@ const closed = () => {
 const problemCascaderRef = ref();
 const changeProblems = () => {
 	let currentNode = problemCascaderRef.value.getCheckedNodes();
-	if (currentNode[0].parent?.value === '26') {
-		// 专利code为26
+	console.log(currentNode,'1')
+	if (currentNode[0].parent?.value === '2000') {
+		// 专利code为2000
 		state.isPatent = true;
 	} else {
 		state.isPatent = false;
@@ -766,7 +767,6 @@ onMounted(async () => {
 					// 投诉
 					state.expandForm = response.result.orderComplain;
 				}
-				console.log(state.expandForm, response);
 				state.expandForm.licenceObj = {
 					//证件类型
 					dicDataValue: state.expandForm.licenceTypeCode,

+ 1 - 1
src/views/knowledge/apply/component/ApplyDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="knowledge-apply-add-container">
-		<el-dialog title="申请详情" v-model="state.isShowDialog" draggable>
+		<el-dialog title="申请详情" v-model="state.isShowDialog" draggable width="769px">
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">

+ 8 - 6
src/views/knowledge/apply/component/ApplyHandle.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="knowledge-apply-add-container">
-		<el-dialog title="知识申请处理" v-model="state.isShowDialog" draggable>
+		<el-dialog title="知识申请处理" v-model="state.isShowDialog" draggable width="769px">
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -61,7 +61,7 @@
 								clearable
 								:options="state.knowledgeOptions"
 								placeholder="请选择关联知识"
-								style="width: 85%"
+								style="width: calc(100% - 80px)"
 								@change="changeKonwledge"
 							/>
 							<el-button type="primary" link class="ml10" @click="createKnowledge">创建知识</el-button>
@@ -110,7 +110,7 @@ const state = reactive<any>({
 	ruleForm: {
 		knowledgeApplyType: 1,
 		KnowledgeId: '',
-		code:''
+		code: '',
 	},
 	orgData: [], // 上级
 	loading: false,
@@ -154,9 +154,11 @@ const onPreview = () => {
 };
 // 创建知识
 const createKnowledge = () => {
-	state.isShowDialog = false;
 	router.push({
-		path: '/knowledge/add',
+		name: 'knowledgeEdit',
+		params: {
+			tagsViewName: '创建知识',
+		},
 	});
 };
 // 保存
@@ -169,7 +171,7 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
 				id: state.ruleForm.id,
 				knowledgeId: state.ruleForm.knowledgeId,
 				opinion: state.ruleForm.opinion,
-				code:state.ruleForm.code
+				code: state.ruleForm.code,
 			};
 			KnowledgeHandle(request)
 				.then(() => {

+ 1 - 1
src/views/knowledge/apply/my/component/MyApplyAdd.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="knowledge-apply-add-container">
-		<el-dialog title="发起申请" v-model="state.isShowDialog" draggable>
+		<el-dialog title="发起申请" v-model="state.isShowDialog" draggable  width="769px">
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">

+ 1 - 1
src/views/knowledge/apply/my/component/MyApplyDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="knowledge-apply-add-container">
-		<el-dialog title="申请详情" v-model="state.isShowDialog" draggable>
+		<el-dialog title="申请详情" v-model="state.isShowDialog" draggable  width="769px">
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">

+ 1 - 1
src/views/knowledge/apply/my/component/MyApplyEdit.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="knowledge-apply-edit-container">
-		<el-dialog title="编辑申请" v-model="state.isShowDialog" draggable>
+		<el-dialog title="编辑申请" v-model="state.isShowDialog" draggable  width="769px">
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">

+ 7 - 2
src/views/knowledge/config/type/index.vue

@@ -66,7 +66,7 @@ const state = reactive({
 	tableData: <any>[], // 获取所有菜单
 	staticArr: <any>[], // 获取所有菜单
 	loading: false,
-	isExpand: true,
+	isExpand: false,
 	queryParams: {
 		keyword: '',
 	},
@@ -313,7 +313,12 @@ const getList = () => {
 		.then((res: any) => {
 			state.tableData = res?.result ?? [];
 			state.staticArr = res?.result ?? [];
-			getAllIds(state.tableData);
+			state.expandedRowKeys = state.tableData.map((v: any) => {
+				return v.children.map((i: any) => {
+					return i.id;
+				});
+			});
+			state.expandedRowKeys.push(state.tableData[0].id); //默认展开一级
 			state.loading = false;
 		})
 		.catch(() => {