Ver Fonte

test: ...

lanceJiang há 1 ano atrás
pai
commit
90f316063a

+ 37 - 38
package.json

@@ -22,46 +22,52 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
     "@popperjs/core": "^2.11.8",
+    "@vant/area-data": "^1.4.0",
+    "@vant/touch-emulator": "^1.4.0",
     "@vue/shared": "^3.4.21",
+    "@vuelidate/core": "^2.0.0",
+    "@vuelidate/validators": "^2.0.0",
     "@vueuse/core": "^10.1.2",
+    "async": "^3.2.4",
     "axios": "^1.4.0",
+    "canvas": "^2.11.2",
     "colord": "^2.9.3",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.2",
     "element-plus": "^2.3.4",
-    "everright-formeditor": "^1.3.0-beta.2",
+    "everright-filter": "^1.1.1",
     "js-md5": "^0.7.3",
+    "jss": "^10.9.2",
+    "jss-preset-default": "^10.9.2",
     "lodash-es": "^4.17.21",
     "lodash-unified": "^1.0.3",
     "mitt": "^3.0.0",
+    "nanoid": "^4.0.0",
     "nprogress": "^0.2.0",
+    "nzh": "^1.0.8",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.0",
-    "pinia": "^2.1.3",
+    "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.1.0",
-    "sortablejs": "^1.15.0",
-    "vue": "^3.2.47",
+		"sortablejs": "^1.15.0",
+    "signature_pad": "^4.1.4",
+    "vant": "^4.0.8",
+    "vite-svg-loader": "^4.0.0",
+    "vue": "^3.4.26",
     "vue-i18n": "^9.2.2",
     "vue-ls": "^4.2.0",
     "vue-router": "^4.2.1",
     "vuedraggable": "^4.1.0",
-    "webpack": "^5.91.0",
-		"@vant/area-data": "^1.4.0",
-		"@vant/touch-emulator": "^1.4.0",
-		"@vuelidate/core": "^2.0.0",
-		"@vuelidate/validators": "^2.0.0",
-		"async": "^3.2.4",
-		"canvas": "^2.11.2",
-		"everright-filter": "^1.1.1",
-		"jss": "^10.9.2",
-		"jss-preset-default": "^10.9.2",
-		"nanoid": "^4.0.0",
-		"nzh": "^1.0.8",
-		"signature_pad": "^4.1.4",
-		"vant": "^4.0.8",
-		"vite-svg-loader": "^4.0.0"
+    "webpack": "^5.91.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.21.0",
+    "@babel/eslint-parser": "^7.19.1",
+    "@ckeditor/ckeditor5-alignment": "^35.4.0",
+    "@ckeditor/ckeditor5-build-classic": "^35.4.0",
+    "@ckeditor/ckeditor5-build-decoupled-document": "^35.4.0",
+    "@ckeditor/ckeditor5-build-inline": "^35.4.0",
+    "@ckeditor/ckeditor5-vue": "^4.0.1",
     "@types/js-md5": "^0.7.0",
     "@types/nprogress": "^0.2.0",
     "@types/path-browserify": "^1.0.0",
@@ -71,14 +77,25 @@
     "@typescript-eslint/parser": "^5.59.6",
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
+    "@vue/compiler-sfc": "^3.2.47",
+    "@vue/test-utils": "^2.3.2",
     "autoprefixer": "^10.4.16",
+    "better-sqlite3": "^8.2.0",
     "codemirror": "^5.60.0",
+    "connect-multiparty": "^2.2.0",
+    "conventional-changelog-cli": "^4.1.0",
     "eslint": "^8.40.0",
     "eslint-config-prettier": "^8.7.0",
+    "eslint-config-standard": "^17.0.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-vue": "^9.9.0",
+    "jsdom": "^22.0.0",
     "postcss": "^8.4.30",
     "prettier": "^2.8.8",
+    "resize-observer-polyfill": "^1.5.1",
     "rollup-plugin-visualizer": "^5.9.0",
     "sass": "^1.62.1",
     "typescript": "^5.0.4",
