1

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

@@ -122,9 +122,15 @@ public class GwCirculationCard2Controller {
 				}else if(!state.equals("5")){//除已办其他状态需要筛选公文表
 					queryWrapper.eq ("a.state", state );
 				}
-				if(!state.equals("5")){
+				if(!state.equals("5")&&!state.equals("3")){
 					queryWrapper.eq ("b.update_by_id", userDTO.getId() );
 				}
+				//查看归档的
+				if(state.equals("3")){
+					queryWrapper.eq ("b.update_by_id", userDTO.getId() );
+					queryWrapper.or();
+					queryWrapper.eq("b.create_by_id",userDTO.getId());
+				}
 			}
 			queryWrapper.groupBy("a.id");
 
@@ -193,7 +199,7 @@ public class GwCirculationCard2Controller {
 				nextuser=gwCirculationCard2DTO.getNextUser();
 			}
 			UserDTO userDTO2=userService.getUserByLoginName("bgszr","10000");
-			gwFlowDTO.setCreateBy(userDTO2);
+			gwFlowDTO.setCreateBy(userDTO);
 			gwFlowDTO.setUpdateBy(userDTO2);
 			gwFlowDTO.setCreateTruename(userDTO.getName());
 			gwFlowDTO.setNextTruename(userDTO2.getName());

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

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

jp-ui/src/api/sys/userService.js

@@ -88,4 +88,11 @@ export default {
 			data: data,
 		});
 	},
+	leaderList: function (role) {
+		return request({
+			url: "/sys/user/leaderList",
+			method: "get",
+			params: { roleId: role},
+		});
+	},
 };

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

@@ -103,12 +103,12 @@
         </el-col>
         </el-row>
     </el-form>
-    <template #footer>    
+    <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>    
+    </template>
   </v-dialog>
 </template>
 
@@ -146,11 +146,11 @@
         this.method = method
         this.inputForm.id = id
         if (method === 'add') {
-          this.title = `新建公文流转`
+          this.title = `新建盐都工信文件阅办卡`
         } else if (method === 'edit') {
-          this.title = '修改公文流转'
+          this.title = '修改盐都工信文件阅办卡'
         } else if (method === 'view') {
-          this.title = '查看公文流转'
+          this.title = '查看盐都工信文件阅办卡'
         }
         this.visible = true
         this.loading = false
@@ -184,5 +184,3 @@
     }
   }
 </script>
-
-  

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

@@ -183,7 +183,8 @@
 		     </template>
 		  </template>
 		</vxe-column>
-    <vxe-column
+
+		<vxe-column
 		  field="state"
 		  sortable
 		  title="状态">
@@ -191,6 +192,7 @@
 				  {{ $dictUtils.getDictLabel("gw_state", row.state, '-') }}
 		  </template>
 		</vxe-column>
+
 		<vxe-column
 		  fixed="right"
 		  align="center"
@@ -198,7 +200,9 @@
 		  title="操作">
 		  <template   #default="{ row }">
 		    <el-button v-if="hasPermission('circulation2:gwCirculationCard2:view')" type="primary" text icon="view-filled" @click="view(row.id)">查看</el-button>
-		    <el-button v-if="hasPermission('circulation2:gwCirculationCard2:edit')" type="primary" text icon="edit-filled" @click="edit(row.id)">修改</el-button>
+
+			<el-button v-if="daiban" type="primary" text icon="view-filled" @click="view2(row.id)">阅办</el-button>
+		    <!-- <el-button v-if="hasPermission('circulation2:gwCirculationCard2:edit')" type="primary" text icon="edit-filled" @click="edit(row.id)">修改</el-button> -->
 		    <el-button v-if="hasPermission('circulation2:gwCirculationCard2:del')"  type="danger"  text icon="del-filled" @click="del(row.id)">删除</el-button>
 		  </template>
 		</vxe-column>
@@ -217,16 +221,26 @@
     </div>
 		  <!-- 弹窗, 新增 / 修改 -->
     <GwCirculationCard2Form  ref="gwCirculationCard2Form" @refreshDataList="refreshList"></GwCirculationCard2Form>
+	<GwCirculationCard2Form2  ref="gwCirculationCard2Form2" @refreshDataList="refreshList"></GwCirculationCard2Form2>
+	<GwCirculationCard2FormYb  ref="GwCirculationCard2FormYb" @refreshDataList="refreshList"></GwCirculationCard2FormYb>
+	<!-- <fileInfo  ref="fileInfo" @refreshDataList="refreshList"></fileInfo> -->
+
   </div>
 </template>
 
 <script>
   import GwCirculationCard2Form from './GwCirculationCard2Form'
+  import GwCirculationCard2Form2 from './GwCirculationCard2Form2'
+  import GwCirculationCard2FormYb from './GwCirculationCard2FormYb'
+
+
+  //import fileInfo from './fileInfo'
   import gwCirculationCard2Service from '@/api/circulation2/gwCirculationCard2Service'
   export default {
     data () {
 		return {
 		  searchVisible: true,
+		  daiban:false,
 		  searchForm: {
 		    yearNum: '',
 		    cardNum: '',
@@ -236,7 +250,7 @@
 		    writtenTime: '',
 		    receivingTime: '',
 		    contentSummary: '',
-		    state: ''
+		    state: '5'
 		  },
 		  dataList: [],
 		  tablePage: {
@@ -249,10 +263,12 @@
 		}
     },
     components: {
-		GwCirculationCard2Form
+		GwCirculationCard2Form,
+		GwCirculationCard2Form2,
+		GwCirculationCard2FormYb
     },
     created () {
-    },    
+    },
     mounted () {
 		this.$nextTick(() => {
 		  // 将表格和工具栏进行关联
@@ -260,7 +276,7 @@
 		  const $toolbar = this.$refs.gwCirculationCard2Toolbar
 		  $table.connect($toolbar)
 		})
-    }, 
+    },
     activated () {
 		this.refreshList()
     },
@@ -268,6 +284,8 @@
 		// 获取数据列表
 		refreshList () {
 		  this.loading = true
+		  
+
 		  gwCirculationCard2Service.list({
 		    'current': this.tablePage.currentPage,
 		    'size': this.tablePage.pageSize,
@@ -277,6 +295,14 @@
 		    this.dataList = data.records
 		    this.tablePage.total = data.total
 		    this.loading = false
+			
+			//选择待办的时候
+			if(this.searchForm.state=='1'){
+						  this.daiban=true;
+			}else{
+						  this.daiban=false;
+			}
+			
 		  })
 		},
 		// 当前页
@@ -308,7 +334,13 @@
 		},
 		// 查看
 		view (id) {
-		  this.$refs.gwCirculationCard2Form.init('view', id)
+		  //this.$refs.gwCirculationCard2Form.init('view', id)
+		  this.$refs.gwCirculationCard2Form2.init('view', id)
+		 // this.$refs.fileInfo.init('view', id)
+		},
+		// 查看
+		view2 (id) {
+		  this.$refs.GwCirculationCard2FormYb.init('view', id)
 		},
 		// 删除
 		del (id) {
@@ -401,4 +433,3 @@
     }
   }
 </script>
-