Merge remote-tracking branch 'origin/master'

src/components/scWorkflow/nodes/addNode.vue

@@ -49,8 +49,8 @@ export default {
 	mounted() {},
 	methods: {
 		addType(type) {
-			var node = {}
-			if (type == 1) {
+			let node = {}
+			if (type === 1) {
 				node = {
 					nodeName: '审核人',
 					type: 1, //节点类型
@@ -69,7 +69,7 @@ export default {
 					childNode: this.modelValue,
 					typeOfApprover: '1' // 审批类型 1:人工审批 2:自动通过 3:自动拒绝
 				}
-			} else if (type == 2) {
+			} else if (type === 2) {
 				node = {
 					nodeName: '抄送人',
 					type: 2,
@@ -77,7 +77,7 @@ export default {
 					nodeAssigneeList: [],
 					childNode: this.modelValue
 				}
-			} else if (type == 4) {
+			} else if (type === 4) {
 				node = {
 					nodeName: '条件路由',
 					type: 4,
@@ -99,7 +99,7 @@ export default {
 					],
 					childNode: this.modelValue
 				}
-			} else if (type == 6) {
+			} else if (type === 6) {
 				node = {
 					nodeName: '延时处理',
 					type: 6,
@@ -110,7 +110,7 @@ export default {
 					},
 					childNode: this.modelValue
 				}
-			} else if (type == 7) {
+			} else if (type === 7) {
 				node = {
 					nodeName: '触发器',
 					type: 7,
@@ -125,6 +125,7 @@ export default {
 					childNode: this.modelValue
 				}
 			}
+			node.nodeKey = 'flk' + Date.now()
 			this.$emit('update:modelValue', node)
 		}
 	}

src/components/scWorkflow/nodes/promoter.vue

@@ -88,7 +88,6 @@ export default {
 	methods: {
 		show() {
 			if (this.disabled) return
-			this.form = {}
 			this.form = JSON.parse(JSON.stringify(this.nodeConfig))
 			this.isEditTitle = false
 			this.drawer = true
@@ -113,6 +112,7 @@ export default {
 			this.drawer = false
 		},
 		toText(nodeConfig) {
+			nodeConfig.nodeKey = 'flk' + Date.now()
 			if (nodeConfig.nodeAssigneeList && nodeConfig.nodeAssigneeList.length > 0) {
 				return nodeConfig.nodeAssigneeList.map(item => item.name).join('、')
 			} else {

src/views/approve/components/approvedItem.vue

@@ -96,9 +96,9 @@
 							</div>
 						</template>
 
-						<div v-if="i.currentNode !== 'complete'" class="summary-item">
+						<div v-if="i.currentNodeName !== 'complete'" class="summary-item">
 							<div class="label">当前所在节点：</div>
-							<div class="value">{{ i.currentNode }}</div>
+							<div class="value">{{ i.currentNodeName }}</div>
 						</div>
 					</div>
 					<!--底部-->
@@ -296,7 +296,7 @@ const getPagedSatellites = async isInit => {
 			// 待审批、认领 [会签/货签/票钱、当前所在节点]
 			const flag1 = ['myReceived', 'myApplication', 'approved'].indexOf(props.currentTaskType) !== -1
 			const flag2 = ['pendingApproval', 'pendingClaim'].indexOf(props.currentTaskType) !== -1
-			item.currentNode = flag2 ? item.taskName : item.currentNode // 当前节点
+			item.currentNodeName = flag2 ? item.taskName : item.currentNodeName // 当前节点
 			item.createTime = flag2 ? item.launchTime : item.createTime // 创建时间
 			item.createBy = flag2 ? item.launchBy : item.createBy // 创建人
 			if (!isInit) {