whx 1 ay önce
ebeveyn
işleme
b16063d2d6
31 değiştirilmiş dosya ile 67 ekleme ve 24 silme
  1. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/index.html
  2. 0 0
      virgo.wzfrontend/src/main/resources/static/workark/static/css/5515.765a69d3.css
  3. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/224.1055aa49.js
  4. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/224.f2dba002.js
  5. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/2901.4312c100.js
  6. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/3983.a4314a95.js
  7. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/5211.7b5f4f4a.js
  8. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/5211.ac7af39b.js
  9. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/5282.8a159ea2.js
  10. 0 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/5383.da30f7fb.js
  11. 0 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/5499.5aad7edc.js
  12. 0 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/6033.729cf3b6.js
  13. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/6077.80050099.js
  14. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/6077.e87a3dda.js
  15. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/6364.794cbf47.js
  16. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/6982.046a9351.js
  17. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/7259.8bd0627a.js
  18. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/7375.e1408e90.js
  19. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/7375.f746f55a.js
  20. 0 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/7799.0c528ffe.js
  21. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/8083.73e8e420.js
  22. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/8083.d060ec0c.js
  23. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/8407.a388d7be.js
  24. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/8407.e2c94596.js
  25. 1 0
      virgo.wzfrontend/src/main/resources/static/workark/static/js/8994.98953667.js
  26. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/9334.66c94853.js
  27. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/9640.e8779aa1.js
  28. 0 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/9708.21c8ebdf.js
  29. 1 1
      virgo.wzfrontend/src/main/resources/static/workark/static/js/app.9de91bc9.js
  30. 5 2
      virgo.wzfrontend/workark/src/components/work/system/serveSet/processSet.vue
  31. 47 7
      virgo.wzfrontend/workark/src/components/work/system/serveSet/processSetItem.vue

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/index.html


virgo.wzfrontend/src/main/resources/static/workark/static/css/575.765a69d3.css → virgo.wzfrontend/src/main/resources/static/workark/static/css/5515.765a69d3.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/224.1055aa49.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/224.f2dba002.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/2901.4312c100.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/3983.a4314a95.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/5211.7b5f4f4a.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/5211.ac7af39b.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/5282.8a159ea2.js


virgo.wzfrontend/src/main/resources/static/workark/static/js/5383.87cc4d8e.js → virgo.wzfrontend/src/main/resources/static/workark/static/js/5383.da30f7fb.js


virgo.wzfrontend/src/main/resources/static/workark/static/js/5499.7ec31c3d.js → virgo.wzfrontend/src/main/resources/static/workark/static/js/5499.5aad7edc.js


virgo.wzfrontend/src/main/resources/static/workark/static/js/6033.c5515fea.js → virgo.wzfrontend/src/main/resources/static/workark/static/js/6033.729cf3b6.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/6077.80050099.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/6077.e87a3dda.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/6364.794cbf47.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/6982.046a9351.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/7259.8bd0627a.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/7375.e1408e90.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/7375.f746f55a.js


virgo.wzfrontend/src/main/resources/static/workark/static/js/7799.11c8b9d9.js → virgo.wzfrontend/src/main/resources/static/workark/static/js/7799.0c528ffe.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/8083.73e8e420.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/8083.d060ec0c.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/8407.a388d7be.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/8407.e2c94596.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
virgo.wzfrontend/src/main/resources/static/workark/static/js/8994.98953667.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/9334.66c94853.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/9640.e8779aa1.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/9708.21c8ebdf.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
virgo.wzfrontend/src/main/resources/static/workark/static/js/app.9de91bc9.js


+ 5 - 2
virgo.wzfrontend/workark/src/components/work/system/serveSet/processSet.vue

@@ -8,7 +8,8 @@
 		</div>
 		<div class="set-process-box">
 			<process-set-item :list="nowTitle.children" :type="operationType" :roleType="roleType"
-				v-if="nowTitle.children.length>0"></process-set-item>
+				v-if="nowTitle.children.length > 0">
+			</process-set-item>
 			<div v-else>
 				<div v-if="(nowTitle.status === 1 || nowTitle.status === 4) && roleType === 2">
 					<el-button size="mini" type="primary" @click="updateStatus(nowTitle,3)">通过</el-button>
@@ -47,7 +48,9 @@
 				visible: false,
 				isUpdate: false,
 				childList: [],
-				nowTitle: {},
+				nowTitle: {
+					children: []
+				},
 				parent: {}
 			}
 		},

+ 47 - 7
virgo.wzfrontend/workark/src/components/work/system/serveSet/processSetItem.vue

@@ -40,14 +40,27 @@
 							</i>
 						</div>
 						<!-- 内容 -->
