whx 3 mesi fa
parent
commit
c74ad50bb3
26 ha cambiato i file con 244 aggiunte e 21 eliminazioni
  1. 87 0
      virgo.wzfrontend/console/src/components/flow/batchForm.vue
  2. 72 0
      virgo.wzfrontend/console/src/components/flow/batchTemplate.vue
  3. 56 0
      virgo.wzfrontend/console/src/components/flow/importTemplate.vue
  4. 13 6
      virgo.wzfrontend/console/src/views/work/property/register.vue
  5. 1 1
      virgo.wzfrontend/src/main/resources/static/console/index.html
  6. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/5640.11a12ac5.css
  7. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/7105.9910c679.css
  8. 0 0
      virgo.wzfrontend/src/main/resources/static/console/static/css/8676.9910c679.css
  9. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1368-legacy.da421181.js
  10. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1368.8e7fdd03.js
  11. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/1871.883473cf.js
  12. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/2474-legacy.d6f71fa4.js
  13. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/2474.9de70c55.js
  14. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/2605-legacy.44380c0e.js
  15. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/2605.e5298258.js
  16. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4818-legacy.e9997881.js
  17. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/4818.9e871de7.js
  18. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/5560.5b520993.js
  19. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/5640-legacy.a023215a.js
  20. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/5640.efb0e758.js
  21. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/7105-legacy.79ba3619.js
  22. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7139-legacy.e1c8f260.js
  23. 0 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/7683-legacy.82b6c421.js
  24. 1 0
      virgo.wzfrontend/src/main/resources/static/console/static/js/8676.8c89bb40.js
  25. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.4f7b3f6f.js
  26. 1 1
      virgo.wzfrontend/src/main/resources/static/console/static/js/app.c9362092.js

+ 87 - 0
virgo.wzfrontend/console/src/components/flow/batchForm.vue

