Explorar o código

fix:甄别申请附件上传传入;

zhangchong hai 1 ano
pai
achega
eed22a219d

+ 5 - 225
package-lock.json

@@ -17,15 +17,9 @@
 				"@wangeditor/editor": "^5.1.23",
 				"@wangeditor/editor-for-vue": "^5.1.12",
 				"axios": "^1.4.0",
-				"bin-datav": "^0.2.0",
 				"dayjs": "^1.11.9",
-				"echarts": "^5.4.0",
-				"echarts-gl": "^2.0.9",
-				"echarts-wordcloud": "^2.1.0",
 				"element-plus": "^2.4.0",
-				"file-saver": "^2.0.5",
 				"js-cookie": "^3.0.1",
-				"js-table2excel": "^1.0.3",
 				"jsencrypt": "^3.3.2",
 				"mitt": "^3.0.0",
 				"nprogress": "^0.2.0",
@@ -170,34 +164,6 @@
 			"dev": true,
 			"license": "BSD-3-Clause"
 		},
-		"node_modules/@jiaminghi/bezier-curve": {
-			"version": "0.0.9",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/runtime": "^7.5.5"
-			}
-		},
-		"node_modules/@jiaminghi/c-render": {
-			"version": "0.4.3",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/runtime": "^7.5.5",
-				"@jiaminghi/bezier-curve": "*",
-				"@jiaminghi/color": "*",
-				"@jiaminghi/transition": "*"
-			}
-		},
-		"node_modules/@jiaminghi/color": {
-			"version": "1.1.3",
-			"license": "MIT"
-		},
-		"node_modules/@jiaminghi/transition": {
-			"version": "1.1.11",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/runtime": "^7.5.5"
-			}
-		},
 		"node_modules/@jridgewell/gen-mapping": {
 			"version": "0.3.2",
 			"dev": true,
@@ -1256,18 +1222,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/bin-datav": {
-			"version": "0.2.0",
-			"license": "MIT",
-			"dependencies": {
-				"@jiaminghi/c-render": "^0.4.3",
-				"color": "^4.2.0",
-				"resize-observer-polyfill": "^1.5.1"
-			},
-			"peerDependencies": {
-				"vue": "^3.2.20"
-			}
-		},
 		"node_modules/binary-extensions": {
 			"version": "2.2.0",
 			"dev": true,
@@ -1431,9 +1385,6 @@
 				"node": ">=6.0"
 			}
 		},
-		"node_modules/claygl": {
-			"version": "1.3.0"
-		},
 		"node_modules/clipboard": {
 			"version": "2.0.11",
 			"license": "MIT",
@@ -1443,19 +1394,9 @@
 				"tiny-emitter": "^2.0.0"
 			}
 		},
-		"node_modules/color": {
-			"version": "4.2.3",
-			"license": "MIT",
-			"dependencies": {
-				"color-convert": "^2.0.1",
-				"color-string": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=12.5.0"
-			}
-		},
 		"node_modules/color-convert": {
 			"version": "2.0.1",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"color-name": "~1.1.4"
@@ -1466,16 +1407,9 @@
 		},
 		"node_modules/color-name": {
 			"version": "1.1.4",
+			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/color-string": {
-			"version": "1.9.1",
-			"license": "MIT",
-			"dependencies": {
-				"color-name": "^1.0.0",
-				"simple-swizzle": "^0.2.2"
-			}
-		},
 		"node_modules/combined-stream": {
 			"version": "1.0.8",
 			"license": "MIT",
@@ -1612,32 +1546,6 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/echarts": {
-			"version": "5.4.0",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"tslib": "2.3.0",
-				"zrender": "5.4.0"
-			}
-		},
-		"node_modules/echarts-gl": {
-			"version": "2.0.9",
-			"dependencies": {
-				"claygl": "^1.2.1",
-				"zrender": "^5.1.1"
-			},
-			"peerDependencies": {
-				"echarts": "^5.1.2"
-			}
-		},
-		"node_modules/echarts-wordcloud": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/echarts-wordcloud/-/echarts-wordcloud-2.1.0.tgz",
-			"integrity": "sha512-Kt1JmbcROgb+3IMI48KZECK2AP5lG6bSsOEs+AsuwaWJxQom31RTNd6NFYI01E/YaI1PFZeueaupjlmzSQasjQ==",
-			"peerDependencies": {
-				"echarts": "^5.0.1"
-			}
-		},
 		"node_modules/electron-to-chromium": {
 			"version": "1.4.284",
 			"dev": true,
@@ -2118,10 +2026,6 @@
 				"node": "^10.12.0 || >=12.0.0"
 			}
 		},
