Merge remote-tracking branch 'origin/master'

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/mapper/xml/GwCirculationCard2Mapper.xml

@@ -62,7 +62,7 @@
     <select id="getStatistics2" resultType="integer">
         SELECT count(DISTINCT a.id) FROM gw_circulation_card2 a
         left JOIN gw_flow b on a.id=b.gw_id
-        where a.del_flag=0 and b.state=1 and b.next_user=#{userid}
+        where a.del_flag=0 AND b.del_flag =0 and b.state=1 AND a.state = 1 and b.update_by_id=#{userid}
     </select>
 
     <select id="getStatistics3" resultType="integer">

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

@@ -203,7 +203,11 @@ public class GwFlowController {
 				gwFlowDTOn.setCreateTruename(userDTO.getName());
 				gwFlowDTOn.setNextTruename(userDTO3.getName());
 				gwFlowDTOn.setNextUser(userDTO3.getId());
-				gwFlowDTOn.setWhich("3");
+				if(userDTO.getRoleNames().contains("局领导")){
+					gwFlowDTOn.setWhich("3");
+				}else{
+					gwFlowDTOn.setWhich("4");
+				}
 				gwFlowService.saveOrUpdate (gwFlowWrapper.toEntity (gwFlowDTOn));
 			}
 

jp-ui/src/api/circulation2/gwCirculationCard2Service.js

@@ -32,13 +32,7 @@ export default {
 		});
 	},
 	