@@ -88,25 +105,7 @@
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-svg-icons": "^2.0.1",
-    "vue-tsc": "^1.6.5",
-		"@babel/core": "^7.21.0",
-		"@babel/eslint-parser": "^7.19.1",
-		"@ckeditor/ckeditor5-alignment": "^35.4.0",
-		"@ckeditor/ckeditor5-build-classic": "^35.4.0",
-		"@ckeditor/ckeditor5-build-decoupled-document": "^35.4.0",
-		"@ckeditor/ckeditor5-build-inline": "^35.4.0",
-		"@ckeditor/ckeditor5-vue": "^4.0.1",
-		"@vue/compiler-sfc": "^3.2.47",
-		"@vue/test-utils": "^2.3.2",
-		"better-sqlite3": "^8.2.0",
-		"connect-multiparty": "^2.2.0",
-		"conventional-changelog-cli": "^4.1.0",
-		"eslint-config-standard": "^17.0.0",
-		"eslint-plugin-import": "^2.27.5",
-		"eslint-plugin-n": "^15.6.1",
-		"eslint-plugin-promise": "^6.1.1",
-		"jsdom": "^22.0.0",
-		"resize-observer-polyfill": "^1.5.1"
+    "vue-tsc": "^1.6.5"
   },
   "engines": {
     "node": ">=16.0.0"

+ 3 - 3
src/components/registerGlobComp.ts

@@ -16,7 +16,7 @@ import Select from '@/components/Select/index.vue'
 import Chart from '@/components/Chart.vue'
 
 import ScWorkflow from '@/components/scWorkflow'
-import draggable from 'vuedraggable/src/vuedraggable'
+// import draggable from 'vuedraggable/src/vuedraggable'
 
 // you want register components
 const compList = [
@@ -33,8 +33,8 @@ const compList = [
 	Icon,
 	Select,
 	Chart,
-	ScWorkflow,
-	draggable
+	ScWorkflow
+	// draggable
 ]
 
 export function registerGlobComp(app: App) {

+ 2 - 2
src/layout/components/Tabs/index.vue

@@ -181,12 +181,12 @@ const tabsDrop = () => {
 			tagsView.setViews(tabsList)
 		},
 		onMove(event: any) {
-			console.log(event.related, 'onMove', event.relatedRect)
+			// console.log(event.related, 'onMove', event.relatedRect)
 			return event.related.className.indexOf('is-closable') !== -1
 		}
 	})
 }