-		"node_modules/file-saver": {
-			"version": "2.0.5",
-			"license": "MIT"
-		},
 		"node_modules/fill-range": {
 			"version": "7.0.1",
 			"dev": true,
@@ -2442,10 +2346,6 @@
 			"dev": true,
 			"license": "ISC"
 		},
-		"node_modules/is-arrayish": {
-			"version": "0.3.2",
-			"license": "MIT"
-		},
 		"node_modules/is-binary-path": {
 			"version": "2.1.0",
 			"dev": true,
@@ -2568,10 +2468,6 @@
 				"url": "https://opencollective.com/js-sdsl"
 			}
 		},
-		"node_modules/js-table2excel": {
-			"version": "1.0.3",
-			"license": "ISC"
-		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
 			"dev": true,
@@ -3277,10 +3173,6 @@
 			"version": "1.0.0",
 			"license": "MIT"
 		},
-		"node_modules/resize-observer-polyfill": {
-			"version": "1.5.1",
-			"license": "MIT"
-		},
 		"node_modules/resolve": {
 			"version": "1.22.1",
 			"dev": true,
@@ -3534,13 +3426,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/simple-swizzle": {
-			"version": "0.2.2",
-			"license": "MIT",
-			"dependencies": {
-				"is-arrayish": "^0.3.1"
-			}
-		},
 		"node_modules/slash": {
 			"version": "3.0.0",
 			"dev": true,
@@ -3762,10 +3647,6 @@
 			"version": "0.0.3",
 			"license": "MIT"
 		},
-		"node_modules/tslib": {
-			"version": "2.3.0",
-			"license": "0BSD"
-		},
 		"node_modules/tsutils": {
 			"version": "3.21.0",
 			"dev": true,
@@ -4209,13 +4090,6 @@
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
-		},
-		"node_modules/zrender": {
-			"version": "5.4.0",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"tslib": "2.3.0"
-			}
 		}
 	},
 	"dependencies": {
@@ -4283,30 +4157,6 @@
 			"version": "1.2.1",
 			"dev": true
 		},
-		"@jiaminghi/bezier-curve": {
-			"version": "0.0.9",
-			"requires": {
-				"@babel/runtime": "^7.5.5"
-			}
-		},
-		"@jiaminghi/c-render": {
-			"version": "0.4.3",
-			"requires": {
-				"@babel/runtime": "^7.5.5",
-				"@jiaminghi/bezier-curve": "*",
-				"@jiaminghi/color": "*",
-				"@jiaminghi/transition": "*"
-			}
-		},
-		"@jiaminghi/color": {
-			"version": "1.1.3"
-		},
-		"@jiaminghi/transition": {
-			"version": "1.1.11",
-			"requires": {
-				"@babel/runtime": "^7.5.5"
-			}
-		},
 		"@jridgewell/gen-mapping": {
 			"version": "0.3.2",
 			"dev": true,
@@ -5015,14 +4865,6 @@
 			"version": "1.0.2",
 			"dev": true
 		},
-		"bin-datav": {
-			"version": "0.2.0",
-			"requires": {
-				"@jiaminghi/c-render": "^0.4.3",
-				"color": "^4.2.0",
-				"resize-observer-polyfill": "^1.5.1"
-			}
-		},
 		"binary-extensions": {
 			"version": "2.2.0",
 			"dev": true
@@ -5114,9 +4956,6 @@
 			"dev": true,
 			"peer": true
 		},
-		"claygl": {
-			"version": "1.3.0"
-		},
 		"clipboard": {
 			"version": "2.0.11",
 			"requires": {
@@ -5125,28 +4964,16 @@
 				"tiny-emitter": "^2.0.0"
 			}
 		},