-	queryByGwId: function (id) {
-		return request({
-			url: "/gwflow/gwFlow/queryByGwId",
-			method: "get",
-			params: { Gwid: id },
-		});
-	},
+	
 
 	list: function (params) {
 		return request({

jp-ui/src/api/gwflow/gwFlowService.js

@@ -25,6 +25,14 @@ export default {
 		});
 	},
 
+	queryByGwId: function (id) {
+		return request({
+			url: "/gwflow/gwFlow/queryByGwId",
+			method: "get",
+			params: { Gwid: id },
+		});
+	},
+	
 	list: function (params) {
 		return request({
 			url: "/gwflow/gwFlow/list",

jp-ui/src/components/userSelectKs/UserSelectDialog.vue

@@ -0,0 +1,468 @@
+<template>
+	<el-dialog
+		v-model="dialogVisible"
+		title="人员选择"
+		:width="type == 1 ? 680 : 460"
+		destroy-on-close
+		append-to-body
+		@closed="$emit('closed')"
+		draggable
+	>
+		<template v-if="type == 1">
+			<div class="user-select">
+				<div class="user-select__left">
+					<div class="user-select__search">
+						<el-input
+							v-model="searchForm.name"
+							prefix-icon="search"
+							placeholder="搜索成员"
+						>
+							<template #append>
+								<el-button
+									icon="search"
+									@click="search"
+								></el-button>
+							</template>
+						</el-input>
+					</div>
+					<div class="user-select__select">
+						<div
+							class="user-select__tree"
+							v-loading="showGrouploading"
+						>
+							<el-scrollbar>
+								<el-tree
+									class="menu"
+									ref="groupTree"
+									:data="group"
+									node-key="id"
+									:props="{
+										label: 'name',
+										children: 'children',
+									}"
+									highlight-current
+									:expand-on-click-node="false"
+									:current-node-key="groupId"
+									@node-click="groupClick"
+								>
+									<template #default="{ node, data }">
+										<span
+											class="custom-tree-node el-tree-node__label"
+										>
+											<span class="label">
+												<el-icon
+													:size="16"
+													class="m-r-5"
+												>
+													<qiye
+														v-if="data.type === '1'"
+														:style="{
+															color:
+																$TOOL.data.get(
+																	'IS_PRIMARY_TENANT'
+																) &&
+																data.tenantDTO &&
+																$utils.getTenantColorById(
+																	data
+																		.tenantDTO
+																		.id
+																),
+														}"
+													></qiye>
+													<bumen
+														v-else
+														:style="{
+															color:
+																$TOOL.data.get(
+																	'IS_PRIMARY_TENANT'
+																) &&
+																data.tenantDTO &&
+																$utils.getTenantColorById(
+																	data
+																		.tenantDTO
+																		.id
+																),
+														}"
+													></bumen>
+												</el-icon>
+												{{ node.label }}
+											</span>
+										</span>
+									</template>
+								</el-tree>
+							</el-scrollbar>
+						</div>
+						<div
+							class="user-select__user"
+							v-loading="showUserloading"
+						>
+							<div class="user-select__user__list">
+								<el-scrollbar ref="userScrollbar">
+									<el-tree
+										class="menu"
+										ref="userTree"
+										:data="user"
+										node-key="id"
+										highlight-current
+										:props="{
+											key: 'id',
+											label: 'name',
+											children: 'children',
+										}"
+										:default-checked-keys="selectedIds"
+										:show-checkbox="limit > 1"
+										check-on-click-node
+										@check-change="userClick"
+									></el-tree>
+								</el-scrollbar>
+							</div>
+							<footer>
+								<el-pagination
+									background
+									layout="prev,next"
+									small
+									:total="total"
+									:page-size="pageSize"
+									v-model:currentPage="currentPage"
+									@current-change="paginationChange"
+								></el-pagination>
+							</footer>
+						</div>
+					</div>
+				</div>
+				<div class="user-select__toicon">
+					<el-icon><arrow-right /></el-icon>
+				</div>
+				<div class="user-select__selected">
+					<header>已选 ({{ selected.length }})</header>
+					<ul>
+						<el-scrollbar>
+							<li
+								v-for="(item, index) in selected"
+								:key="item.id"
+							>
+								<span class="name">
+									<el-avatar
+										v-if="
+											$TOOL.data.get('IS_PRIMARY_TENANT')
+										"
+										:size="30"
+										:style="{
+											background:
+												$utils.getTenantColorById(
+													item.tenantId
+												) + '!important',
+										}"
+										>{{
+											item.name.substring(0, 1)
+										}}</el-avatar
+									>
+									<el-avatar v-else>{{
+										item.name.substring(0, 1)
+									}}</el-avatar>
+									<label>{{ item.name }}</label>
+								</span>
+								<span class="delete">
+									<el-button
+										text
+										type="primary"
+										icon="del-filled"
+										circle
+										size="small"
+										@click="deleteSelected(index)"
+									></el-button>
+								</span>
+							</li>
+						</el-scrollbar>
+					</ul>
+				</div>
+			</div>
+		</template>
+
+		<template #footer>
+			<el-button @click="dialogVisible = false">取 消</el-button>
+			<el-button type="primary" @click="save">确 认</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script>
+import userService from "@/api/sys/userService";
+import officeService from "@/api/sys/officeService";
+export default {
+	props: {
+		tenantId: { type: String, default: null },
+		limit: {
+			type: Number,
+			default: 999999,
+		},
+	},
+	data() {
+		return {
+			searchForm: {
+				loginName: "",
+				companyDTO: {
+					id: "",
+				},
+				officeDTO: {
+					id: "",
+				},
+				name: "",
+			},
+
+			dialogVisible: false,
+			showGrouploading: false,
+			showUserloading: false,
+			groupId: "",
+			pageSize: 10,
+			total: 0,
+			currentPage: 1,
+			group: [],
+			user: [],
+			role: [],
+			type: 1,
+			selected: [],
+			value: [],
+		};
+	},
+	computed: {
+		selectedIds() {
+			return this.selected.map((t) => t.id);
+		},
+	},
+	methods: {
+		//打开赋值
+		open(data) {
+			this.value = data || [];
+			this.selected = JSON.parse(JSON.stringify(data || []));
+			this.dialogVisible = true;
+			this.getGroup();
+			//this.getUser();
+		},
+		//获取组织
+		async getGroup() {
+			this.showGrouploading = true;
+			// officeService.treeData().then((data) => {
+			// 	this.officeTreeData = data
+			// 	this.showGrouploading = false;
+			// })
+			//var res = await officeService.treeData({ tenantId: this.tenantId });
+			var res = await officeService.treeData({ parentId:"1770354728635834369" });
+			res = res.filter(item => item.type == '3')
+
+			this.showGrouploading = false;
+			// var allNode = { id: "", type: "1", name: "所有" };
+			// res.unshift(allNode);
+			this.group = res;
+
+
+			this.groupClick(this.group[0])
+
+		},
+		//获取用户
+		async getUser() {
+			this.showUserloading = true;
+			userService
+				.list({
+					current: this.currentPage,
+					size: this.pageSize,
+					...this.searchForm,
+					"tenantDTO.id": this.tenantId,
+				})
+				.then((data) => {
+					this.user = data.records;
+					this.total = data.total;
+					// this.pageNo = data.current
+					this.showUserloading = false;
+					this.$refs.userScrollbar.setScrollTop(0);
+				});
+		},
+		//组织点击
+		groupClick(data) {
+			if (data.type === "1") {
+				this.searchForm.companyDTO.id = data.id;
+				this.searchForm.officeDTO.id = "";
+			} else {
+				this.searchForm.companyDTO.id = "";
+				this.searchForm.officeDTO.id = data.id;
+			}
+			this.currentPage = 1;
+			this.groupId = data.id;
+			this.getUser();
+		},
+		//用户点击
+		userClick(data, checked) {
+			if (checked) {
+				if (this.limit === 1) {
+					this.selected = [
+						{
+							id: data.loginName,
+							name: data.name,
+							tenantId: data.tenantDTO?.id,
+						},
+					];
+				} else {
+					this.selected.push({
+						id: data.loginName,
+						name: data.name,
+						tenantId: data.tenantDTO?.id,
+					});
+				}
+			} else {
+				this.selected = this.selected.filter(
+					(item) => item.id != data.loginName
+				);
+			}
+		},
+		//用户分页点击
+		paginationChange() {
+			this.getUser();
+		},
+		//用户搜索
+		search() {
+			// this.groupId = ''
+			// this.$refs.groupTree.setCurrentKey(this.groupId)
+			this.currentPage = 1;
+			this.getUser();
+		},
+		//删除已选
+		deleteSelected(index) {
+			this.selected.splice(index, 1);
+			console.log(this.selected);
+			if (this.type == 1) {
+				this.$refs.userTree.setCheckedKeys(this.selectedIds);
+			} else if (this.type == 2) {
+				this.$refs.groupTree.setCheckedKeys(this.selectedIds);
+			}
+		},
+		//提交保存
+		save() {
+			this.value.splice(0, this.value.length);
+			this.selected.map((item) => {
+				console.log("选择了"+JSON.stringify(item));
+				this.value.push(item);
+			});
+			if (this.limit < this.value.length) {
+				this.$message.error(`你最多只能选择${this.limit}个用户`);
+				return;
+			}
+			this.$emit("doSubmit", this.value);
+			this.dialogVisible = false;
+		},
+	},
+};
+</script>
+
+<style scoped>
+.user-select {
+	display: flex;
+}
+.user-select__left {
+	width: 400px;
+}
+.user-select__right {
+	flex: 1;
+}
+.user-select__selected li .name .el-avatar {
+	margin-right: 2px;
+	height: 10;
+	width: 25px;
+	height: 25px;
+}
+.user-select__search {
+	padding-bottom: 10px;
+}
+
+.user-select__select {
+	display: flex;
+	border: 1px solid var(--el-border-color-light);
+	background: var(--el-color-white);
+}
+.user-select__tree {
+	width: 200px;
+	height: 300px;
+	border-right: 1px solid var(--el-border-color-light);
+}
+.user-select__user {
+	width: 200px;
+	height: 300px;
+	display: flex;
+	flex-direction: column;
+}
+.user-select__user__list {
+	flex: 1;
+	overflow: auto;
+}
+.user-select__user footer {
+	height: 36px;
+	padding-top: 5px;
+	border-top: 1px solid var(--el-border-color-light);
+}
+
+.user-select__toicon {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	margin: 0 10px;
+}
+.user-select__toicon i {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background: #ccc;
+	width: 20px;
+	height: 20px;
+	text-align: center;
+	line-height: 20px;
+	border-radius: 50%;
+	color: #fff;
+}
+
+.user-select__selected {
+	height: 345px;
+	width: 200px;
+	border: 1px solid var(--el-border-color-light);
+	background: var(--el-color-white);
+}
+.user-select__selected header {
+	height: 43px;
+	line-height: 43px;
+	border-bottom: 1px solid var(--el-border-color-light);
+	padding: 0 15px;
+	font-size: 16px;
+}
+.user-select__selected ul {
+	height: 300px;
+	overflow: auto;
+}
+.user-select__selected li {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 5px 5px 5px 15px;
+	height: 38px;
+}
+.user-select__selected li .name {
+	display: flex;
+	align-items: center;
+}
+.user-select__selected li .name .el-avatar {
+	margin-right: 10px;
+}
+.user-select__selected li .delete {
+	display: none;
+}
+.user-select__selected li:hover {
+	background: var(--el-color-primary-light-9);
+}
+.user-select__selected li:hover .delete {
+	display: inline-block;
+}
+.user-select-role .user-select__left {
+	width: 200px;
+}
+.user-select-role .user-select__tree {
+	border: none;
+	height: 343px;
+}
+</style>

