From ab5010c56c442df90e18016e84e5462f78e4a81d Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Wed, 3 Jul 2024 11:50:12 +0800
Subject: [PATCH] =?UTF-8?q?app=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jnpf-app/pages/workFlow/flowBefore/index.vue | 10 ++++--
 jnpf-app/pages/workFlow/operate/index.vue    | 33 ++++++++++++++++++--
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/jnpf-app/pages/workFlow/flowBefore/index.vue b/jnpf-app/pages/workFlow/flowBefore/index.vue
index 2ef4bc80..a5b4faa0 100644
--- a/jnpf-app/pages/workFlow/flowBefore/index.vue
+++ b/jnpf-app/pages/workFlow/flowBefore/index.vue
@@ -85,9 +85,12 @@
 		</view>
 
 		<view class="flowBefore-actions" v-if="tabIndex != 4 && tabIndex != 3">
-			<u-button class="buttom-btn" :loading="btnLoading" @click="showAction = true"
+<!-- 			<u-button class="buttom-btn" :loading="btnLoading" @click="showAction = true"
 				v-if="actionListLength && !pureForm">
 				更多<u-icon name="arrow-down" size="24"></u-icon>
+			</u-button> -->
+			<u-button class="buttom-btn" type="warning " v-if="config.opType == 1&&properties.hasTransferBtn"
+				@click.stop="eventReceiver({}, 'transfer')">转审
 			</u-button>
 			<template
 				v-if="(config.type === 1 && (config.jurisdictionType === 'btn_edit' || config.jurisdictionType === 'btn_add') && config.opType=='-1')|| (config.type !== 1 && config.opType=='-1')">
@@ -112,7 +115,10 @@
 				v-if="config.opType == 2 && properties.hasRevokeBtn">
 				{{properties.revokeBtnText||'撤回'}}
 			</u-button>
-			<u-button class="buttom-btn" @click.stop="jnpf.goBack()">取消</u-button>
+			<!-- <u-button class="buttom-btn" @click.stop="jnpf.goBack()">取消</u-button> -->
+			<u-button class="buttom-btn" type="error " v-if="config.opType == 1&&properties.hasRejectBtn"
+				@click.stop="eventReceiver({}, 'reject')">拒绝
+			</u-button>
 		</view>
 		<u-select :list="flowUrgentList" v-model="showFlowUrgent" @confirm="seltConfirm"
 			:default-value="defaultValue" />
diff --git a/jnpf-app/pages/workFlow/operate/index.vue b/jnpf-app/pages/workFlow/operate/index.vue
index 892ef3ae..162b5a8f 100644
--- a/jnpf-app/pages/workFlow/operate/index.vue
+++ b/jnpf-app/pages/workFlow/operate/index.vue
@@ -45,11 +45,19 @@
 					<u-form-item :label="opinionName" prop="handleOpinion"
 						v-if="config.eventType !== 'submit' && config.hasOpinion">
 						<u-input v-model="dataForm.handleOpinion" type="textarea" :placeholder="placeholder" />
-						<view class="u-p-10"
+<!-- 						<view class="u-p-10"
 							v-if="config.eventType != 'transfer' &&config.eventType != 'recall' &&config.eventType !== 'revoke'">
 							<u-button type="info" size="mini" @click="commonWords">常用语</u-button>
-						</view>
+						</view> -->
 					</u-form-item>
+					<view class="tagsbox">
+						<u-tag class="tag-item" v-for="tag in commonWordsList" :key="tag" :text="tag.commonWordsText" closeable
+							@close="delCommonWord(tag)" @click="selectCommonWord(tag)" />
+						<u-input class="tag-ipt" v-if="inputVisible" ref="saveTagInput" v-model="tagValue" :type="type"
+							:focus="focus" :border="border" @keyup.enter.native="handleInputConfirm"
+							@blur="handleInputConfirm" />
+						<u-button class="tag-btn" v-else type="info" size="mini" @click="editCommonWord">+ 新增常用语</u-button>
+					</view>
 					<u-form-item :label="config.title + '附件'" prop="fileList"
 						v-if="config.eventType !== 'submit' && config.hasOpinion">
 						<jnpf-file v-model="dataForm.fileList" :limit="3" />
@@ -150,6 +158,7 @@
 		},
 		data() {
 			return {
+				dynamicTags: [],
 				placeholder: "请输入意见",
 				icon: resources.message.nodata,
 				customStyle: {
@@ -297,6 +306,9 @@
 			uni.$off("confirm");
 		},
 		methods: {
+			useTag(tag) {
+				this.dataForm.handleOpinion = tag;
+			},
 			init() {
 				if (this.candidateType == 1) {
 					let list = [];
@@ -526,7 +538,22 @@
 	page {
 		height: 100%;
 	}
-
+	.tagsbox {
+		background-color: $uni-bg-color;
+		padding: 0px 45px;
+	
+		.tag-item {
+			margin: 10px;
+		}
+	
+		.tag-btn {
+			margin: 10px;
+		}
+	
+		.tag-ipt {
+			margin: 10px;
+		}
+	}
 	.form-item {
 		&::after {
 			border-bottom-width: 0px !important;