@@ -0,0 +1,87 @@
+<template>
+	<div class="hui-flex hui-dialog batch-form">
+		<div class="hui-flex-box" v-if="templateList.length>0">
+			<div class="hui-flex hui-content">
+				<div class="hui-content-title">
+					<div :class="'hui-title-item' + (index === titleIndex ? ' active':'') "
+						v-for="(item,index) in templateList" :key="index" @click="titleIndex = index">
+						模板{{index+1}}
+					</div>
+				</div>
+				<div class="hui-flex-box">
+					<batch-template :flowForm="item" v-for="(item,index) in templateList" :key="index"
+						v-show="titleIndex == index">
+					</batch-template>
+				</div>
+			</div>
+		</div>
+		<div class="hui-flex-box hui-content" v-else>
+			<div class="upload-demo">
+				<import-template ref="uploads" @changeFile="changeFile"></import-template>
+			</div>
+		</div>
+		<div class="hui-dialog-submit">
+			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
+			<el-button size="medium" type="primary" @click="submit" :loading="loading">批量保存</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import importTemplate from '@/components/flow/importTemplate'
+	import batchTemplate from '@/components/flow/batchTemplate'
+	export default {
+		props: ['flowType'],
+		data() {
+			return {
+				templateList: [],
+				titleIndex: 0,
+				loading: false
+			}
+		},
+		mounted() {
+			this.project = this.$store.getters.project;
+		},
+		methods: {
+			changeFile(data) {
+				this.$loading.close();
+				console.log(this.templateList);
+				this.templateList = data;
+			},
+			submit() {
+				// this.loading = true;
+				this.$message.success('功能开发中');
+			},
+			successFunc(res) {
+				this.loading = false;
+				if (res.state) {
+					this.$message.success('操作成功');
+					this.$emit('callback', 'init');
+				}
+			}
+		},
+		components: {
+			importTemplate,
+			batchTemplate
+		},
+	}
+</script>
+
+<style lang="scss">
+	.batch-form {
+		.el-upload-dragger {
+			background: transparent;
+		}
+
+		.el-upload-dragger {
+			border-color: $--color-border;
+		}
+
+		.upload-demo {
+			height: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+</style>

+ 72 - 0
virgo.wzfrontend/console/src/components/flow/batchTemplate.vue

@@ -0,0 +1,72 @@
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<div class="flow-form-box">
+				<div class="flow-form-list">
+					<property-flow-form ref="flowData" :flowForm="flowForm"></property-flow-form>
+					<el-form :model="flowForm" label-position="top">
+						<el-form-item label="流程附件" class="hui-textarea">
+							<upload ref="upload" :list="responsibility" type="insert"></upload>
+						</el-form-item>
+						<el-form-item label="抄送人" class="hui-textarea">
+							<cc ref="cc" type="insert" :ccList="ccList"></cc>
+						</el-form-item>
+					</el-form>
+				</div>
+				<div class="flow-approve-list">
+					<flow ref="flow" type="insert" :flowlist="flowlist"></flow>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	import flow from '@/components/flow/flow'
+	import cc from '@/components/common/cc'
+	import upload from '@/components/common/upload'
+	import propertyFlowForm from '@/components/work/property/propertyFlowForm'
+	export default {
+		props: ['flowForm'],
+		data() {
+			return {
+				responsibility: [],
+				flowlist: [],
+				ccList: []
+			}
+		},
+		mounted() {},
+		methods: {},
+		components: {
+			flow,
+			upload,
+			cc,
+			propertyFlowForm
+		},
+	}
+</script>
+
+<style lang="scss">
+	.flow-form-box {
+		display: flex;
+		width: 100%;
+		height: 100%;
+
+		.el-cascader {
+			width: 100%;
+		}
+
+		.flow-form-list {
+			flex: 1;
+			height: 100%;
+			overflow-x: hidden;
+			overflow-y: auto;
+			padding-right: 10px;
+		}
+
+		.flow-approve-list {
+			width: 300px;
+			border-left: 1px solid $--color-border;
+		}
+	}
+</style>

+ 56 - 0
virgo.wzfrontend/console/src/components/flow/importTemplate.vue

@@ -0,0 +1,56 @@
+<template>
+	<div class="document-upload">
+		<el-upload drag :action="action" name="uploadFile" ref="upload" :headers="headers" accept=".xlsx" multiple
+			:on-success="successFile" :before-upload="beforeUpload" :on-error="errorUpload" :show-file-list="false"
+			:on-progress="progress">
+			<i class="el-icon-upload"></i>
+			<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+		</el-upload>
+	</div>
+</template>
+
+<script>
+	import config from '@/config';
+	import {
+		getToken
+	} from '@/uitls/auth';
+	export default {
+		data() {
+			return {
+				action: '',
+				headers: {}
+			};
+		},
+		mounted() {
+			this.action = `${config.baseURL}/api/operateDevice/import`
+			this.headers.token = getToken();
+		},
+		methods: {
+			beforeUpload() {
+				this.$loading();
+			},
+			progress(e) {
+				let percent = e.percent >= 100 ? 99 : parseInt(e.percent)
+				this.$loading({
+					percent: (percent + '%')
+				});
+			},
+			reloadUpload() {
+				this.$refs['upload'].$children[0].$refs.input.click();
+			},
+			errorUpload() {
+				this.$loading.close();
+				this.$message.error('导入失败');
+			},
+			successFile(data) {
+				if (!data.code == '20000') return this.errorUpload();
+				this.$emit('changeFile', data.data)
+				this.$loading.close();
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	.document-upload {}
+</style>

+ 13 - 6
virgo.wzfrontend/console/src/views/work/property/register.vue

@@ -38,10 +38,12 @@
 					<div class="hui-flex-box hui-flex hui-table">
 						<div class="hui-content-insert">
 							<el-button v-permission="'/work/property/register/add'" type="primary" size="medium"
-								@click="insert">
+								@click="insert(1)">
 								新增登记
 							</el-button>
 							<el-button type="info" size="medium" @click="downloadFile">标准模板下载</el-button>
+							<el-button v-permission="'/work/property/register/add'" type="info" size="medium"
+								@click="insert(2)">批量登记</el-button>
 						</div>
 						<div class="hui-flex-box">
 							<el-table :data="tableData" row-key="id" border height="100%">
@@ -122,9 +124,10 @@
 		</div>
 		<el-dialog :close-on-click-modal="false" :title="isUpdate?'编辑':'新增'" :visible.sync="visible" width="1200px"
 			:append-to-body="true">
-			<flow-form v-if="visible" :isUpdate="isUpdate" @callback="callback" :detailId="detailId"
+			<flow-form v-if="visible && insertType === 1" :isUpdate="isUpdate" @callback="callback" :detailId="detailId"
 				:flowType="flowType">
 			</flow-form>
+			<batch-form v-if="visible && insertType === 2" @callback="callback" :flowType="flowType"></batch-form>
 		</el-dialog>
 		<el-drawer title="流程详情" :visible.sync="drawer" :size="400" :append-to-body="true">
 			<flow-detail v-if="drawer" @callback="callback" :detailId="detailId"></flow-detail>
@@ -139,8 +142,9 @@
 		getFlowList,
 		deleteFlow
 	} from '@/httpApi/property'
+	import batchForm from '@/components/flow/batchForm'
 	import flowForm from '@/components/flow/flowForm'
-	import flowDetail from '@/components/flow/flowDetail'
+	import flowDetail from '@/components/flow/flowDetail'
 	import config from '@/config'
 	export default {
 		data() {
@@ -160,7 +164,8 @@
 				detailId: '',
 				drawer: false,
 				nowData: {},
-				filterOption: {}
+				filterOption: {},
+				insertType: 1
 			}
 		},
 		mounted() {
@@ -252,7 +257,8 @@
 				this.currPage = currPage;
 				this.init();
 			},
-			insert() {
+			insert(type) {
+				this.insertType = type;
 				this.visible = true;
 				this.isUpdate = false;
 			},
@@ -282,7 +288,8 @@
 		},
 		components: {
 			flowForm,
-			flowDetail
+			flowDetail,
+			batchForm
 		},
 	}
 </script>

File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/index.html


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/css/5640.11a12ac5.css


virgo.wzfrontend/src/main/resources/static/console/static/css/5560.9910c679.css → virgo.wzfrontend/src/main/resources/static/console/static/css/7105.9910c679.css


virgo.wzfrontend/src/main/resources/static/console/static/css/7683.9910c679.css → virgo.wzfrontend/src/main/resources/static/console/static/css/8676.9910c679.css


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1368-legacy.da421181.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1368.8e7fdd03.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/1871.883473cf.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/2474-legacy.d6f71fa4.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/2474.9de70c55.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/2605-legacy.44380c0e.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/2605.e5298258.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4818-legacy.e9997881.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/4818.9e871de7.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/5560.5b520993.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/5640-legacy.a023215a.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/5640.efb0e758.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/7105-legacy.79ba3619.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7139-legacy.e1c8f260.js


File diff suppressed because it is too large
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/7683-legacy.82b6c421.js


File diff suppressed because it is too large
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/console/static/js/8676.8c89bb40.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/app-legacy.4f7b3f6f.js


File diff suppressed because it is too large
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/console/static/js/app.c9362092.js