jp-ui/src/components/userSelectKs/index.vue

@@ -0,0 +1,121 @@
+<template>
+	<template v-if="printRead">
+		<label>{{ name }}</label>
+	</template>
+	<template v-else>
+		<el-input
+			placeholder="请选择"
+			readonly
+			:clearable="clearable"
+			:disabled="disabled"
+			style="line-hight: 40px"
+			v-model="name"
+		>
+			<template #append>
+				<el-button
+					:disabled="disabled"
+					:readonly="readonly"
+					@click="showUserSelect"
+					icon="search"
+				></el-button>
+			</template>
+		</el-input>
+		<user-select
+			ref="userSelect"
+			@doSubmit="selectUsersToInput"
+			:tenantId="tenantId"
+			:limit="limit"
+		></user-select>
+	</template>
+</template>
+<script>
+import userSelect from "./UserSelectDialog";
+import userService from "@/api/sys/userService";
+export default {
+	data() {
+		return {
+			name: "",
+			selectData: [],
+		};
+	},
+	props: {
+		limit: Number,
+		modelValue: { type: String, default: "" },
+		tenantId: { type: String, default: null },
+		printRead: {
+			type: Boolean,
+			default: () => {
+				return false;
+			},
+		},
+		clearable: {
+			type: Boolean,
+			default: () => {
+				return true;
+			},
+		},
+		readonly: {
+			type: Boolean,
+			default: () => {
+				return false;
+			},
+		},
+		disabled: {
+			type: Boolean,
+			default: () => {
+				return false;
+			},
+		},
+	},
+	components: {
+		userSelect,
+	},
+	watch: {
+		modelValue: {
+			handler(newVal) {
+				this.selectData = [];
+				if (newVal) {
+					newVal.split(",").forEach((id) => {
+						userService.queryByLoginName(id).then((data) => {
+							if (data && data.id !== "") {
+								this.selectData.push(data);
+								this.name = this.selectData
+									.map((user) => {
+										return user.name;
+									})
+									.join(",");
+							}
+						});
+					});
+				} else {
+					this.name = "";
+				}
+			},
+			immediate: true,
+			deep: false,
+		},
+	},
+	methods: {
+		selectUsersToInput(users) {
+			let selectIds = users
+				.map((user) => {
+					return user.id;
+				})
+				.join(",");
+			this.$emit("update:modelValue", selectIds);
+		},
+		showUserSelect() {
+			this.$refs.userSelect.open(this.selectData);
+		},
+	},
+};
+</script>
+<style>
+.el-form-item__content .el-input-group {
+	vertical-align: middle;
+}
+.el-tag + .el-tag {
+	margin-left: 5px;
+	margin-bottom: 5px;
+}
+</style>

jp-ui/src/views/circulation2/GwCirculationCard2Form2.vue

