Merge remote-tracking branch 'origin/master'

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/controller/GwCirculationCard2Controller.java

@@ -144,7 +144,7 @@ public class GwCirculationCard2Controller {
 	 */
 	@ApiLog("根据Id获取公文流转数据")
 	@ApiOperation(value = "根据Id获取公文流转数据")
-	@PreAuthorize("hasAnyAuthority('circulation2:gwCirculationCard2:view','circulation2:gwCirculationCard2:add','circulation2:gwCirculationCard2:edit')")
+//	@PreAuthorize("hasAnyAuthority('circulation2:gwCirculationCard2:view','circulation2:gwCirculationCard2:add','circulation2:gwCirculationCard2:edit')")
 	@GetMapping("queryById")
 	public ResponseEntity<GwCirculationCard2DTO> queryById(String id) {
 		return ResponseEntity.ok ( gwCirculationCard2Wrapper.toDTO ( gwCirculationCard2Service.getById ( id ) ) );

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

@@ -80,7 +80,7 @@ public class GwFlowController {
 	 */
 	@ApiLog("根据Id获取公文流程数据")
 	@ApiOperation(value = "根据Id获取公文流程数据")
-	@PreAuthorize("hasAnyAuthority('gwflow:gwFlow:view','gwflow:gwFlow:add','gwflow:gwFlow:edit')")
+//	@PreAuthorize("hasAnyAuthority('gwflow:gwFlow:view','gwflow:gwFlow:add','gwflow:gwFlow:edit')")
 	@GetMapping("queryById")
 	public ResponseEntity<GwFlowDTO> queryById(String id) {
 		return ResponseEntity.ok ( gwFlowWrapper.toDTO ( gwFlowService.getById ( id ) ) );
@@ -101,7 +101,7 @@ public class GwFlowController {
 	 */
 	@ApiLog("保存公文流程")
 	@ApiOperation(value = "保存公文流程")
-	@PreAuthorize("hasAnyAuthority('gwflow:gwFlow:add','gwflow:gwFlow:edit')")
+//	@PreAuthorize("hasAnyAuthority('gwflow:gwFlow:add','gwflow:gwFlow:edit')")
 	@PostMapping("save")
 	public  ResponseEntity <String> save(@Valid @RequestBody GwFlowDTO gwFlowDTO) {
 		//新增或编辑表单保存
@@ -135,7 +135,7 @@ public class GwFlowController {
 		if(gwFlowDTO.getNext()!=null&&gwFlowDTO.getNext().equals("1")){
 
 			//有选择领导的时候新增
-			if(gwFlowDTO.getNextLeadUser()!=null&&gwFlowDTO.getNextLeadUser().contains(",")) {
+			if(gwFlowDTO.getNextLeadUser()!=null) {
 			   String [] NextLeadUsers=gwFlowDTO.getNextLeadUser().split(",");
 				for (String user:NextLeadUsers) {//每个领导都生成一条流程数据
 					if(!user.equals("")){
@@ -156,7 +156,7 @@ public class GwFlowController {
 
 
 			//有选择科室承办的时候新增
-			if(gwFlowDTO.getNextDepUser()!=null&&gwFlowDTO.getNextDepUser().contains(",")) {
+			if(gwFlowDTO.getNextDepUser()!=null) {
 				String [] NextDepUsers=gwFlowDTO.getNextDepUser().split(",");
 				for (String user:NextDepUsers) {//每个领导都生成一条流程数据
 					if(!user.equals("")){

jp-mobile/api/circulation/gwFlowService.js

@@ -0,0 +1,67 @@
+import request from "../../common/request";
+
+export default {
+	save: function (inputForm) {
+		return request({
+			url: "/gwflow/gwFlow/save",
+			method: "post",
+			data: inputForm,
+		});
+	},
+
+	delete: function (ids) {
+		return request({
+			url: "/gwflow/gwFlow/delete",
+			method: "delete",
+			params: { ids: ids },
+		});
+	},
+
+	queryById: function (id) {
+		return request({
+			url: "/gwflow/gwFlow/queryById",
+			method: "get",
+			params: { id: id },
+		});
+	},
+	queryByGwId: function (id) {
+		return request({
+			url: "/gwflow/gwFlow/queryByGwId",
+			method: "get",
+			params: { Gwid: id },
+		});
+	},
+
+	list: function (params) {
+		return request({
+			url: "/gwflow/gwFlow/list",
+			method: "get",
+			params: params,
+		});
+	},
+
+	exportTemplate: function () {
+		return request({
+			url: "/gwflow/gwFlow/import/template",
+			method: "get",
+			responseType: "blob",
+		});
+	},
+
+	exportExcel: function (params) {
+		return request({
+			url: "/gwflow/gwFlow/export",
+			method: "get",
+			params: params,
+			responseType: "blob",
+		});
+	},
+
+	importExcel: function (data) {
+		return request({
+			url: "/gwflow/gwFlow/import",
+			method: "post",
+			data: data,
+		});
+	},
+};

jp-mobile/components/jp-picker/jp-picker.vue

@@ -50,13 +50,14 @@
 				handler (val) {
 					if(val) {
 						let options = this.range.filter((option)=>{
-							return option.value === val
+							return option[this.rangeValue] === val
 						})
 						if(options.length === 0){
 							this.label = '请选择'
 						} else {
 							this.label = options[0][this.rangeKey]
 						}
+						
 					}
 				},
 				immediate: true,

jp-mobile/components/office-user-select/office-user-select.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="width: 100%;" @tap="open">
-		<u--input v-model="labels" suffixIcon="arrow-right" suffixIconStyle="color: #909399" disabled
+		<u--input v-model="labels" suffixIcon="arrow-right" suffixIconStyle="color: #17a2f8" disabled
 			disabledColor="#ffffff" :placeholder="placeholder" border="none"></u--input>
 
 		<u-action-sheet :show="show" @close="show = false">
@@ -130,7 +130,7 @@
 
 			selectUser() {
 				let ids = this.selectList.map((item) => {
-					return item.id
+					return item.loginName
 				}).join(",");
 				let names = this.selectList.map((item) => {
 					return item.name

jp-mobile/pages/fileTransmit/addFileTransmit.vue

@@ -4,10 +4,10 @@
 			<u--form :model="inputForm" labelWidth="130px" class="u-form default_title" labelPosition="left"
 				ref="inputForm">
 				<u-form-item label="年度" borderBottom prop="yearNum">
-					<u--input placeholder="输入年度" border="none"></u--input>
+					<u--input v-model="inputForm.yearNum" placeholder="输入年度" border="none"></u--input>
 				</u-form-item>
 				<u-form-item label="卡号" borderBottom prop="cardNum">
-					<u--input placeholder="输入卡号" border="none"></u--input>
+					<u--input v-model="inputForm.cardNum" placeholder="输入卡号" border="none"></u--input>
 				</u-form-item>
 			</u--form>
 		</view>
@@ -48,12 +48,12 @@
 				<u-upload :fileList="imgList" multiple :maxCount="imgList.length" :previewFullImage="true"></u-upload>
 				<u--text size="12" type="error" text="请确保上传图片内容清晰可见,所有涉密敏感信息不得上传"></u--text>
 				<view class="submit_btn flex">
-					<u-button type="primary" text="提交新增" @click="formSubmit"></u-button>
+					<u-button v-if="!loading" type="primary" text="提交新增" @click="formSubmit"></u-button>
+					<u-button v-if="loading" :loading="loading" type="primary" text="加载中"></u-button>
 				</view>
 			</u--form>
-
-
 		</view>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -65,6 +65,7 @@
 	export default {
 		data() {
 			return {
+				loading: false,
 				fileLists: [],
 				fileList: [],
 				imgList: [],
@@ -85,6 +86,16 @@
 			}
 		},
 		methods: {
+			showToast(params) {
+				this.$refs.uToast.show({
+					...params,
+					complete() {
+						params.url && uni.navigateTo({
+							url: params.url
+						})
+					}
+				})
+			},
 			// 新增图片
 			async afterRead(event) {
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
@@ -138,17 +149,30 @@
 			},
 			// 表单提交
 			formSubmit() {
+				this.loading = true
 				// this.$refs['inputForm'].validate((valid) => {
 				// 	if (valid) {
-						gwCirculationCard2Service.save(this.inputForm).then((data) => {
-							
-							this.$message.success(data)
-							 uni.reLaunch({
-							        url: '/pages/fileTransmit/addFileTransmit' 
-							      });
-						}).catch(() => {
-							
-						})
+				gwCirculationCard2Service.save(this.inputForm).then((data) => {
+
+					let param = {
+						type: 'success',
+						message: data,
+						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png',
+					}
+					this.showToast(param);
+					setTimeout(() => {
+						uni.redirectTo({
+							url: '/pages/fileTransmit/addFileTransmit'
+						});
+					}, 500)
+				}).catch(() => {
+					let param = {
+						type: 'error',
+						message: data,
+						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png',
+					}
+					this.showToast(param);
+				})
 				// 	}
 				// })
 			}

jp-mobile/pages/fileTransmit/examineFile.vue

@@ -1,45 +1,76 @@
 <template>
 	<view class="office_page">
-		<fileCard :isoffice="isoffice" :isleader="isleader" :isinfo="true"></fileCard>
+		<fileCard :gwId="gwId"></fileCard>
 		<view class="office_main">
 			<view class="office_title">
 				<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"
 					labelPosition="left" ref="auditForm">
-					<u-form-item label="办公室拟办" borderBottom prop="title">
-						<u--textarea placeholder=""></u--textarea>
+					<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="teDate">
-						<jp-picker placeholder="请选择转发领导" :range="leaderList" rangeKey="name" rangeValue="id"></jp-picker>
+					<u-form-item label="转发领导" borderBottom prop="nextLeadUser">
+						<jp-picker v-model="auditForm.nextLeadUser" placeholder="请选择转发领导" :range="leaderList"
+							rangeKey="name" rangeValue="loginName"></jp-picker>
 					</u-form-item>
-					<u-form-item label="科室承办" borderBottom prop="teDate">
-						<office-user-select  placeholder="请选择科室承办" title="科室承办"></office-user-select>
+					<u-form-item label="科室承办" borderBottom prop="nextDepUser">
+						<office-user-select v-model="auditForm.nextDepUser" placeholder="请选择科室承办"
+							title="科室承办"></office-user-select>
 					</u-form-item>
-					<u-form-item label="备注" borderBottom prop="message">
-						<u--input placeholder="请输入备注" border="none"></u--input>
+					<u-form-item v-if="one" 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 @click="formSubmit" color="#36a7f3" plain hairline type="primary" text="暂存待办"></u-button> -->
-						<u-button disabled="" type="primary" text="确认签字"></u-button>
+						<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="show || !one" type="primary" text="提交" @click="doSubmit"></u-button>
 					</view>
 				</u--form>
 				<u--form v-if="isleader" :model="auditForm" labelWidth="130px" class="u-form default_title"
 					labelPosition="left" ref="auditForm">
-					<u-form-item label="领导批示" borderBottom prop="title">
-						<u--textarea placeholder=""></u--textarea>
+					<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="show" type="primary" text="提交" @click="doSubmit"></u-button>
+					</view>
+				</u--form>
+				<u--form v-if="isundertake" :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>
+					<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 disabled="" type="primary" text="确认签字"></u-button>
+						<u-button v-if="!show" type="primary" text="确认签字" @click="show = true"></u-button>
+						<u-button v-if="show" type="primary" text="提交" @click="doSubmit"></u-button>
 					</view>
 				</u--form>
-				<!-- <signInput ref="sign" canvasId="twoDrowCanvas" canvasIds="twoRotateCanvas" :header="header"
-					:action="action" @signToUrl="signToUrl">
-				</signInput> -->
 			</view>
 		</view>
+		<u-toast ref="uToast"></u-toast>
+
 	</view>
 
 </template>
@@ -49,31 +80,74 @@
 	import signInput from "@/components/am-sign-input/am-sign-input.vue"
 	import officeUserSelect from "@/components/office-user-select/office-user-select.vue"
 	import userService from "@/api/sys/userService"
+	import gwFlowService from '@/api/circulation/gwFlowService.js'
+	import gwCirculationCard2Service from '@/api/circulation/gwCirculationCard2.js'
+	import * as $auth from "@/common/auth.js"
 	export default {
+		onLoad(option) {
+			this.gwId = option.id
+			gwFlowService.queryByGwId(this.gwId).then(data => {
+				if (data.length > 1) this.one = false
+				let user = $auth.getUserInfo()
+				let role = $auth.getUserInfo().roleNames
+				let gw = data.filter(item => {
+					return item.nextUser == user.id && item.state == 1
+				})
+				let down = data.filter(item => item.state == 0)
+				if (down.length == data.length) this.isAll = true
+				if (gw.length > 0) {
+					this.auditForm = gw[0]
+				}
+				if (role == '办公室主任') this.isoffice = true
+				if (role == '局领导' && gw.length > 0) this.isleader = true
+				if (role == '科室负责人' && gw.length > 0) this.isundertake = true
+			})
+		},
 		components: {
 			fileCard,
 			signInput,
 			officeUserSelect
 		},
 		mounted() {
-			this.searchForm.officeDTO.id="1770354910488272897"
+
+			this.searchForm.officeDTO.id = "1770354910488272897"
 			userService.list({
 				current: this.tablePage.currentPage,
 				size: this.tablePage.pageSize,
 				orders: this.tablePage.orders,
 				...this.searchForm
 			}).then(data => {
-				console.log("user=============", data);
 				this.leaderList = data.records
 			})
 		},
 		data() {
 			return {
+
+				isAll: false,
+				show: false,
+				one: true,
 				action: "", //上传服务器的地址
 				header: {}, //图片上传携带头部信息
-				auditForm: {},
-				isoffice: true,
+				auditForm: {
+					id: '',
+					gwId: '',
+					content: '',
+					signfj: '',
+					createTruename: '',
+					nextTruename: '',
+					nextUser: '',
+					which: '',
+					state: '0',
+
+					next: '',
+					nextLeadUser: '',
+					nextDepUser: '',
+					remark: '',
+				},
+				gwId: "",
+				isoffice: false,
 				isleader: false,
+				isundertake: false,
 				leaderList: [],
 				tablePage: {
 					total: 0,
@@ -97,6 +171,16 @@
 			}
 		},
 		methods: {
+			showToast(params) {
+				this.$refs.uToast.show({
+					...params,
+					complete() {
+						params.url && uni.navigateTo({
+							url: params.url
+						})
+					}
+				})
+			},
 			/**
 			 * @param {Object} e
 			 * 签名完成回调
@@ -110,6 +194,57 @@
 					return
 				}
 			},
+			// 提交表单
+			doSubmit() {
+				if (this.auditForm.nextLeadUser != '' || this.auditForm.nextDepUser != '') this.auditForm.next = '1'
+				this.auditForm.state = "0"
+				gwFlowService.save(this.auditForm).then(data => {
+					let param = {
+						type: 'success',
+						message: data,
+						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png',
+					}
+					this.showToast(param);
+					setTimeout(() => {
+						uni.redirectTo({
+							url: 'pages/fileTransmit/fileTransmitList?type=1'
+						});
+					}, 500)
+				}).catch(() => {
+					let param = {
+						type: 'error',
+						message: data,
+						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png',
+					}
+					this.showToast(param);
+				})
+			},
+			// 归档
+			formSubmit() {
+				gwCirculationCard2Service.queryById(this.gwId).then(data => {
+					data.state = '3'
+					gwCirculationCard2Service.save(data).then(res => {
+						let param = {
+								type: 'success',
+								message: data,
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png',
+							}
+							this.showToast(param);
+							setTimeout(() => {
+								uni.redirectTo({
+									url: 'pages/fileTransmit/fileTransmitList?type=3'
+								});
+							}, 500)
+						}).catch(() => {
+							let param = {
+								type: 'error',
+								message: data,
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/error.png',
+							}
+							this.showToast(param);
+						})
+				})
+			}
 		}
 	}
 </script>

jp-mobile/pages/fileTransmit/fileCard.vue

@@ -8,38 +8,38 @@
 			<view class="card_table">
 				<u-row justify="space-between">
 					<u-col span="6">
-						<view>年度： 2024</view>
+						<view>年度： {{inputForm.yearNum}}</view>
 					</u-col>
 					<u-col span="6">
-						<view style="text-align: right;">[2024]001号</view>
+						<view style="text-align: right;">{{inputForm.cardNum}}</view>
 					</u-col>
 				</u-row>
 				<u-row justify="space-between" class="card_row">
 					<u-col span="3" textAlign="center" class="card_col">
 						<view>来文机关</view>
 					</u-col>
-					<u-col span="3" textAlign="center" class="card_col">
-						<view>[2024]001号</view>
+					<u-col span="3" textAlign="center" class="">
+						<view>{{inputForm.sendingAgency}}</view>
 					</u-col>
-					<u-col span="3" textAlign="center" class="card_col">
+					<u-col span="3" textAlign="center" class="card_col card_col_1">
 						<view>来文字号</view>
 					</u-col>
 					<u-col span="3" textAlign="center">
-						<view>[2024]001号</view>
+						<view>{{inputForm.docFontSize}}</view>
 					</u-col>
 				</u-row>
 				<u-row justify="space-between" class="card_row card_row_border">
 					<u-col span="3" textAlign="center" class="card_col">
 						<view>收文时间</view>
 					</u-col>
-					<u-col span="3" textAlign="center" class="card_col">
-						<view>[2024]001号</view>
+					<u-col span="3" textAlign="center" class="">
+						<view>{{inputForm.receivingTime}}</view>
 					</u-col>
-					<u-col span="3" textAlign="center" class="card_col">
+					<u-col span="3" textAlign="center" class="card_col card_col_1">
 						<view>文件来源</view>
 					</u-col>
 					<u-col span="3" textAlign="center">
-						<view>[2024]001号</view>
+						<view>{{inputForm.fileSource}}</view>
 					</u-col>
 				</u-row>
 				<u-row justify="space-between" class="card_row card_row_border">
@@ -48,60 +48,59 @@
 					</u-col>
 					<u-col span="9" class="info_abstract">
 						<view class="info_abstract_v">
-							[2024]001号11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+							{{inputForm.contentSummary}}
 						</view>
 					</u-col>
 				</u-row>
-				<u-row v-if="isleader || isinfo" style="height: 70px;" justify="space-between" class="card_row card_row_border">
-					<u-col span="1" textAlign="center" >
+				<u-row v-if="officeInfo.length>0" style="height: 70px;" justify="space-between"
+					class="card_row card_row_border">
+					<u-col span="1" textAlign="center">
 						<view class="vertical-text">办公室拟办</view>
 					</u-col>
-					<u-col  span="11" class="info_abstract">
-						<view class="info_abstract_v">
-							<view >
-								请领导长阅，承办地方阅处。
+					<u-col span="11" class="info_abstract">
+						<view v-for="item in officeInfo" class="info_abstract_v">
+							<view>
+								{{item.content}}
 							</view>
 							<view class="flex " style="line-height: 20px;">
 								<u--image :src="src" width="80px" height="20px"></u--image>
-								2024-3-21 00:00
+								{{item.updateTime}}
 							</view>
 						</view>
-							
-							
 					</u-col>
 				</u-row>
-				<u-row v-if="isinfo" justify="space-between" class="card_row card_row_border">
-					<u-col span="1" textAlign="center" >
+				<u-row v-if="leaderInfo.length>0" justify="space-between" class="card_row card_row_border">
+					<u-col span="1" textAlign="center">
 						<view class="vertical-text">领导批示</view>
 					</u-col>
-					<u-col  span="11" class="info_abstract">
-						<view class="info_abstract_v">
-							<view >
-								请领导长阅，承办地方阅处。
+					<u-col span="11" class="info_abstract">
+						<view v-for="leader in leaderInfo" class="info_abstract_v">
+							<view>
+								{{leader.content}}
 							</view>
 							<view class="flex " style="line-height: 20px;">
 								<u--image :src="src" width="80px" height="20px"></u--image>
-								2024-3-21 00:00
+								{{leader.updateTime}}
 							</view>
 						</view>
 					</u-col>
 				</u-row>
-				<u-row v-if="isinfo"  justify="space-between" class="card_row card_row_border">
-					<u-col span="1" textAlign="center" >
+				<u-row v-if="undertakeInfo.length>0" justify="space-between" class="card_row card_row_border">
+					<u-col span="1" textAlign="center">
 						<view class="vertical-text">承办情况</view>
 					</u-col>
-					<u-col  span="11" class="info_abstract">
-						<view class="info_abstract_v">
-							承办地方      2024-3-21 00:00
+					<u-col span="11" class="info_abstract">
+						<view v-for="item in undertakeInfo" class="info_abstract_v">
+							{{item.content}} {{item.updateTime}}
 						</view>
 					</u-col>
 				</u-row>
-				<u-row v-if="isinfo" justify="space-between" class="card_row card_row_border">
+				<u-row justify="space-between" class="card_row card_row_border">
 					<u-col span="3" textAlign="center" class="card_col">
 						<view>备注</view>
 					</u-col>
-					<u-col span="9" textAlign="center" >
-						<view>[2024]001号</view>
+					<u-col span="9" textAlign="center">
+						<view>{{inputForm.remark}}</view>
 					</u-col>
 				</u-row>
 				<u--text style="margin: 10px;" size="12" type="error" text="所有涉密敏感信息不得上传"></u--text>
@@ -109,36 +108,56 @@
 					附件：
 					<view class="other_info" v-for="item in fileList">
 						<view class="other_pdf  flex  ">
-							<u--text mode="link" :text="item.name" :href="item.url" ></u--text>
+							<u--text mode="link" :text="item.name" :href="item.url"></u--text>
 						</view>
 					</view>
-					<u-upload
-						:fileList="imgList"
-						name="3"
-						multiple
-						:maxCount="imgList.length"
-						:previewFullImage="true"
-						:deletable="false"
-					></u-upload>
+					<u-upload :fileList="imgList" name="3" multiple :maxCount="imgList.length" :previewFullImage="true"
+						:deletable="false"></u-upload>
 				</view>
 			</view>
 
 		</view>
+		<u-overlay :show="ismask">
+				<view class="warp">
+					<view class="rect"><u-button plain loading loadingText="加载中"></u-button></view>
+				</view>
+			</u-overlay>
 	</view>
 </template>
 
 <script>
-	import {isImageFormat} from "@/common/util.js"
+	import {
+		isImageFormat
+	} from "@/common/util.js"
+	import gwCirculationCard2Service from '@/api/circulation/gwCirculationCard2.js'
+	import gwFlowService from '@/api/circulation/gwFlowService.js'
+
 	export default {
 		mounted() {
-			this.fileLists.forEach(item =>{
-				if(isImageFormat(item.url)){
+			gwCirculationCard2Service.queryById(this.gwId).then(data => {
+				this.inputForm = data
+				this.inputForm.receivingTime = this.inputForm.receivingTime.substring(5, 10)
+			})
+			gwFlowService.queryByGwId(this.gwId).then(data => {
+				data.forEach(item =>{
+					if(item.which == 0 && item.state ==0) {
+						this.officeInfo.push(item)
+					}else if(item.which==1 && item.state ==0){
+						this.leaderInfo.push(item)
+					}else if(item.which==2 && item.state ==0) {
+						this.undertakeInfo.push(item)
+					}
+				})
+				this.ismask = false
+			})
+			this.fileLists.forEach(item => {
+				if (isImageFormat(item.url)) {
 					this.imgList.push(item)
-				}else{
+				} else {
 					const fileName = item.url.split(/[/\\]/).pop();
 					let a = {
 						name: fileName,
-						url:item.url
+						url: item.url
 					}
 					this.fileList.push(a)
 				}
@@ -146,25 +165,46 @@
 		},
 		data() {
 			return {
+				ismask:true,
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
-				fileLists:[{
-					url:"https://cdn.uviewui.com/uview/album/1.txt"
-				},{
-					url:"https://cdn.uviewui.com/uview/album/1.pdf",
+				// 公文附件
+				fileLists: [],
+				fileList: [],
+				imgList: [],
+				// 办公室信息
+				officeInfo:[],
+				// 领导信息
+				leaderInfo:[],
+				// 承办信息
+				undertakeInfo:[],
+				inputForm: {
+					id: '',
+					yearNum: '',
+					cardNum: '',
+					sendingAgency: '',
+					docFontSize: '',
+					fileSource: '',
+					writtenTime: '',
+					receivingTime: '',
+					contentSummary: '',
+					attachedDocumentId: ''
 				},
-				{
-					url: 'https://cdn.uviewui.com/uview/album/1.jpg',
+				gwflow: {
+					id: '',
+					gwId: '',
+					content: '',
+					signfj: '',
+					createTruename: '',
+					nextTruename: '',
+					nextUser: '',
+					which: '',
+					state: '',
+
+					next: '',
+					nextLeadUser: '',
+					nextDepUser: '',
+					remark: '',
 				},
-				{
-					url: 'https://cdn.uviewui.com/uview/album/1.jpg',
-				},{
-					url: 'https://cdn.uviewui.com/uview/album/1.jpg',
-				}],
-				fileList:[],
-				imgList:[]
-				// isoffice: false,
-				// isleader: false,
-				// isinfo: false
 			}
 		},
 		props: {
@@ -180,11 +220,21 @@
 				type: Boolean,
 				default: false
 			},
+			gwId: {
+				type: String,
+
+			}
 		},
 	}
 </script>
 
 <style>
+	.warp {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 100%;
+		}
 	.card_main {
 		width: 100%;
 		background-color: #fefefe;
@@ -222,21 +272,29 @@
 		border: 1px solid;
 		word-wrap: break-word;
 	}
+
 	.card_row_border {
 		border-top: none;
 	}
+
 	.card_col {
 		border-right: 1px solid;
 	}
 
+	.card_col_1 {
+		border-left: 1px solid;
+	}
+
 	.info_abstract {
 		line-height: 16px;
 		word-wrap: break-word;
 		border-left: 1px solid;
 	}
+
 	.info_abstract_v {
 		margin: 18px;
 	}
+
 	.vertical-text {
 		writing-mode: vertical-rl;
 		/* 文字垂直排列，从右向左 */

jp-mobile/pages/fileTransmit/fileInfo.vue

@@ -1,22 +1,65 @@
 <template>
 	<view class="info_page">
-		<fileCard :isinfo="true"></fileCard>
+		<fileCard :gwId="gwId"></fileCard>
 		<view class="info_main">
-			<u-steps current="0" direction="column" inactiveColor="#36a7f3" activeColor="#5fdf50">
-					<u-steps-item title="办公室拟办" desc="名字 - 2024-3-21 00:00">
-					</u-steps-item>
-					<u-steps-item title="领导审批" desc="名字 - 2024-3-21 00:00" ></u-steps-item>
-					<u-steps-item title="承办情况" ></u-steps-item>
-				</u-steps>
+			<u-steps :current="current" direction="column" inactiveColor="#36a7f3" activeColor="#5fdf50">
+				<u-steps-item v-for="item in downList" :title="item.which=='0'?'办公室拟办':item.which=='1'?'领导审批':'承办情况'"
+					:desc="item.nextTruename +' - '+item.updateTime">
+				</u-steps-item>
+				<u-steps-item v-for="item in officeInfo" title="办公室拟办" :desc="item.nextTruename +' - '+item.updateTime">
+				</u-steps-item>
+				<u-steps-item title="领导审批" v-for="item in leaderInfo"
+					:desc="item.nextTruename +' - '+item.updateTime"></u-steps-item>
+				<u-steps-item title="承办情况" v-for="item in undertakeInfo"
+					:desc="item.nextTruename +' - '+item.updateTime"></u-steps-item>
+			</u-steps>
 		</view>
 	</view>
 </template>
 
 <script>
 	import fileCard from "./fileCard.vue"
-	export default{
-		components:{
+	import gwFlowService from '@/api/circulation/gwFlowService.js'
+	import gwCirculationCard2Service from '@/api/circulation/gwCirculationCard2.js'
+	export default {
+		onLoad(option) {
+			this.gwId = option.id
+
+		},
+		components: {
 			fileCard,
+		},
+		data() {
+			return {
+				gwId: '',
+				// 办公室信息
+				officeInfo: [],
+				// 领导信息
+				leaderInfo: [],
+				// 承办信息
+				undertakeInfo: [],
+				downList: [],
+				current: 0
+			}
+		},
+		mounted() {
+			gwFlowService.queryByGwId(this.gwId).then(data => {
+				console.log("data========", data);
+				data.forEach(item => {
+					if (item.state == 0) this.downList.push(item)
+					if (item.which == 0 && item.state == 1) {
+						this.officeInfo.push(item)
+					} else if (item.which == 1 && item.state == 1) {
+						if (item.state == 1) this.current = 1
+						this.leaderInfo.push(item)
+					} else if (item.which == 2 && item.state == 1) {
+						if (item.state == 1) this.current = 2
+						this.undertakeInfo.push(item)
+					}
+				})
+				this.downList.sort((a, b) => a.createTime.localeCompare(b.createTime) || a.createTime.localeCompare(b.createTime));
+				this.current = this.downList.length
+			})
 		}
 	}
 </script>
@@ -26,6 +69,7 @@
 		width: 100%;
 		background-color: #fefefe;
 	}
+
 	.info_main {
 		margin: 20px;
 	}

jp-mobile/pages/fileTransmit/fileTransmitList.vue

@@ -8,7 +8,7 @@
 		</view>
 		<view class="list_content">
 			<u-cell-group>
-				<u-cell v-for="item in dataList">
+				<u-cell v-for="item in dataList" @click="toInfo(item)">
 					<view slot="title">
 						<view class="text-bold text-black">
 							<view class="ellipsis-description">
@@ -29,11 +29,14 @@
 				</u-cell>
 			</u-cell-group>
 		</view>
+		<u-loadmore :status="status" />
 	</view>
 </template>
 
 <script>
 	import gwCirculationCard2Service from '@/api/circulation/gwCirculationCard2.js'
+	import gwFlowService from '@/api/circulation/gwFlowService.js'
+	import * as $auth from "@/common/auth.js"
 	export default {
 		onLoad(option) {
 			if (option) {
@@ -75,6 +78,40 @@
 			}
 		},
 		methods: {
+			// 查看详情
+			toInfo(item) {
+				if (this.type == 3) {
+					uni.navigateTo({
+						url: '/pages/fileTransmit/fileInfo?id=' + item.id
+					})
+				} else {
+					let user = $auth.getUserInfo()
+					let role = $auth.getUserInfo().roleNames
+					if (role == '办公室主任') {
+						uni.navigateTo({
+							url: '/pages/fileTransmit/examineFile?id=' + item.id
+						})
+					} else {
+						gwFlowService.queryByGwId(item.id).then(data => {
+							let gw = data.filter(item => {
+								return item.nextUser == user.id && item.state == 1
+							})
+							if (gw.length > 0) {
+								uni.navigateTo({
+									url: '/pages/fileTransmit/examineFile?id=' + item.id
+								})
+							} else {
+								uni.navigateTo({
+									url: '/pages/fileTransmit/fileInfo?id=' + item.id
+								})
+							}
+
+						})
+					}
+
+
+				}
+			},
 			// 搜索
 			doSearch() {
 				console.log("search=============", this.searchForm);
@@ -95,13 +132,14 @@
 				this.tablePage.currentPage = ++this.tablePage.currentPage;
 				//联网加载数据
 				this.status = 'loading';
+				let {createTime,...newForm} = this.searchForm
 				gwCirculationCard2Service.list({
 					current: this.tablePage.currentPage,
 					size: this.tablePage.pageSize,
 					orders: this.tablePage.orders,
-					// beginCreateDate: this.searchForm.createDate ? this.searchForm.createDate[0] : '',
-					// endCreateDate: this.searchForm.createDate ? this.searchForm.createDate[1] : '',
-					...this.searchForm
+					beginCreateDate: this.searchForm.createTime ? this.searchForm.createTime[0] : '',
+					endCreateDate: this.searchForm.createTime ? this.searchForm.createTime[1] : '',
+					...newForm
 				}).then((data) => {
 					//追加新数据
 					this.dataList = this.dataList.concat(data.records);

jp-mobile/pages/workbench/workbench.vue

@@ -51,10 +51,10 @@
 					<view ><u--image src="/static/index/icon2.png" width="40px" height="40px"></u--image></view>
 					<text>已归档</text>
 				</view>
-				<view @tap="" class="circle-button-box">
+				<!-- <view @tap="toPerson" class="circle-button-box">
 					<view ><u--image src="/static/index/icon3.png" width="40px" height="40px"></u--image></view>
 					<text>通讯录</text>
-				</view>
+				</view> -->
 				<view @tap="toApplyList" class="circle-button-box">
 					<view ><u--image src="/static/index/icon6.png" width="40px" height="40px"></u--image></view>
 					<text>公文统计</text>
@@ -157,9 +157,9 @@
 				    url: '/pages/fileTransmit/addFileTransmit'
 				})
 			},
-			examine (mail) {
+			toPerson (mail) {
 				uni.navigateTo({
-				    url: '/pages/fileTransmit/examineFile'
+				    url: "/pages/index/index?type='addressbook'"
 				})
 			},
 			toList (type) {