-						<div class="process-item-content" v-if="node.children">
-							<!-- 可附件 -->
-							<div v-if="(item.status === 1 || item.status === 4) && item.roleId === roleType">
+						<div class="process-item-content">
+							<div
+								v-if="(item.status === 1 || item.status === 4 || node.status === 1|| node.status === 4) && item.roleId === roleType && node.status!==3">
 								<upload ref="upload" v-model="node.attachmentContent" type="edit" text="上传文件"
 									accept="*">
 								</upload>
+								<div v-if="node.example">
+									<el-link style="margin-right: 10px;" type="primary"
+										v-for="(example,exampleIndex) in JSON.parse(node.example)" :key="exampleIndex"
+										@click="downloadFile(example.id)">
+										下载示例<span>{{exampleIndex+1}}</span>
+									</el-link>
+								</div>
+								<div class="operation-button"
+									v-if="(node.status === 1 || node.status === 4) && item.roleId === roleType && item.status !== 1 && item.status !== 4">
+									<el-button size="mini" @click="submitFile(node)">保存草稿</el-button>
+									<el-button size="mini" type="primary" @click="submitFile(node, 2)">提交</el-button>
+								</div>
 							</div>
-							<div v-else-if="item.status === 2 && roleType === 2">
+							<div
+								v-else-if="(item.status === 2 || node.status === 2 || node.status == 3) && roleType === 2">
 								<upload v-model="node.attachmentContent"></upload>
 								<div class="operation-button" v-if="node.status !== 3 && node.status !== 4">
 									<div class="operation-button-item success" @click="updateStatus(node,3)">
@@ -57,6 +70,9 @@
 										<i class="el-icon-close"></i>
 									</div>
 								</div>
+								<div class="operation-button" v-else-if="node.status !== 4">
+									<el-button size="mini" type="warning" @click="updateStatus(node,1)">修改</el-button>
+								</div>
 							</div>
 							<!-- 展示 -->
 							<div v-else-if="item.status !== 1 && node.attachmentContent">
@@ -72,6 +88,7 @@
 					</div>
 					<div class="operation-button" v-else-if="item.status === 2 && roleType === 2">
 						<el-button size="mini" type="primary" @click="updateStatus(item,3)">通过</el-button>
+						<el-button size="mini" type="warning" @click="updateStatus(item,4)">修改</el-button>
 					</div>
 					<!-- 新增 -->
 					<div class="process-set-insert" @click="edit('insert', item.id)" v-if="type === 'edit'">
@@ -151,7 +168,8 @@
 	const payOrder = () => import('@/components/website/payOrder');
 	import {
 		updateProcessData,
-		updateProcessStatus
+		updateProcessStatus,
+		downloadFile
 	} from '@/api/system'
 	export default {
 		props: ['list', 'type', 'parent', 'roleType'],
@@ -183,7 +201,7 @@
 			},
 			returnItemClass(item, node) {
 				let str = '';
-				let status = node ? (item.status > node.status ? item.status : node.status) : item.status;
+				let status = node ? (node.status > 0 ? node.status : item.status) : item.status;
 				switch (status) {
 					case 1:
 					case 2:
@@ -211,8 +229,9 @@
 			async fileSubmit(item, status) {
 				if (status) updateProcessStatus(status, item.id);
 				for (let i = 0; i < item.children.length; i++) {
-					await this.submit(item.children[i])
+					await this.submit(item.children[i], status);
 				}
+				this.edit('reload');
 				this.$message.success('操作成功');
 			},
 			submit(item, status) {
@@ -221,9 +240,27 @@
 					sequence: item.sequence,
 					attachmentContent: item.attachmentContent
 				};
+				if (status && item.status !== 3) updateProcessStatus(status, item.id);
 				return updateProcessData(data);
 			},
+			submitFile(item, status) {
+				let data = {
+					id: item.id,
+					sequence: item.sequence,
+					attachmentContent: item.attachmentContent
+				};
+				if (status && item.status !== 3) updateProcessStatus(status, item.id);
+				updateProcessData(data).then(res => {
+					if (res.state) {
+						this.$message.success('操作成功');
+						this.edit('reload');
+					}
+				})
+			},
 			updateStatus(item, status) {
+				for (let i = 0; i < item.children.length; i++) {
+					updateProcessStatus(status, item.children[i].id)
+				}
 				updateProcessStatus(status, item.id).then(res => {
 					if (res.state) {
 						this.$message.success('操作成功');
@@ -231,6 +268,9 @@
 					}
 				})
 			},
+			downloadFile(id) {
+				downloadFile(id);
+			},
 			callback(type, operationType) {
 				if (type === 'init' || type === 'cancel') this.visible = false;
 				if (type === 'payState') {