瀏覽代碼

reactor:是否会签字段调整;

zhangchong 1 年之前
父節點
當前提交
0975d4913e

+ 1 - 1
src/components/OrderDetail/index.vue

@@ -761,7 +761,7 @@ const onVisitDetail = (row: any) => {
 // 特提
 const specialHandleOrderRef = ref<RefType>(); // 特提
 const onSpecialHandle = () => {
-	if (state.ruleForm.counterSignType || state.ruleForm.counterSignType === 0) {
+	if (state.ruleForm.status == 200) {
 		// 会签工单无法进行特提
 		ElMessage.warning('工单会签中,请先结束会签!');
 		return;

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

@@ -174,7 +174,7 @@ const onExport = () => {
 // 退回审批
 const orderReturnRef = ref<RefType>();
 const onAudit = (row: any) => {
-	if (row.counterSignType || row.counterSignType === 0) {
+	if (row.status == 200) {
 		// 会签工单无法进行特提
 		ElMessage.warning('工单会签中,请先结束会签!');
 		return;

+ 1 - 1
src/views/business/special/apply.vue

@@ -143,7 +143,7 @@ const onExport = () => {
 // 特提申请
 const specialApplyRef = ref<RefType>();
 const onSpecialApply = (row: any) => {
-	if (row.counterSignType || row.counterSignType === 0) {
+	if (row.status == 200) {
 		// 会签工单无法进行特提
 		ElMessage.warning('工单会签中,请先结束会签!');
 		return;

+ 2 - 2
src/views/knowledge/index/edit.vue

@@ -20,7 +20,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8" >
-            <el-skeleton style="width: 240px" :loading="state.loading" animated>
+            <el-skeleton :loading="state.loading" animated>
               <template #template>
                 <el-form-item label="知识分类" prop="knowledgeTypeId" :rules="[{ required: true, message: '请选择知识分类', trigger: 'change' }]">
                   <el-skeleton-item variant="h1"/>
@@ -79,7 +79,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
-            <el-skeleton style="width: 240px" :loading="state.loading" animated>
+            <el-skeleton :loading="state.loading" animated>
               <template #template>
                 <el-form-item label="来源部门" prop="sourceOrganizeId" :rules="[{ required: true, message: '请选择来源部门', trigger: 'change' }]">
                   <el-skeleton-item variant="h1"/>

+ 95 - 75
src/views/knowledge/index/index.vue

@@ -15,74 +15,94 @@
 						</el-tab-pane>
 					</el-tabs>
 					<el-scrollbar style="height: calc(100% - 100px);'" ref="scrollBarRef">
-						<el-tree-v2
-							v-show="state.activeName === '0'"
-							:data="state.orgData"
-							highlight-current
-							:expand-on-click-node="false"
-							:props="{ children: 'children', label: 'name' }"
-							@node-click="handleNodeClick"
-							ref="orgRef"
-							:filter-method="filterNode"
-							:item-size="40"
-							:height="treeHeight"
-							empty-text="暂无组织数据"
-              v-loading="state.loading"
-						>
-							<template #default="{ node }">
-								<span :title="node.label">{{ node.label }}</span>
+						<el-skeleton :loading="state.typeLoading" animated :rows="10" :style="state.activeName === '0' ? 'min-width: 100%; display: inline-block' : 'display:none'">
+							<template #default>
+								<el-tree-v2
+									:data="state.orgData"
+									highlight-current
+									:expand-on-click-node="false"
+									:props="{ children: 'children', label: 'name' }"
+									@node-click="handleNodeClick"
+									ref="orgRef"
+									:filter-method="filterNode"
+									:item-size="40"
+									:height="treeHeight"
+									empty-text="暂无组织数据"
+									v-show="state.activeName === '0'"
+								>
+									<template #default="{ node }">
+										<span :title="node.label">{{ node.label }}</span>
+									</template>
+								</el-tree-v2>
 							</template>
-						</el-tree-v2>
-						<el-tree
-							:data="state.knowledgeOptions"
-							highlight-current
-							:expand-on-click-node="false"
-							:props="{ children: 'children', label: 'name' }"
-							@node-click="handleNodeClick"
-							ref="typeRef"
-							:filter-node-method="filterNodeType"
-							node-key="id"
+						</el-skeleton>
+						<el-skeleton
+							:loading="state.typeLoading"
+							animated
+							:rows="10"
 							:style="state.activeName === '1' ? 'min-width: 100%; display: inline-block' : 'display:none'"
-              v-loading="state.typeLoading"
 						>
-						</el-tree>
-						<el-tree
-							node-key="id"
-							:load="loadNode"
-							lazy
-							v-if="lazyShow"
-							:props="{
-								label: 'hotSpotFullName',
-								children: 'children',
-								isLeaf: 'hasChild',
-							}"
-							:filter-node-method="filterNodeHot"
-							@node-click="handleNodeClick"
-							v-loading="loading"
-							highlight-current
-							check-strictly
-							:expand-on-click-node="false"
-							ref="hotRef"
-							:style="state.activeName === '2' ? 'min-width: 100%; display: inline-block' : 'display:none'"
-						/>
-						<el-tree
-							ref="hotRef"
-							:data="state.hotSpotData"
-							node-key="id"
-							v-else
-							default-expand-all
-							highlight-current
-							:props="{
-								label: 'hotSpotFullName',
-								children: 'children',
-							}"
-							v-loading="loading"
-							:filter-node-method="filterNodeHot"
-							@node-click="handleNodeClick"
-							:expand-on-click-node="false"
-							check-strictly
+							<template #default>
+								<el-tree
+									:data="state.knowledgeOptions"
+									highlight-current
+									:expand-on-click-node="false"
+									:props="{ children: 'children', label: 'name' }"
+									@node-click="handleNodeClick"
+									ref="typeRef"
+									:filter-node-method="filterNodeType"
+									node-key="id"
+									:style="state.activeName === '1' ? 'min-width: 100%; display: inline-block' : 'display:none'"
+								>
+								</el-tree>
+							</template>
+						</el-skeleton>
+						<el-skeleton
+							:loading="state.loading"
+							animated
+							:rows="10"
 							:style="state.activeName === '2' ? 'min-width: 100%; display: inline-block' : 'display:none'"
-						/>
+						>
+							<template #default>
+								<el-tree
+									node-key="id"
+									:load="loadNode"
+									lazy
+									v-if="lazyShow"
+									:props="{
+										label: 'hotSpotFullName',
+										children: 'children',
+										isLeaf: 'hasChild',
+									}"
+									:filter-node-method="filterNodeHot"
+									@node-click="handleNodeClick"
+									v-loading="loading"
+									highlight-current
+									check-strictly
+									:expand-on-click-node="false"
+									ref="hotRef"
+                  :style="state.activeName === '2' ? 'min-width: 100%; display: inline-block' : 'display:none'"
+								/>
+								<el-tree
+									ref="hotRef"
+									:data="state.hotSpotData"
+									node-key="id"
+									v-else
+									default-expand-all
+									highlight-current
+									:props="{
+										label: 'hotSpotFullName',
+										children: 'children',
+									}"
+									v-loading="loading"
+									:filter-node-method="filterNodeHot"
+									@node-click="handleNodeClick"
+									:expand-on-click-node="false"
+									check-strictly
+                  :style="state.activeName === '2' ? 'min-width: 100%; display: inline-block' : 'display:none'"
+								/>
+							</template>
+						</el-skeleton>
 					</el-scrollbar>
 				</pane>
 				<pane>
@@ -291,7 +311,7 @@ const state = reactive<any>({
 	knowledgeOptions: [], //知识库类型数据
 	statusOptions: [], //状态数据
 	hotSpotData: [], //热点数据
-  typeLoading: false, // 知识类型loading
+	typeLoading: false, // 知识类型loading
 });
 const router = useRouter(); //路由
 const ruleFormRef = ref<FormInstance>(); //表单ref
@@ -385,14 +405,14 @@ const getOrgListApi = async () => {
 };
 // 获取知识分类
 const getKnowledgeType = async () => {
-  state.typeLoading = true;
-  try {
-    const res: any = await treeList({ IsEnable: true });
-    state.knowledgeOptions = res.result ?? [];
-    state.typeLoading = false;
-  } catch (error) {
-    state.typeLoading = false;
-  }
+	state.typeLoading = true;
+	try {
+		const res: any = await treeList({ IsEnable: true });
+		state.knowledgeOptions = res.result ?? [];
+		state.typeLoading = false;
+	} catch (error) {
+		state.typeLoading = false;
+	}
 };
 /** 获取知识列表 */
 const queryList = () => {
@@ -576,8 +596,8 @@ const onRowDel = (row: any) => {
 	}
 };
 onMounted(() => {
-  getKnowledgeType();
-  getOrgListApi();
+	getKnowledgeType();
+	getOrgListApi();
 	queryList();
 });
 const scrollBarRef = ref<RefType>(); // 滚动条ref