-		"color": {
-			"version": "4.2.3",
-			"requires": {
-				"color-convert": "^2.0.1",
-				"color-string": "^1.9.0"
-			}
-		},
 		"color-convert": {
 			"version": "2.0.1",
+			"dev": true,
 			"requires": {
 				"color-name": "~1.1.4"
 			}
 		},
 		"color-name": {
-			"version": "1.1.4"
-		},
-		"color-string": {
-			"version": "1.9.1",
-			"requires": {
-				"color-name": "^1.0.0",
-				"simple-swizzle": "^0.2.2"
-			}
+			"version": "1.1.4",
+			"dev": true
 		},
 		"combined-stream": {
 			"version": "1.0.8",
@@ -5237,26 +5064,6 @@
 			"version": "16.0.3",
 			"dev": true
 		},
-		"echarts": {
-			"version": "5.4.0",
-			"requires": {
-				"tslib": "2.3.0",
-				"zrender": "5.4.0"
-			}
-		},
-		"echarts-gl": {
-			"version": "2.0.9",
-			"requires": {
-				"claygl": "^1.2.1",
-				"zrender": "^5.1.1"
-			}
-		},
-		"echarts-wordcloud": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/echarts-wordcloud/-/echarts-wordcloud-2.1.0.tgz",
-			"integrity": "sha512-Kt1JmbcROgb+3IMI48KZECK2AP5lG6bSsOEs+AsuwaWJxQom31RTNd6NFYI01E/YaI1PFZeueaupjlmzSQasjQ==",
-			"requires": {}
-		},
 		"electron-to-chromium": {
 			"version": "1.4.284",
 			"dev": true,
@@ -5593,9 +5400,6 @@
 				"flat-cache": "^3.0.4"
 			}
 		},
-		"file-saver": {
-			"version": "2.0.5"
-		},
 		"fill-range": {
 			"version": "7.0.1",
 			"dev": true,
@@ -5788,9 +5592,6 @@
 			"version": "2.0.4",
 			"dev": true
 		},
-		"is-arrayish": {
-			"version": "0.3.2"
-		},
 		"is-binary-path": {
 			"version": "2.1.0",
 			"dev": true,
@@ -5864,9 +5665,6 @@
 			"version": "4.2.0",
 			"dev": true
 		},
-		"js-table2excel": {
-			"version": "1.0.3"
-		},
 		"js-yaml": {
 			"version": "4.1.0",
 			"dev": true,
@@ -6267,9 +6065,6 @@
 		"requires-port": {
 			"version": "1.0.0"
 		},
-		"resize-observer-polyfill": {
-			"version": "1.5.1"
-		},
 		"resolve": {
 			"version": "1.22.1",
 			"dev": true,
@@ -6389,12 +6184,6 @@
 				"object-inspect": "^1.9.0"
 			}
 		},
-		"simple-swizzle": {
-			"version": "0.2.2",
-			"requires": {
-				"is-arrayish": "^0.3.1"
-			}
-		},
 		"slash": {
 			"version": "3.0.0",
 			"dev": true
@@ -6521,9 +6310,6 @@
 		"tr46": {
 			"version": "0.0.3"
 		},
-		"tslib": {
-			"version": "2.3.0"
-		},
 		"tsutils": {
 			"version": "3.21.0",
 			"dev": true,
@@ -6777,12 +6563,6 @@
 		"yocto-queue": {
 			"version": "0.1.0",
 			"dev": true
-		},
-		"zrender": {
-			"version": "5.4.0",
-			"requires": {
-				"tslib": "2.3.0"
-			}
 		}
 	}
 }

+ 0 - 6
package.json

@@ -21,15 +21,9 @@
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"axios": "^1.4.0",
-		"bin-datav": "^0.2.0",
 		"dayjs": "^1.11.9",
-		"echarts": "^5.4.0",
-		"echarts-gl": "^2.0.9",
-		"echarts-wordcloud": "^2.1.0",
 		"element-plus": "^2.4.0",
-		"file-saver": "^2.0.5",
 		"js-cookie": "^3.0.1",
-		"js-table2excel": "^1.0.3",
 		"jsencrypt": "^3.3.2",
 		"mitt": "^3.0.0",
 		"nprogress": "^0.2.0",

+ 1 - 2
src/components/AnnexList/index.vue