@@ -0,0 +1,246 @@
+<template>
+  <v-dialog
+    :title="title"
+    :close-on-click-modal="false"
+    v-model="visible">
+    <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'" label-width="180px">
+      <el-row  :gutter="15">
+        <el-col :span="12">
+            <el-form-item label="年度" prop="yearNum"
+                :rules="[
+                 ]">
+              <el-input v-model="inputForm.yearNum" placeholder="请填写年度"     ></el-input>
+           </el-form-item>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="卡号" prop="cardNum"
+                :rules="[
+                 ]">
+              <el-input v-model="inputForm.cardNum" placeholder="请填写卡号"     ></el-input>
+           </el-form-item>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="来文机关" prop="sendingAgency"
+                :rules="[
+                 ]">
+              <el-input v-model="inputForm.sendingAgency" placeholder="请填写来文机关"     ></el-input>
+           </el-form-item>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="来文字号" prop="docFontSize"
+                :rules="[
+                 ]">
+              <el-input v-model="inputForm.docFontSize" placeholder="请填写来文字号"     ></el-input>
+           </el-form-item>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="文件来源" prop="fileSource"
+                :rules="[
+                 ]">
+              <el-input v-model="inputForm.fileSource" placeholder="请填写文件来源"     ></el-input>
+           </el-form-item>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="成文时间" prop="writtenTime"
+                :rules="[
+                 ]">
+                <el-date-picker
+                      style="width: 100%;"
+                      v-model="inputForm.writtenTime"
+                      type="datetime"
+                      value-format="YYYY-MM-DD HH:mm:ss"
+                      placeholder="选择日期时间">
+                    </el-date-picker>
+           </el-form-item>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="收文时间" prop="receivingTime"
+                :rules="[
+                 ]">
+                <el-date-picker
+                      style="width: 100%;"
+                      v-model="inputForm.receivingTime"
+                      type="datetime"
+                      value-format="YYYY-MM-DD HH:mm:ss"
+                      placeholder="选择日期时间">
+                    </el-date-picker>
+           </el-form-item>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="内容摘要" prop="contentSummary"
+                :rules="[
+                 ]">
+          <el-input type="textarea" v-model="inputForm.contentSummary" placeholder="请填写内容摘要"     ></el-input>
+           </el-form-item>
+        </el-col>
+        <el-col :span="24">
+            <el-form-item label="来文附件" prop="attachedDocumentId"
+                :rules="[
+                 ]">
+	            <image-upload v-model="inputForm.attachedDocumentId" :limit="3" tip="最多上传3个图片,单个图片不要超过10M"></image-upload>
+           </el-form-item>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="备注" prop="remark"
+                :rules="[
+                 ]">
+          <el-input type="textarea" v-model="inputForm.remark" placeholder="请填写备注"     ></el-input>
+           </el-form-item>
+        </el-col>
+        <el-col :span="12">
+            <el-form-item label="状态" prop="state"
+                :rules="[
+                 ]">
+                <el-select v-model="inputForm.state" placeholder="请选择"  style="width: 100%;">
+                          <el-option
+                            v-for="item in $dictUtils.getDictList('gw_state')"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                      </el-select>
+           </el-form-item>
+        </el-col>
+
+		<el-col :span="24">
+				  <el-form-item >
+
+				  </el-form-item>
+		</el-col>
+
+        </el-row>
+
+
+    </el-form>
+
+	<el-tabs v-model="assignWorkOrderTab" >
+	  <el-tab-pane label="流转记录">
+	    <el-table  size="large"
+	      :data="assignWorkOrderRecordDTOList.filter(function(item){ return item.delFlag !== '1'})"
+	      style="width: 100%">
+	      <el-table-column prop="createTruename" header-align="center" align="center" show-overflow-tooltip
+	        label="提交人">
+	      </el-table-column>
+		  <el-table-column prop="content" header-align="center" align="center"
+		    show-overflow-tooltip label="内容">
+		  </el-table-column>
+	      <el-table-column prop="createTime" header-align="center" align="center"
+	        show-overflow-tooltip label="时间">
+	      </el-table-column>
+	      <!-- <el-table-column prop="nextTruename" header-align="center" align="center" show-overflow-tooltip
+	        label="新待办人">
+	      </el-table-column> -->
+	    </el-table>
+	  </el-tab-pane>
+	</el-tabs>
+
+    <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false" icon="circle-close">关闭</el-button>
+          <el-button  type="primary" v-if="method != 'view'" @click="doSubmit()" icon="circle-check" v-noMoreClick>确定</el-button>
+        </span>
+    </template>
+  </v-dialog>
+</template>
+
+<script>
+  import gwCirculationCard2Service from '@/api/circulation2/gwCirculationCard2Service'
+  export default {
+    data () {
+      return {
+		assignWorkOrderTab: '0',
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+		assignWorkOrderRecordDTOList:[],
+        inputForm: {
+          id: '',
+          yearNum: '',
+          cardNum: '',
+          sendingAgency: '',
+          docFontSize: '',
+          fileSource: '',
+          writtenTime: '',
+          receivingTime: '',
+          contentSummary: '',
+          attachedDocumentId: '',
+          remark: '',
+          state: ''
+
+        }
+      }
+    },
+    components: {
+    },
+    created () {
+    },
+    methods: {
+      init (method, id) {
+        this.method = method
+        this.inputForm.id = id
+        if (method === 'add') {
+          this.title = `新建盐都工信文件阅办卡`
+        } else if (method === 'edit') {
+          this.title = '修改盐都工信文件阅办卡'
+        } else if (method === 'view') {
+          this.title = '查看盐都工信文件阅办卡'
+        }
+
+
+
+
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          this.$refs.inputForm.resetFields()
+          if (method === 'edit' || method === 'view') { // 修改或者查看
+            this.loading = true
+            gwCirculationCard2Service.queryById(this.inputForm.id).then((data) => {
+              this.inputForm = this.recover(this.inputForm, data)
+              this.loading = false
+            })
+
+
+			gwCirculationCard2Service.queryByGwId(this.inputForm.id).then(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
+
+				this.assignWorkOrderRecordDTOList=data
+			})
+
+          }
+        })
+      },
+      // 表单提交
+      doSubmit () {
+        this.$refs['inputForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            gwCirculationCard2Service.save(this.inputForm).then((data) => {
+              this.visible = false
+              this.$message.success(data)
+              this.$emit('refreshDataList')
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+          }
+        })
+      }
+    }
+  }
+</script>

jp-ui/src/views/circulation2/GwCirculationCard2FormYb.vue