-window.router = router
+// window.router = router
 // Tab Click
 const tabClick = (tabItem: TabsPaneContext) => {
 	const fullPath = tabItem.props.label as string

+ 0 - 271
src/views/approve/pendingClaim/detail.vue

@@ -1,271 +0,0 @@
-<template>
-	<el-drawer v-model="visibleDialog" class="custom-adrawer" :direction="direction" size="900" @close="handleCancel">
-		<template #title>
-			<div class="flow-header-box">
-				<div class="flow-no">编号:1719564992673533954</div>
-			</div>
-		</template>
-		<div class="flow-detail-container">
-			<div class="flow-status-stamp">
-				<div class="flow-stamp-container">
-					<img src="@/assets/images/flw03.svg" alt="" style="width: 120px; height: 120px" />
-				</div>
-			</div>
-
-			<div class="flow-detail-box">
-				<!--头部-->
-				<div class="header-box">
-					<div class="summary-info">
-						<div class="title">名片申请</div>
-						<div class="status">
-							<el-tag type="success">已通过</el-tag>
-						</div>
-					</div>
-					<div class="initiator-info">
-						<el-avatar size="16"> 艾斯 </el-avatar>
-						<div class="begin-time">2023-11-01 12:00:17 提交</div>
-					</div>
-				</div>
-				<div class="area-divider"></div>
-
-				<!-- 表单 -->
-				<el-descriptions :column="1" :size="'default'">
-					<el-descriptions-item label="申请人">kooriookami</el-descriptions-item>
-					<el-descriptions-item label="日期">18100000000</el-descriptions-item>
-					<el-descriptions-item label="员工">Suzhou</el-descriptions-item>
-				</el-descriptions>
-
-				<div class="area-divider"></div>
-
-				<!--审批流-->
-				<el-timeline>
-					<el-timeline-item timestamp="提交" placement="top" type="success" :icon="Check">
-						<!-- 审批完成 -->
-						<div class="timeline-box flex-1">
-							<div class="flex flex-align-center">
-								<div class="timeline-box-user flex-1">
-									<span class="name">爱丽丝</span>
-									<div v-if="false" class="comment">
-										<div class="comment-content">同意</div>
-									</div>
-								</div>
-								<span class="timeline-box-date">2018/4/12 20:46</span>
-							</div>
-						</div>
-					</el-timeline-item>
-
-					<el-timeline-item timestamp="审批" placement="top" type="success" :icon="Check">
-						<div class="timeline-box flex-1">
-							<div class="flex flex-align-center">
-								<div class="timeline-box-user flex-1">
-									<span class="name">罗小胖</span>
-									<div class="comment">
-										<div class="comment-content">同意</div>
-									</div>
-								</div>
-								<span class="timeline-box-date">2018/4/12 20:46</span>
-							</div>
-						</div>
-					</el-timeline-item>
-
-					<el-timeline-item timestamp="抄送" placement="top" type="success" :icon="Check">
-						<div class="timeline-box flex-1">
-							<div class="flex flex-align-center">
-								<div v-if="false" class="timeline-box-user flex-1">
-									<span class="name">罗小胖</span>
-									<div class="comment">
-										<div class="comment-content">同意</div>
-									</div>
-								</div>
-								<el-space wrap>
-									<el-avatar> 路飞 </el-avatar>
-									<el-avatar> 红发 </el-avatar>
-									<el-avatar> 娜美 </el-avatar>
-								</el-space>
-
-								<span class="timeline-box-date">2018/4/12 20:46</span>
-							</div>
-						</div>
-					</el-timeline-item>
-				</el-timeline>
-			</div>
-			<div class="flow-actions">
-				<el-button :icon="ChatLineSquare" @click="openComment">评论</el-button>
-			</div>
-		</div>
-	</el-drawer>
-	<review-dialog v-if="reviewVisible" v-model="reviewVisible"></review-dialog>
-</template>
-
-<script setup>
-import { computed, ref } from 'vue'
-import { ChatLineSquare, Check } from '@element-plus/icons-vue'
-import ReviewDialog from '../components/reviewDialog'
-
-const direction = ref('rtl')
-const myProps = defineProps({
-	modelValue: {
-		type: Boolean,
-		default: false
-	},
-	userIds: {
-		type: Array,
-		default: () => []
-	}
-})
-
-const reviewVisible = ref(true)
-
-// 同步值
-const $myEmit = defineEmits(['update:modelValue', 'successFn'])
-
-// 关闭按钮
-const closeDrawer = () => {
-	$myEmit('successFn')
-	$myEmit('update:modelValue', false)
-}
-
-const handleCancel = () => {
-	closeDrawer()
-}
-
-const visibleDialog = computed({
-	get() {
-		return myProps.modelValue
-	},
-	set(val) {
-		$myEmit('update:modelValue', val)
-	}
-})
-
-const openComment = () => {
-	debugger
-	reviewVisible.value = !reviewVisible.value
-	debugger
-}
-</script>
-
-<style scoped lang="scss">
-.custom-adrawer {
-	:deep(.el-drawer__header) {
-		padding: 0px;
-	}
-}
-
-.flow-detail-container {
-	height: 100%;
-}
-
-.flow-status-stamp {
-	position: absolute;
-	right: 50px;
-	top: 30px;
-	.flow-stamp-container {
-		img {
-			overflow: hidden;
-			background-color: transparent;
-			z-index: 999;
-		}
-	}
-}
-
-.flow-header-box {
-	font-weight: 400;
-	font-size: 13px;
-	border-bottom: 1px solid #e5e6ec;
-	padding: 0 20px;
-	height: 39px;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	color: #86909c;
-}
-.flow-detail-box {
-	height: calc(100% - 92px);
-	overflow: hidden;
-	overflow-y: auto;
-	padding: 0 30px;
-	.header-box {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		padding-top: 20px;
-		.summary-info {
-			display: flex;
-			align-items: center;
-			.title {
-				font-size: 24px;
-				font-family: PingFangSC-Semibold, PingFang SC;
-				color: #1d2129;
-			}
-			.status {
-				margin-left: 20px;
-			}
-		}
-		.initiator-info {
-			display: flex;
-			align-items: center;
-			margin-top: 16px;
-			.begin-time {
-				margin-left: 20px;
-				font-weight: 350;
-				color: #86909c;
-				font-size: 13px;
-				-webkit-user-select: none;
-				user-select: none;
-			}
-		}
-	}
-	.area-divider {
-		border-bottom: 1px solid rgba(229, 230, 235, 1);
-		margin: 20px 0;
-		position: relative;
-	}
-}
-
-.flow-actions {
-	display: flex;
-	align-items: center;
-	justify-content: flex-end;
-	height: 52px;
-	border-top: 1px solid rgba(229, 230, 235, 1);
-	padding: 0 20px;
-}
-
-// 时间线样式
-.timeline-box {
-	&-user {
-		.name {
-			color: #1d2129;
-			font-weight: 400;
-		}
-		.comment {
-			width: 100%;
-			-webkit-user-select: none;
-			user-select: none;
-			margin: 4px 0 16px;
-			padding: 8px 16px;
-			border-radius: 4px;
-			background-color: #f8f8fa;
-			.comment-content {
-				font-weight: 500;
-				color: #1d2129;
-			}
-		}
-	}
-	&-date {
-		margin-left: 10px;
-		left: 0;
-		padding-right: 16px;
-		text-align: right;
-		transform: translate(-100%);
-		position: absolute;
-		top: 0;
-		box-sizing: border-box;
-		max-width: 100px;
-		color: #86909c;
-		font-size: 12px;
-		line-height: 1.667;
-	}
-}
-</style>