@@ -52,10 +52,9 @@
 	</div>
 </template>
 <script setup lang="ts" name="annexList">
-import {computed, nextTick, onBeforeUnmount, ref, watch, watchEffect} from 'vue';
+import {computed, ref, watch} from 'vue';
 import { checkFile, downloadFile, fileType } from '/@/utils/tools';
 import { ElButton, ElMessage, ElMessageBox } from 'element-plus';
-import { api as viewerApi } from 'v-viewer';
 const emit = defineEmits(['update:modelValue', 'update:format']);
 const props = defineProps({
 	name: {

+ 2 - 2
src/components/ProcessAudit/index.vue

@@ -959,9 +959,9 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 								typeDicId: state.discernForm.type.dicDataValue,
 								typeDicName: state.discernForm.type.dicDataName,
 								content: state.discernForm.content,
-								files: handleFilesDelay.value,
+								files: handleFilesDiscern.value,
 							},
-							workflow: { ...submitObj, files: handleFilesDelay.value, opinion: state.discernForm.content },
+							workflow: { ...submitObj, files: handleFilesDiscern.value, opinion: state.discernForm.content },
 						};
 						discernApply(requestDiscern)
 							.then(() => {

+ 0 - 1
src/types/global.d.ts

@@ -4,7 +4,6 @@ declare module 'qrcodejs2-fixes';
 declare module 'sortablejs';
 declare module 'js-cookie';
 declare module '@wangeditor/editor-for-vue';
-declare module 'js-table2excel';
 declare module 'vue3-seamless-scroll';
 
 // 声明一个模块,防止引入文件时报错

+ 0 - 28
src/utils/request.ts

@@ -52,26 +52,6 @@ export default function myAxios(axiosConfig: any, customOptions?: customOptionsT
 			if (Cookie.get('token')) {
 				(<any>config.headers)['Authorization'] = `Bearer ${Cookie.get('token')}`;
 			}
-			if (config.baseURL === import.meta.env.VITE_CALLCENTER_API_URL) {
-				// 呼叫中心
-				if (!Cookie.get('callCenterToken')) {
-					const res = await axios.get(`${import.meta.env.VITE_CALLCENTER_API_URL}/api/login?username=${import.meta.env.
-						VITE_CALLCENTER_DEFAULT_ACCOUNT}&password=${import.meta.env.VITE_CALLCENTER_DEFAULT_PASSWORD}`, {
-						headers:{'content-type': 'application/x-www-form-urlencoded'}
-					})
-					console.log(`${import.meta.env.VITE_CALLCENTER_API_URL}/api/login?username=${import.meta.env.
-						VITE_CALLCENTER_DEFAULT_ACCOUNT}&password=${import.meta.env.VITE_CALLCENTER_DEFAULT_PASSWORD}`,'211')
-					if (res.data.code === 200) {
-						Cookie.set('wexToken', res.data.data.token);
-					} else {
-						ElMessage({
-							type: 'error',
-							message: res.data.msg,
-						});
-					}
-				}
-				(<any>config.headers)['Token'] = `${Cookie.get('callCenterToken')}`;
-			}
 			return config;
 		},
 		async (error: AxiosError) => {
@@ -83,14 +63,6 @@ export default function myAxios(axiosConfig: any, customOptions?: customOptionsT
 		(response: AxiosResponse): any => {
 			removePending(response.config);
 			custom_options.loading && closeLoading(custom_options); // 关闭loading
-			if (response.config.baseURL === import.meta.env.VITE_CALLCENTER_API_URL) {
-				// 维尔信登录
-				if (response.data.code === 401) {
-					// token过期
-					Cookie.remove('callCenterToken');
-					return myAxios(axiosConfig, customOptions, loadingOptions);
-				}
-			}
 			// 对响应数据做点什么
 			if (custom_options.code_message_show && response.data && response.data.code !== 0) {
 				ElMessage({

+ 24 - 21
src/views/business/delay/components/Delay-detail.vue

@@ -32,18 +32,21 @@
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 					<el-form-item label="申请理由">{{ state.ruleForm?.delayReason }} </el-form-item>
 				</el-col>
+				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+					<el-form-item label="延期申请附件"
+						><annex-list name="延期申请附件" v-model="state.ruleForm.files" readonly classify="延期申请附件" />
+					</el-form-item>
+				</el-col>
 			</el-row>
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
 				<el-button @click="closeDialog" class="default-button">取 消</el-button>
 				<el-button type="primary" @click="processDetail">流程明细</el-button>
-				<el-button type="primary" @click="onAudit" v-if="state.ruleForm?.isCanHandle" v-auths="['todo:delay:audit', 'business:delay:audit']">延期审批</el-button>
-				<el-button
-					type="primary"
-					@click="onReturn"
-					v-if="state.ruleForm?.isCanHandle"
-					v-auths="['todo:delay:return', 'business:delay:return']"
+				<el-button type="primary" @click="onAudit" v-if="state.ruleForm?.isCanHandle" v-auths="['todo:delay:audit', 'business:delay:audit']"
+					>延期审批</el-button
+				>
+				<el-button type="primary" @click="onReturn" v-if="state.ruleForm?.isCanHandle" v-auths="['todo:delay:return', 'business:delay:return']"
 					>延期退回</el-button
 				>
 			</span>
@@ -114,21 +117,21 @@ const onAudit = () => {
 };
 // 延期退回
 const onReturn = () => {
-  try {
-    const params = {
-      id: state.ruleForm.workflowId,
-      processType: '延期退回',
-      extra: {
-        dialogTitle: '延期退回',
-        inputPlaceholder: '请输入延期退回意见',
-        annexName: '延期附件',
-        classify: '延期上传',
-      },
-    };
-    processAuditRef.value.openDialog(params);
-  } catch (error) {
-    console.log(error);
-  }
+	try {
+		const params = {
+			id: state.ruleForm.workflowId,
+			processType: '延期退回',
+			extra: {
+				dialogTitle: '延期退回',
+				inputPlaceholder: '请输入延期退回意见',
+				annexName: '延期附件',
+				classify: '延期上传',
+			},
+		};
+		processAuditRef.value.openDialog(params);
+	} catch (error) {
+		console.log(error);
+	}
 };
 // 流程明细
 const auditRecordRef = ref<RefType>(); // 审核记录ref

+ 5 - 5
src/views/business/delay/index.vue

@@ -44,7 +44,7 @@
 						<span class="color-primary">{{ row.order?.title }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="currentStepName" label="办理节点" show-overflow-tooltip width="150"></el-table-column>
+				<el-table-column prop="currentStepName" label="办理节点" show-overflow-tooltip width="120"></el-table-column>
 				<el-table-column prop="delayStateText" label="延期申请状态" show-overflow-tooltip width="120"></el-table-column>
 				<el-table-column prop="expiredTime" label="受理时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
@@ -58,10 +58,10 @@
 						</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="order.hotspotName" label="热点分类" show-overflow-tooltip  width="120"></el-table-column>
+				<el-table-column prop="order.acceptType" label="受理类型" show-overflow-tooltip  width="120"></el-table-column>
+				<el-table-column prop="order.orgLevelOneName" label="一级部门" show-overflow-tooltip  width="120"></el-table-column>
+				<el-table-column prop="order.actualHandleOrgName" label="接办部门" show-overflow-tooltip width="120"></el-table-column>
 				<el-table-column label="接办时间" show-overflow-tooltip width="170">
 					<template #default="{ row }">
 						<span>{{ formatDate(row.order?.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }}</span>

+ 5 - 0
src/views/business/discern/components/Discern-detail.vue

@@ -26,6 +26,11 @@
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 					<el-form-item label="申请理由">{{ state.ruleForm?.content }} </el-form-item>
 				</el-col>
+        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+          <el-form-item label="甄别申请附件"
+          ><annex-list name="甄别申请附件" v-model="state.ruleForm.files" readonly classify="甄别申请附件" />
+          </el-form-item>
+        </el-col>
 			</el-row>
 		</el-form>
 		<template #footer>

+ 1 - 2
vite.config.ts

@@ -46,8 +46,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 					assetFileNames: `assets/[name].[hash].[ext]`,
 					compact: true,
 					manualChunks: {
-						vue: ['vue', 'vue-router', 'pinia'],
-						echarts: ['echarts'],
+						vue: ['vue', 'vue-router', 'pinia']
 					},
 				},
 			},