luoyali 1 жил өмнө
parent
commit
0a815e240d

+ 5 - 1
src/styles/index.scss

@@ -148,8 +148,12 @@ div:focus {
 	display: flex;
 	height: 100%;
 	min-height: 0;
+	padding: 10px 8px 0 8px;
 	&.bgc {
-		background-color: var(--el-fill-color-lighter);
+		background-color: var(--el-bg-color-page);
+	}
+	&.no-padding {
+		padding: 0px;
 	}
 }
 .content-warp {

+ 80 - 82
src/views/approve/launch/index.vue

@@ -1,99 +1,97 @@
 <template>
 	<div class="flex-column-page-wrap pageWrap">
-		<div style="padding: 10px">
-			<!-- 快捷入口 -->
-			<el-row :gutter="10" style="margin-bottom: 10px">
-				<el-col :span="6">
-					<div class="left-item-box box">
-						<div class="launch-todo" @click="jumpOtherPage('待审批')">
-							<el-row :gutter="5">
-								<el-col :span="12" class="mt-icon">
-									<LeIcon icon-class="icon-processInfo-lingdang" />
-								</el-col>
-								<el-col :span="12">
-									<div class="flex flex-v">
-										<div class="mt-title">待审批的</div>
-										<div class="mt-value">{{ countNum }}</div>
-									</div>
-								</el-col>
-							</el-row>
-						</div>
-					</div>
-				</el-col>
-				<el-col :span="18">
-					<div class="right-item-box box">
-						<el-row>
-							<el-col :span="6">
-								<div class="app-task" @click="jumpOtherPage('我的申请')">
-									<LeIcon class="app-task-icon" icon-class="icon-processInfo-tuiguangzhong" />
-									<div class="app-task-title">我申请的</div>
-								</div>
-							</el-col>
-							<el-col :span="6">
-								<div class="app-task" @click="jumpOtherPage('我收到的')">
-									<!--									<div class="app-task-icon">
-										<img style="width: 30px; height: 30px" src="@/assets/icons/processInfo/horn.svg" />
-									</div>-->
-									<LeIcon class="app-task-icon" icon-class="icon-processInfo-horn" />
-
-									<div class="app-task-title">我收到的</div>
-								</div>
-							</el-col>
-							<el-col :span="6">
-								<div class="app-task" @click="jumpOtherPage('认领任务')">
-									<LeIcon class="app-task-icon" icon-class="icon-processInfo-lingqu" />
-
-									<div class="app-task-title">认领任务</div>
-								</div>
+		<!-- 快捷入口 -->
+		<el-row :gutter="10" style="margin-bottom: 10px">
+			<el-col :span="6">
+				<div class="left-item-box box">
+					<div class="launch-todo" @click="jumpOtherPage('待审批')">
+						<el-row :gutter="5">
+							<el-col :span="12" class="mt-icon">
+								<LeIcon icon-class="icon-processInfo-lingdang" />
 							</el-col>
-							<el-col :span="6">
-								<div class="app-task" @click="jumpOtherPage('已审批')">
-									<LeIcon class="app-task-icon" icon-class="icon-processInfo-wanjie" />
-
-									<div class="app-task-title">已审批的</div>
+							<el-col :span="12">
+								<div class="flex flex-v">
+									<div class="mt-title">待审批的</div>
+									<div class="mt-value">{{ countNum }}</div>
 								</div>
 							</el-col>
 						</el-row>
 					</div>
-				</el-col>
-			</el-row>
+				</div>
+			</el-col>
+			<el-col :span="18">
+				<div class="right-item-box box">
+					<el-row>
+						<el-col :span="6">
+							<div class="app-task" @click="jumpOtherPage('我的申请')">
+								<LeIcon class="app-task-icon" icon-class="icon-processInfo-tuiguangzhong" />
+								<div class="app-task-title">我申请的</div>
+							</div>
+						</el-col>
+						<el-col :span="6">
+							<div class="app-task" @click="jumpOtherPage('我收到的')">
+								<!--									<div class="app-task-icon">
+									<img style="width: 30px; height: 30px" src="@/assets/icons/processInfo/horn.svg" />
+								</div>-->
+								<LeIcon class="app-task-icon" icon-class="icon-processInfo-horn" />
 
-			<!-- 审批列表 -->
-			<el-card class="box-card" shadow="never">
-				<el-collapse v-model="activeNames" @change="handleChange">
-					<el-collapse-item v-for="item in startList" :key="item.categoryId" :title="item.categoryName" :name="item.categoryName">
-						<template #title>
-							<div class="common_title">
-								{{ item.categoryName }}
+								<div class="app-task-title">我收到的</div>
 							</div>
-						</template>
-						<div class="task-item">
-							<div v-for="process in item.processList" :key="process.processId" style="padding: 4px">
-								<div class="card-in" @click="testEv(process)">
-									<LeIcon class="flow-icon" :icon-class="`${flowIconPrefix}${process.processIcon}`" />
-									<!--									<div class="flow-icon">
-										<img :src="getAssetsFile(process.processIcon + '.svg')" />
-									</div>-->
-									<div class="space space-vertical">
-										<div class="space-item">
-											<div class="first-edit" :title="process.processName">
-												<span>{{ process.processName }}</span>
-											</div>
-										</div>
-										<!--										<div class="space-item">
-											<div>{{ process.createTime }}</div>
-										</div>-->
-										<div class="space-item" :title="process.processKey">
-											<div>{{ process.processKey }}</div>
+						</el-col>
+						<el-col :span="6">
+							<div class="app-task" @click="jumpOtherPage('认领任务')">
+								<LeIcon class="app-task-icon" icon-class="icon-processInfo-lingqu" />
+
+								<div class="app-task-title">认领任务</div>
+							</div>
+						</el-col>
+						<el-col :span="6">
+							<div class="app-task" @click="jumpOtherPage('已审批')">
+								<LeIcon class="app-task-icon" icon-class="icon-processInfo-wanjie" />
+
+								<div class="app-task-title">已审批的</div>
+							</div>
+						</el-col>
+					</el-row>
+				</div>
+			</el-col>
+		</el-row>
+
+		<!-- 审批列表 -->
+		<el-card class="box-card" shadow="never">
+			<el-collapse v-model="activeNames" @change="handleChange">
+				<el-collapse-item v-for="item in startList" :key="item.categoryId" :title="item.categoryName" :name="item.categoryName">
+					<template #title>
+						<div class="common_title">
+							{{ item.categoryName }}
+						</div>
+					</template>
+					<div class="task-item">
+						<div v-for="process in item.processList" :key="process.processId" style="padding: 4px">
+							<div class="card-in" @click="testEv(process)">
+								<LeIcon class="flow-icon" :icon-class="`${flowIconPrefix}${process.processIcon}`" />
+								<!--									<div class="flow-icon">
+									<img :src="getAssetsFile(process.processIcon + '.svg')" />
+								</div>-->
+								<div class="space space-vertical">
+									<div class="space-item">
+										<div class="first-edit" :title="process.processName">
+											<span>{{ process.processName }}</span>
 										</div>
 									</div>
+									<!--										<div class="space-item">
+										<div>{{ process.createTime }}</div>
+									</div>-->
+									<div class="space-item" :title="process.processKey">
+										<div>{{ process.processKey }}</div>
+									</div>
 								</div>
 							</div>
 						</div>
-					</el-collapse-item>
-				</el-collapse>
-			</el-card>
-		</div>
+					</div>
+				</el-collapse-item>
+			</el-collapse>
+		</el-card>
 		<ItemDrawer v-if="drawerVisible" v-model="drawerVisible" :record="record" />
 	</div>
 </template>

+ 1 - 1
src/views/flow/group/index.vue

@@ -74,7 +74,7 @@ const createProcessEv = () => {
 </script>
 <style scoped lang="scss">
 .group-container {
-	background-color: var(--el-bg-color);
+	background-color: var(--el-bg-color-page);
 	overflow-y: scroll;
 	padding-bottom: 15px;
 }