把流程转发功能调整到办公室管理员角色上

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/gwflow/controller/GwFlowController.java

@@ -205,6 +205,8 @@ public class GwFlowController {
 				gwFlowDTOn.setNextUser(userDTO3.getId());
 				if(userDTO.getRoleNames().contains("局领导")){
 					gwFlowDTOn.setWhich("3");
+				}else if(userDTO.getRoleNames().contains("办公室主任")){
+					gwFlowDTOn.setWhich("3");
 				}else{
 					gwFlowDTOn.setWhich("4");
 				}

jp-mobile/pages/fileTransmit/examineFile.vue

@@ -3,17 +3,16 @@
 		<fileCard :gwId="gwId"></fileCard>
 		<view class="office_main">
 			<view class="office_title">
+				<uni-section v-if="istransmit" titleColor="#36a7f3" class="mb-10" title="承办转发"
+					type="line"></uni-section>
 				<uni-section v-if="isoffice" titleColor="#36a7f3" class="mb-10" title="办公室拟办" type="line"></uni-section>
 				<uni-section v-if="isleader" titleColor="#36a7f3" class="mb-10" title="领导批示" type="line"></uni-section>
 				<uni-section v-if="isundertake" titleColor="#36a7f3" class="mb-10" title="承办科室"
 					type="line"></uni-section>
 			</view>
 			<view class="office_info">
-				<u--form v-if="isoffice" :model="auditForm" labelWidth="130px" class="u-form default_title"
+				<u--form v-if="istransmit" :model="auditForm" labelWidth="130px" class="u-form default_title"
 					labelPosition="left" ref="auditForm">
-					<u-form-item v-if="one" label="办公室拟办" borderBottom prop="content">
-						<u--textarea v-model="auditForm.content" placeholder=""></u--textarea>
-					</u-form-item>
 					<u-form-item label="转发领导" borderBottom prop="nextLeadUser">
 						<jp-picker v-model="auditForm.nextLeadUser" placeholder="请选择转发领导" :range="leaderList"
 							rangeKey="name" rangeValue="loginName"></jp-picker>
@@ -22,21 +21,25 @@
 						<office-user-select v-model="auditForm.nextDepUser" placeholder="请选择科室承办"
 							title="科室承办"></office-user-select>
 					</u-form-item>
-					<u-form-item v-if="one" label="备注" borderBottom prop="remark">
+					<u-form-item label="备注" borderBottom prop="remark">
 						<u--input v-model="auditForm.remark" placeholder="请输入备注" border="none"></u--input>
 					</u-form-item>
-					<!-- <u-form-item v-if="show" label="签字" borderBottom prop="signfj">
-						<signInput ref="sign" canvasId="twoDrowCanvas" canvasIds="twoRotateCanvas" :header="header"
-							:action="action" @signToUrl="signToUrl">
-						</signInput>
-					</u-form-item> -->
 					<view class="submit_btn flex ">
 						<u-button v-if="isAll" @click="formSubmit" type="success" text="归档"></u-button>
-						<!-- <u-button v-if="!show && one" :disabled="!auditForm.nextLeadUser!=''" type="primary" text="确认签字"
-							@click="show = true"></u-button> -->
-						<u-button v-if="one && !loading" type="primary" :disabled="auditForm.nextLeadUser==''"
-							text="确认签字" @click="doSubmit"></u-button>
-						<u-button v-if="!one && !loading" type="primary" text="提交" @click="doSubmit"></u-button>
+						<u-button v-if="!loading" type="primary" :disabled="auditForm.nextLeadUser==''" text="确认签字"
+							@click="doSubmit"></u-button>
+						<u-button v-if="loading" :loading="loading" type="primary" text="加载中"></u-button>
+					</view>
+				</u--form>
+			</view>
+			<view class="office_info">
+				<u--form v-if="isoffice" :model="auditForm" labelWidth="130px" class="u-form default_title"
+					labelPosition="left" ref="auditForm">
+					<u-form-item label="办公室拟办" borderBottom prop="content">
+						<u--textarea v-model="auditForm.content" placeholder=""></u--textarea>
+					</u-form-item>
+					<view class="submit_btn flex ">
+						<u-button v-if="!loading" type="primary" text="确认签字" @click="doSubmit"></u-button>
 						<u-button v-if="loading" :loading="loading" type="primary" text="加载中"></u-button>
 					</view>
 				</u--form>
@@ -61,13 +64,7 @@
 					<u-form-item label="承办科室" borderBottom prop="content">
 						<u--textarea v-model="auditForm.content" placeholder=""></u--textarea>
 					</u-form-item>
-					<!-- <u-form-item v-if="show" label="签字" borderBottom prop="signfj">
-						<signInput ref="sign" canvasId="twoDrowCanvas" canvasIds="twoRotateCanvas" :header="header"
-							:action="action" @signToUrl="signToUrl">
-						</signInput>
-					</u-form-item> -->
 					<view class="submit_btn flex ">
-						<!-- <u-button v-if="!show" type="primary" text="确认签字" @click="show = true"></u-button> -->
 						<u-button v-if="loading" :loading="loading" type="primary" text="加载中"></u-button>
 						<u-button v-if="!loading" type="primary" text="确认签字" @click="doSubmit"></u-button>
 					</view>
@@ -95,22 +92,11 @@
 	import gwCirculationCard2Service from '@/api/circulation/gwCirculationCard2.js'
 	import * as $auth from "@/common/auth.js"
 	export default {
-		// onHide() {
-		// 	uni.$emit('refresh', {
-		// 		type: 1
-		// 	})
-		// 	uni.navigateBack()
-		// },
-		// onUnload() {
-		// 	uni.$emit('refresh', {
-		// 		type: 1
-		// 	})
-		// 	uni.navigateBack()
-		// },
 		onLoad(option) {
 			this.gwId = option.id
 			gwFlowService.queryByGwId(this.gwId).then(data => {
-				if (data.length > 1) this.one = false
+				let down = data.filter(item => item.state == 0)
+				if (down.length != 1) this.one = false
 				if (this.one) {
 					this.roleId = "1770353074553331713"
 				} else {
@@ -126,25 +112,26 @@
 				let gw = data.filter(item => {
 					return item.nextUser == user.id && item.state == 1
 				})
-				let down = data.filter(item => item.state == 0)
+				
 				if (gw.length > 0) {
 					this.auditForm = gw[0]
 					if (gw[0].which == '4') this.isAll = true
 					if (!this.auditForm.content) this.auditForm.content = '已阅'
 				}
-				if (role == '办公室主任') {
-					this.isoffice = true
+				if (role == '办公室管理员') {
+					this.istransmit = true
 					if (gw.length == 0) {
 						let gw1 = data.filter(item => {
-							return item.which == 0
+							return item.which == 3
 						})
 						gw1.sort((a, b) => b.createTime.localeCompare(a.createTime) || b.createTime.localeCompare(a
 							.createTime));
 						this.auditForm = gw1[0]
-						if (!this.auditForm.content) this.auditForm.content = '已阅'
+						// if (!this.auditForm.content) this.auditForm.content = '已阅'
 					}
 				}
 				if (role == '局领导' && gw.length > 0) this.isleader = true
+				if (role == '办公室主任' && gw.length > 0) this.isoffice = true
 				if (role == '分管领导' && gw.length > 0) this.isleader = true
 				if (role == '科室负责人' && gw.length > 0) this.isundertake = true
 
@@ -186,6 +173,7 @@
 				isoffice: false,
 				isleader: false,
 				isundertake: false,
+				istransmit: false,
 				leaderList: [],
 				tablePage: {
 					total: 0,
@@ -241,10 +229,10 @@
 			doSubmit() {
 				let inputForm = this.auditForm;
 				this.loading = true
-				if (this.isoffice){
+				if (this.istransmit) {
 					inputForm.next = '1'
-					if(!this.one) inputForm.which = '3'
-				} 
+					if (!this.one) inputForm.which = '3'
+				}
 				inputForm.state = "0"
 				inputForm.gwId = this.gwId
 				const date = moment().format('YYYY-MM-DD HH:mm:ss');

jp-mobile/pages/fileTransmit/fileCard.vue

@@ -3,7 +3,7 @@
 		<view class="card_banner"></view>
 		<view class="card_info">
 			<view class="card_info_title">
-				盐都工信文件阅办卡
+				盐都区工信局文件传阅卡
 			</view>
 			<view class="card_table">
 				<u-row justify="space-between">