@@ -0,0 +1,326 @@
+<template>
+  <v-dialog
+    :title="title"
+    :close-on-click-modal="false"
+	style="width:1200px;"
+    v-model="visible">
+
+
+
+
+		<div style="display: flex; flex-direction: row;">
+			<fileCard :gwId="inputForm.id" style="width: 50%;" ></fileCard>
+
+			<div style="display: flex; flex-direction:column;margin-left: 60px;">
+
+
+				<view v-if="isoffice" class="titletab" >办公室拟办</view>
+				<view v-if="isleader" class="titletab" >领导批示</view>
+				<view v-if="isundertake" class="titletab" >承办科室</view>
+
+
+
+				<el-form v-if="isoffice" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;" >
+				  <el-row  :gutter="15">
+					<el-col :span="24" v-if="one">
+						<el-form-item label="办公室拟办" prop="content"
+							:rules="[
+							 ]">
+						  <el-input type="textarea" v-model="auditForm.content" placeholder=""     ></el-input>
+					   </el-form-item>
+					</el-col>
+					<el-col :span="24">
+						<el-form-item label="转发领导" prop="nextLeadUser"
+							:rules="[
+							 ]">
+						  <el-select v-model="auditForm.nextLeadUser" placeholder="请选择"  style="width: 100%;">
+								   <el-option
+									 v-for="item in leaderList"
+									 :key="item.id"
+									 :label="item.name"
+									 :value="item.loginName">
+								   </el-option>
+						  </el-select>
+					   </el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="!one">
+						<el-form-item label="科室承办" prop="nextDepUser"
+							:rules="[
+							 ]">
+							 <user-select-Ks
+							 	:limit="10"
+							 	v-model="auditForm.nextDepUser"
+							 ></user-select-Ks>
+
+					   </el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="one">
+						<el-form-item label="备注" prop="remark"
+							:rules="[
+							 ]">
+						  <el-input type="textarea" v-model="auditForm.remark" placeholder=""     ></el-input>
+					   </el-form-item>
+					</el-col>
+				  </el-row>
+				</el-form>
+
+
+				<el-form v-if="isleader" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;">
+				  <el-row  :gutter="15">
+					<el-col :span="12">
+						<el-form-item label="领导批示" prop="content"
+							:rules="[
+							 ]">
+						  <el-input type="textarea" v-model="auditForm.content" placeholder=""    style="min-width: 300px;" ></el-input>
+					   </el-form-item>
+					</el-col>
+				  </el-row>
+				</el-form>
+
+
+				<el-form v-if="isundertake" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;">
+				  <el-row  :gutter="15">
+					<el-col :span="12">
+						<el-form-item label="承办科室" prop="content"
+							:rules="[
+							 ]">
+						 <el-input type="textarea" v-model="auditForm.content" placeholder=""    style="min-width: 300px;" ></el-input>
+					   </el-form-item>
+					</el-col>
+				  </el-row>
+				</el-form>
+			</div>
+
+
+
+		</div>
+
+
+
+		<el-tabs v-model="assignWorkOrderTab" >
+		  <el-tab-pane label="流转记录">
+			<el-table  size="large"
+			  :data="assignWorkOrderRecordDTOList.filter(function(item){ return item.delFlag !== '1'})"
+			  style="width: 100%">
+			  <el-table-column prop="createTruename" header-align="center" align="center" show-overflow-tooltip
+				label="提交人">
+			  </el-table-column>
+			  <el-table-column prop="content" header-align="center" align="center"
+				show-overflow-tooltip label="内容">
+			  </el-table-column>
+			  <el-table-column prop="createTime" header-align="center" align="center"
+				show-overflow-tooltip label="时间">
+			  </el-table-column>
+			  <!-- <el-table-column prop="nextTruename" header-align="center" align="center" show-overflow-tooltip
+				label="新待办人">
+			  </el-table-column> -->
+			</el-table>
+		  </el-tab-pane>
+		</el-tabs>
+
+    <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false" icon="circle-close">关闭</el-button>
+		  <el-button v-if="(isundertake||isleader||one )&& !loading" type="primary"  @click="doSubmit()" icon="circle-check" v-noMoreClick>确认签字</el-button>
+		  <el-button v-if="!(isundertake||isleader||one ) && !loading" type="primary"  @click="doSubmit()" icon="circle-check" v-noMoreClick>提交</el-button>
+          <el-button  type="primary" v-if="isAll" @click="formSubmit()" icon="circle-check" v-noMoreClick>归档</el-button>
+        </span>
+    </template>
+  </v-dialog>
+</template>
+
+<script>
+  import gwCirculationCard2Service from '@/api/circulation2/gwCirculationCard2Service'
+  import gwFlowService from '@/api/gwflow/gwFlowService'
+  import UserSelectKs from "@/components/userSelectKs/index.vue";
+  import userService from "@/api/sys/userService"
+  import fileCard from "./fileCard.vue"
+  export default {
+    data () {
+      return {
+		assignWorkOrderTab: '0',
+		isoffice: false,
+		isleader: false,
+		isundertake: false,
+		one: true,
+		isAll: false,
+
+		leaderList: [],
+		auditForm: {
+					id: '',
+					gwId: '',
+					content: '',
+					signfj: '',
+					createTruename: '',
+					nextTruename: '',
+					nextUser: '',
+					which: '0',
+					state: '0',
+
+					next: '',
+					nextLeadUser: '',
+					nextDepUser: '',
+					remark: '',
+				},
+
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+		assignWorkOrderRecordDTOList:[],
+        inputForm: {
+          id: '',
+          yearNum: '',
+          cardNum: '',
+          sendingAgency: '',
+          docFontSize: '',
+          fileSource: '',
+          writtenTime: '',
+          receivingTime: '',
+          contentSummary: '',
+          attachedDocumentId: '',
+          remark: '',
+          state: ''
+
+        }
+      }
+    },
+    components: {
+		UserSelectKs,
+		fileCard,
+    },
+    created () {
+    },
+    methods: {
+      init (method, id) {
+        this.method = method
+        this.inputForm.id = id
+        if (method === 'add') {
+          this.title = `新建盐都工信文件阅办卡`
+        } else if (method === 'edit') {
+          this.title = '修改盐都工信文件阅办卡'
+        } else if (method === 'view') {
+          this.title = '盐都工信文件阅办卡'
+        }
+
+
+
+
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          //this.$refs.inputForm.resetFields()
+          if (method === 'edit' || method === 'view') { // 修改或者查看
+            this.loading = true
+            gwCirculationCard2Service.queryById(this.inputForm.id).then((data) => {
+              this.inputForm = this.recover(this.inputForm, data)
+              this.loading = false
+            })
+
+
+			gwCirculationCard2Service.queryByGwId(this.inputForm.id).then(data => {
+
+				if (data.length > 1) this.one = false
+				if(this.one) {
+					this.roleId = "1770353074553331713"
+				}else {
+					this.roleId = "1773547256256622594"
+				}
+				userService.leaderList(this.roleId).then(data => {
+					this.leaderList = data
+					if(this.one) this.auditForm.nextLeadUser =data[0].loginName
+				})
+
+				// let user = $auth.getUserInfo()
+				// let role = $auth.getUserInfo().roleNames
+
+				let user = JSON.parse(window.localStorage.getItem('USER_INFO'))
+				let role = user.roleNames
+				console.log("taa"+role);
+
+				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) {
+					if (gw[0].which == '3') this.isAll = true
+					this.auditForm = gw[0]
+				}
+				if (role == '办公室主任') {
+					this.isoffice = true
+
+					//这边改一下取最新待办一条
+					// let gw1 = data.filter(item => {
+					// 	return item.which == 0
+					// })
+					// gw1.sort((a, b) => b.createTime.localeCompare(a.createTime) || b.createTime.localeCompare(a
+					// 	.createTime));
+					let gw1 = data.filter(item => {
+						return item.state == 1
+					})
+
+					this.auditForm = gw1[0]
+					}
+				if (role == '局领导' && gw.length > 0) this.isleader = true
+				if (role == '分管领导' && gw.length > 0) this.isleader = true
+				if (role == '科室负责人' && gw.length > 0) this.isundertake = true
+
+
+
+
+				this.assignWorkOrderRecordDTOList=data
+			})
+
+          }
+        })
+      },
+      // 表单提交
+      doSubmit () {
+        let inputForm = {};
+        this.loading = true
+        if (this.isoffice) this.auditForm.next = '1'
+        this.auditForm.state = "0"
+        this.auditForm.gwId = this.inputForm.id
+        const date = this.moment().format('YYYY-MM-DD HH:mm:ss');
+        this.auditForm.updateTime = date
+        inputForm = this.auditForm
+
+        gwFlowService.save(inputForm).then((data)  => {
+        	this.visible = false
+        	this.$message.success(data)
+        	this.$emit('refreshDataList')
+        	this.loading = false
+        }).catch(() => {
+        	this.loading = false
+        })
+      },
+
+	  //归档
+	  formSubmit() {
+        let inputForm = {};
+        this.loading = true
+        this.auditForm.next = '0'
+        this.auditForm.state = "0"
+        this.auditForm.gwId = this.inputForm.id
+        const date = this.moment().format('YYYY-MM-DD HH:mm:ss');
+        this.auditForm.updateTime = date
+        inputForm = this.auditForm
+
+        gwFlowService.save(inputForm).then((data)  => {
+        	this.visible = false
+        	this.$message.success(data)
+        	this.$emit('refreshDataList')
+        	this.loading = false
+        }).catch(() => {
+        	this.loading = false
+        })
+      }
+
+    }
+  }
+</script>
+<style>
+	.titletab {
+		color:#36a7f3 ;border-bottom:1px solid #36a7f3; width: 90px;padding: 6px;
+	}
+</style>

jp-ui/src/views/circulation2/fileCard.vue

@@ -0,0 +1,408 @@
+<template>
+	<view class="card_main">
+
+		<view class="card_info">
+			<view class="card_info_title">
+				盐都工信文件阅办卡
+			</view>
+
+
+			  <el-row>
+				<el-col :span="12"><div class="grid-content-left1">年度： {{inputForm.yearNum}}</div></el-col>
+				<el-col :span="12"><div class="grid-content-right1">[{{inputForm.yearNum}}]{{inputForm.cardNum}}号</div></el-col>
+			  </el-row>
+			  <el-row>
+				<el-col :span="6"><div class="grid-content-left">来文机关</div></el-col>
+				<el-col :span="6"><div class="grid-content-left">{{inputForm.sendingAgency}}</div></el-col>
+				<el-col :span="6"><div class="grid-content-left">来文字号</div></el-col>
+				<el-col :span="6"><div class="grid-content-right">{{inputForm.docFontSize}}</div></el-col>
+			  </el-row>
+			  <el-row>
+				<el-col :span="6"><div class="grid-content-left">收文时间</div></el-col>
+				<el-col :span="6"><div class="grid-content-left">{{inputForm.receivingTime}}</div></el-col>
+				<el-col :span="6"><div class="grid-content-left">文件来源</div></el-col>
+				<el-col :span="6"><div class="grid-content-right">{{inputForm.fileSource}}</div></el-col>
+			  </el-row>
+			  <el-row>
+				<el-col :span="6"><div class="grid-content-left">内容摘要</div></el-col>
+				<el-col :span="18"><div class="grid-content-right">{{inputForm.contentSummary}}</div></el-col>
+			  </el-row>
+			  <el-row v-if="officeInfo.length>0">
+				<el-col :span="6" class="grid-content-left"><div >办公室拟办</div></el-col>
+				<el-col :span="18">
+					<div class="grid-content-right">
+						<view v-for="item in officeInfo" class="info_abstract_v">
+							<view>
+								{{item.content}}
+							</view>
+							<view class="flex " style="line-height: 20px;">
+								<el-image :src="item.signfj" width="80px" height="20px"></el-image>
+								{{item.updateTime}}
+							</view>
+						</view>
+					</div>
+				</el-col>
+			  </el-row>
+			  <el-row v-if="leaderInfo.length>0">
+			  				<el-col :span="6" class="grid-content-left"><div>领导批示</div></el-col>
+			  				<el-col :span="18" class="grid-content-right">
+								<div class="flexlay" >
+									<view v-for="leader in leaderInfo" class="info_abstract_v">
+										<view>
+											{{leader.content}}
+										</view>
+										<view class="flex " style="line-height: 20px;">
+											<el-image :src="leader.signfj" width="80px" height="20px"></el-image>
+											{{leader.updateTime}}
+										</view>
+									</view>
+								</div>
+							</el-col>
+			  </el-row>
+			  <el-row v-if="undertakeInfo.length>0">
+			  				<el-col :span="6" class="grid-content-left"><div >承办情况</div></el-col>
+			  				<el-col :span="18" class="grid-content-right">
+								<div class="flexlay">
+									<view v-for="item in undertakeInfo" class="info_abstract_v">
+										<view>
+											{{item.content}}
+										</view>
+										<view class="flex " style="line-height: 20px;">
+											<el-image :src="item.signfj" width="80px" height="20px"></el-image>
+											{{item.updateTime}}
+										</view>
+									</view>
+								</div>
+							</el-col>
+			  </el-row>
+			  <el-row>
+			  				<el-col :span="6"><div class="grid-content-left2">备注</div></el-col>
+			  				<el-col :span="18"><div class="grid-content-right2">{{inputForm.remark}}</div></el-col>
+			  </el-row>
+			  <div style="text-align: left;">附件：</div>
+			  <view class="card_other">
+
+
+			  	<view class="other_info" v-for="item in fileList">
+			  		<view class="other_pdf  flex  ">
+			  			<u--text decoration='underline' color='#36a7f3' :text="item.name"
+			  				@click="item.type=='pdf'?preview(item):download(item)"></u--text>
+
+			  			<!-- <a :href="item.url">{{item.name}}</a> -->
+			  		</view>
+			  	</view>
+			  	<image-upload v-model="inputForm.attachedDocumentId" :limit="3" tip="最多上传3个图片,单个图片不要超过10M"></image-upload>
+			  </view>
+
+
+		</view>
+
+
+		<view>
+
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+
+	import gwCirculationCard2Service from '@/api/circulation2/gwCirculationCard2Service'
+
+	export default {
+		mounted() {
+			gwCirculationCard2Service.queryById(this.gwId).then(data => {
+				this.inputForm = data
+				this.inputForm.receivingTime = this.inputForm.receivingTime.substring(5, 10)
+
+			})
+			gwCirculationCard2Service.queryByGwId(this.gwId).then(data => {
+
+				data.forEach(item => {
+					if (item.which == 0 && item.state == 0) {
+						// if (item.signfj && !item.signfj.startsWith("http")) item.signfj = this.BASE_URL +
+						// 	item.signfj
+						this.officeInfo.push(item)
+					} else if (item.which == 1 && item.state == 0) {
+						// if (item.signfj && !item.signfj.startsWith("http")) item.signfj = this.BASE_URL +
+						// 	item.signfj
+						this.leaderInfo.push(item)
+					} else if (item.which == 2 && item.state == 0) {
+						// if (item.signfj && !item.signfj.startsWith("http")) item.signfj = this.BASE_URL +
+						// 	item.signfj
+						this.undertakeInfo.push(item)
+					}
+				})
+				this.leaderInfo.sort((a, b) => a.createTime.localeCompare(b.createTime) || a.createTime
+					.localeCompare(b.createTime));
+				this.ismask = false
+			})
+
+		},
+		data() {
+			return {
+				ismask: true,
+				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+				// 公文附件
+				fileLists: [],
+				fileList: [],
+				imgList: [],
+				// 办公室信息
+				officeInfo: [],
+				// 领导信息
+				leaderInfo: [],
+				// 承办信息
+				undertakeInfo: [],
+				inputForm: {
+					id: '',
+					yearNum: '',
+					cardNum: '',
+					sendingAgency: '',
+					docFontSize: '',
+					fileSource: '',
+					writtenTime: '',
+					receivingTime: '',
+					contentSummary: '',
+					attachedDocumentId: ''
+				},
+				gwflow: {
+					id: '',
+					gwId: '',
+					content: '',
+					signfj: '',
+					createTruename: '',
+					nextTruename: '',
+					nextUser: '',
+					which: '',
+					state: '',
+
+					next: '',
+					nextLeadUser: '',
+					nextDepUser: '',
+					remark: '',
+				},
+			}
+		},
+		methods: {
+			// 预览pdf
+			preview(fileUrl) {
+				uni.navigateTo({
+					url: "/pages/pdfPreview/pdfPreview?url=" + fileUrl
+				})
+			},
+			// 下载文件
+			download(param) {
+				uni.showLoading({
+					title: "下载中"
+				})
+				uni.downloadFile({
+					url: param.url, //调接口返回url
+					success: (res) => {
+						uni.hideLoading();
+						if (res.statusCode == 200) {
+							var tempFilePath = res.tempFilePath;
+							this.saveFile(tempFilePath, param.name);
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: '报告下载失败'
+							})
+						}
+					},
+					fail: err => {
+						uni.hideLoading();
+						uni.showToast({
+							icon: 'none',
+							title: '报告下载失败'
+						})
+						reject(err);
+					}
+				})
+
+			},
+			saveFile(url, name) { //保存到本地
+				try {
+					const fileName = name;
+					//new Blob 实例化文件流
+					//let url = fileData
+					//const url = window.URL.createObjectURL(new Blob([fileData],{type:'application/pdf'}))
+					const link = document.createElement('a');
+					link.style.display = 'none';
+					link.href = url;
+					link.setAttribute('download', fileName);
+					link.setAttribute("target", "_blank");
+					document.body.appendChild(link);
+					link.click();
+					//下载完成移除元素
+					document.body.removeChild(link);
+					//释放掉blob对象
+					window.URL.revokeObjectURL(url)
+					uni.showToast({
+						title: '下载成功'
+					})
+				} catch (error) {
+					uni.showToast({
+						title: '下载失败'
+					})
+				}
+			},
+		},
+		props: {
+			isoffice: {
+				type: Boolean,
+				default: false
+			},
+			isleader: {
+				type: Boolean,
+				default: false
+			},
+			isinfo: {
+				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;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.card_banner {
+		width: 100%;
+		height: 60px;
+		background-color: #36a7f3;
+	}
+
+	.card_info {
+		width: 96%;
+		text-align: center;
+	}
+
+	.card_info_title {
+		font-size: 16px;
+		font-weight: 700;
+		padding-top: 10px;
+		color: #36a7f3;
+		text-align: center;
+	}
+
+	.card_table {
+		padding: 20px 20px;
+		font-size: 12px;
+	}
+
+	.card_row {
+		line-height: 30px;
+		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;
+		/* 文字垂直排列，从右向左 */
+		/* 或者使用vertical-lr; 从左向右 */
+	}
+
+	.card_other {
+		text-align: left;
+	}
+	.grid-content-left1 {
+	  min-height: 36px;
+	  text-align: left;
+	  line-height: 36px;
+	  color: #333333;
+	}
+	.grid-content-right1 {
+	  box-sizing: border-box;
+	  min-height: 36px;
+	  text-align: right;
+	  line-height: 36px;
+	  color: #333333;
+	}
+	.grid-content-left {
+	  border-left: 1px solid #333333;
+	  border-top: 1px solid #333333;
+	  box-sizing: border-box;
+	  min-height: 36px;
+	  text-align: center;
+	  line-height: 36px;
+	  color: #333333;
+	}
+	.grid-content-right {
+	  border-left: 1px solid #333333;
+	  border-right: 1px solid #333333;
+	  border-top: 1px solid #333333;
+	  box-sizing: border-box;
+	  min-height: 36px;
+	  text-align: center;
+	  line-height: 36px;
+	  color: #333333;
+	}
+	.flexlay{
+		display: flex;
+		    flex-direction: column;
+	}
+	
+	.grid-content-left2 {
+	  border-left: 1px solid #333333;
+	  border-top: 1px solid #333333;
+	  border-bottom: 1px solid #333333;
+	  box-sizing: border-box;
+	  min-height: 36px;
+	  text-align: center;
+	  line-height: 36px;
+	  color: #333333;
+	}
+	.grid-content-right2 {
+	  border-left: 1px solid #333333;
+	  border-right: 1px solid #333333;
+	  border-top: 1px solid #333333;
+	  border-bottom: 1px solid #333333;
+	  box-sizing: border-box;
+	  min-height: 36px;
+	  text-align: center;
+	  line-height: 36px;
+	  color: #333333;
+	}
+	.border-none {
+	}
+</style>

jp-ui/src/views/circulation2/fileInfo.vue

@@ -0,0 +1,158 @@
+
+<template>
+  <v-dialog
+    :title="title"
+    :close-on-click-modal="false"
+    v-model="visible">
+	<template>
+		<view class="info_page">
+			<fileCard :gwId="gwId"></fileCard>
+			<view class="info_main">
+				<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>
+	<template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false" icon="circle-close">关闭</el-button>
+          <el-button  type="primary" v-if="method != 'view'" @click="doSubmit()" icon="circle-check" v-noMoreClick>确定</el-button>
+        </span>
+    </template>
+  </v-dialog>
+</template>
+
+<script>
+	import fileCard from "./fileCard.vue"
+	import gwCirculationCard2Service from '@/api/circulation2/gwCirculationCard2Service'
+	export default {
+		data () {
+		  return {
+
+			  gwId: '',
+			  // 办公室信息
+			  officeInfo: [],
+			  // 领导信息
+			  leaderInfo: [],
+			  // 承办信息
+			  undertakeInfo: [],
+			  downList: [],
+			  current: 0,
+
+		    title: '',
+		    method: '',
+		    visible: false,
+		    loading: false,
+		    inputForm: {
+		      id: '',
+		      yearNum: '',
+		      cardNum: '',
+		      sendingAgency: '',
+		      docFontSize: '',
+		      fileSource: '',
+		      writtenTime: '',
+		      receivingTime: '',
+		      contentSummary: '',
+		      attachedDocumentId: '',
+		      remark: '',
+		      state: ''
+		    }
+		  }
+		},
+		components: {
+			fileCard,
+		},
+		created () {
+		},
+		methods: {
+		  init (method, id) {
+		    this.method = method
+			this.gwId = id
+		    this.inputForm.id = id
+		    if (method === 'add') {
+		      this.title = `新建盐都工信文件阅办卡`
+		    } else if (method === 'edit') {
+		      this.title = '修改盐都工信文件阅办卡'
+		    } else if (method === 'view') {
+		      this.title = '查看盐都工信文件阅办卡'
+		    }
+		    this.visible = true
+		    this.loading = false
+		    this.$nextTick(() => {
+		      this.$refs.inputForm.resetFields()
+		      if (method === 'edit' || method === 'view') { // 修改或者查看
+		        this.loading = true
+		        gwCirculationCard2Service.queryById(this.inputForm.id).then((data) => {
+		          this.inputForm = this.recover(this.inputForm, data)
+		          this.loading = false
+		        })
+		      }
+		    })
+
+
+
+			// 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
+			// })
+
+
+
+		  },
+		  // 表单提交
+		  doSubmit () {
+		    this.$refs['inputForm'].validate((valid) => {
+		      if (valid) {
+		        this.loading = true
+		        gwCirculationCard2Service.save(this.inputForm).then((data) => {
+		          this.visible = false
+		          this.$message.success(data)
+		          this.$emit('refreshDataList')
+		          this.loading = false
+		        }).catch(() => {
+		          this.loading = false
+		        })
+		      }
+		    })
+		  }
+		}
+
+
+
+
+
+	}
+</script>
+
+<style>
+	.info_page {
+		width: 100%;
+		background-color: #fefefe;
+	}
+
+	.info_main {
+		margin: 20px;
+	}
+</style>

jp-ui/src/views/home/components/announcement.vue

@@ -34,7 +34,7 @@ export default {
 				{
 					type: "warning",
 					label: "活动",
-					content: "内容最新优惠活动",
+					content: "内容最新活动",
 				},
 				{
 					type: "success",

jp-ui/src/views/home/index.vue

@@ -7,12 +7,12 @@
 				<ContentChart />
 			</div>
 			<el-row :gutter="16" style="margin-top: 16px">
-				<el-col :span="12">
+				<!-- <el-col :span="12">
 					<CateforiesPercent />
-				</el-col>
-				<el-col :span="12">
+				</el-col> -->
+				<!-- <el-col :span="12">
 					<Carousel />
-				</el-col>
+				</el-col> -->
 			</el-row>
 		</div>
 		<div class="right-side">
@@ -30,12 +30,12 @@
 				<el-col class="panel" :span="24">
 					<Announcement />
 				</el-col>
-				<el-col class="panel" :span="12">
+				<!-- <el-col class="panel" :span="12">
 					<Docs />
 				</el-col>
 				<el-col class="panel" :span="12">
 					<Wx />
-				</el-col>
+				</el-col> -->
 			</el-row>
 		</div>
 	</div>