Merge remote-tracking branch 'origin/master'

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

@@ -2,102 +2,117 @@
   <v-dialog
     :title="title"
     :close-on-click-modal="false"
-	style="width:1200px;"
+	style="width:1100px;height: auto;max-height: 1000px ;margin-top: 85px;"
     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>
-
+			<fileCard :gwId="inputForm.id" ref="filecard" v-if="visible"  style="width: 50%;" ></fileCard>
+
+			<div>
+
+
+				<div class="cll" :style="{height:heightpx  }"  >
+					<el-steps direction="vertical" :active="assignWorkOrderRecordDTOList.length"  >
+					  <el-step v-for="item in assignWorkOrderRecordDTOList" :title="item.which=='0'?'办公室拟办':item.which=='1'?'领导审批':item.which=='2'?'承办情况':item.which=='3'?'承办转发':'已归档'" :description="item.state==1?item.nextTruename :item.nextTruename +' - '+item.updateTime"/>
+					</el-steps>
+				</div>
+
+
+				<div style="display: flex; flex-direction:column;margin-left: 60px;margin-top:20px">
+
+
+					<view v-if="istransmit&&method=='edit'" class="titletab" >承办转发</view>
+					<view v-if="isoffice&&method=='edit'" class="titletab" >办公室拟办</view>
+					<view v-if="isleader&&method=='edit'" class="titletab" >领导批示</view>
+					<view v-if="isundertake&&method=='edit'" class="titletab" >承办科室</view>
+
+
+
+					<el-form v-if="istransmit&&method=='edit'" :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">
+							<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-col :span="24">
+							<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="isoffice&&method=='edit'" :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="isleader&&method=='edit'" :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&&method=='edit'" :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>
 
 		</div>
 
 
 
-		<el-tabs v-model="assignWorkOrderTab" >
+		<!-- <el-tabs v-model="assignWorkOrderTab" >
 		  <el-tab-pane label="流转记录">
 			<el-table  size="large"
 			  :data="assignWorkOrderRecordDTOList.filter(function(item){ return item.delFlag !== '1'})"
@@ -111,18 +126,15 @@
 			  <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>
+		</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 v-if="((isundertake||isleader||isoffice )&& !loading)&&method=='edit'" type="primary"  @click="doSubmit()" icon="circle-check" v-noMoreClick>确认签字</el-button>
+		  <el-button v-if="(!(isundertake||isleader||isoffice ) && !loading)&&method=='edit'" 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>
@@ -142,9 +154,10 @@
 		isoffice: false,
 		isleader: false,
 		isundertake: false,
+		istransmit: false,
 		one: true,
 		isAll: false,
-
+		heightpx:'400px',
 		leaderList: [],
 		auditForm: {
 					id: '',
@@ -198,14 +211,11 @@
         if (method === 'add') {
           this.title = `新建盐都工信文件阅办卡`
         } else if (method === 'edit') {
-          this.title = '修改盐都工信文件阅办卡'
+          this.title = '文件阅办卡详情'
         } else if (method === 'view') {
-          this.title = '盐都工信文件阅办卡'
+          this.title = '文件阅办卡详情'
         }
 
-
-
-
         this.visible = true
         this.loading = false
         this.$nextTick(() => {
@@ -219,8 +229,8 @@
 
 
 			gwFlowService.queryByGwId(this.inputForm.id).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 {
@@ -229,6 +239,7 @@
 				userService.leaderList(this.roleId).then(data => {
 					this.leaderList = data
 					if(this.one) this.auditForm.nextLeadUser =data[0].loginName
+					if (!this.auditForm.content) this.auditForm.content = '已阅'
 				})
 
 				// let user = $auth.getUserInfo()
@@ -240,34 +251,34 @@
 				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 (gw[0].which == '4') this.isAll = true
+					if (!this.auditForm.content) this.auditForm.content = '已阅'
 				}
-				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 == '办公室管理员') {
+					this.istransmit = true
+					if (gw.length == 0) {
+						let gw1 = data.filter(item => {
+							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 (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
 
 
 
-
-				this.assignWorkOrderRecordDTOList=data
+				let a=data.length*60;
+				this.heightpx=a+"px";
+				this.assignWorkOrderRecordDTOList=data.reverse()
 			})
 
           }
@@ -277,7 +288,10 @@
       doSubmit () {
         let inputForm = {};
         this.loading = true
-        if (this.isoffice) this.auditForm.next = '1'
+        if (this.istransmit) {
+        	this.auditForm.next = '1'
+        	if (!this.one) this.auditForm.which = '3'
+        }
         this.auditForm.state = "0"
         this.auditForm.gwId = this.inputForm.id
         const date = this.moment().format('YYYY-MM-DD HH:mm:ss');
@@ -322,4 +336,7 @@
 	.titletab {
 		color:#36a7f3 ;border-bottom:1px solid #36a7f3; width: 90px;padding: 6px;
 	}
+	.cll{
+		width: 450px; margin-left: 50px;
+	}
 </style>

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

@@ -250,7 +250,7 @@
 		    writtenTime: '',
 		    receivingTime: '',
 		    contentSummary: '',
-		    state: '5'
+		    state: '1'
 		  },
 		  dataList: [],
 		  tablePage: {
@@ -334,13 +334,14 @@
 		},
 		// 查看
 		view (id) {
-		  //this.$refs.gwCirculationCard2Form.init('view', id)
-		  this.$refs.gwCirculationCard2Form2.init('view', id)
+		 //this.$refs.gwCirculationCard2Form.init('view', id)
 		 // this.$refs.fileInfo.init('view', id)
+		 //this.$refs.gwCirculationCard2Form2.init('view', id)
+		 this.$refs.GwCirculationCard2FormYb.init('view', id)
 		},
 		// 查看
 		view2 (id) {
-		  this.$refs.GwCirculationCard2FormYb.init('view', id)
+		  this.$refs.GwCirculationCard2FormYb.init('edit', id)
 		},
 		// 删除
 		del (id) {

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

@@ -8,24 +8,24 @@
 
 
 			  <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-col :span="12" class="grid-content-left1"><div >年度： {{inputForm.yearNum}}</div></el-col>
+				<el-col :span="12" class="grid-content-right1"><div >[{{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-col :span="6" class="grid-content-left"><div >来文机关</div></el-col>
+				<el-col :span="6" class="grid-content-left"><div >{{inputForm.sendingAgency}}</div></el-col>
+				<el-col :span="6" class="grid-content-left"><div >来文字号</div></el-col>
+				<el-col :span="6" class="grid-content-right"><div >{{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-col :span="6" class="grid-content-left"><div >收文时间</div></el-col>
+				<el-col :span="6" class="grid-content-left"><div >{{inputForm.receivingTime}}</div></el-col>
+				<el-col :span="6" class="grid-content-left"><div >文件来源</div></el-col>
+				<el-col :span="6" class="grid-content-right"><div >{{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-col :span="6" class="grid-content-left"><div >内容摘要</div></el-col>
+				<el-col :span="18" class="grid-content-right"><div >{{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>
@@ -85,8 +85,8 @@
 
 			  	<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>
+			  			<view decoration='underline' color='#36a7f3' :text="item.name"
+			  				@click="item.type=='pdf'?preview(item):download(item)"></view>
 
 			  			<!-- <a :href="item.url">{{item.name}}</a> -->
 			  		</view>
@@ -113,33 +113,12 @@
 
 	export default {
 		mounted() {
-			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) {
-						// 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
-			})
-
+			// this.$nextTick(function() {
+			// 	this.$on('refresh', function() {
+					this.refresh();
+			// 	});
+			// });
+			
 		},
 		data() {
 			return {
@@ -248,6 +227,35 @@
 					})
 				}
 			},
+
+			refresh(){
+				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) {
+							// 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
+				})
+			},
 		},
 		props: {
 			isoffice: {

jp-ui/src/views/sys/login/components/login-form.vue

@@ -38,8 +38,7 @@
 				</template>
 			</el-dropdown>
 		</div>
-		<div class="login-form-title">{{ $t2("t_login") }}</div>
-		<div class="login-form-sub-title">{{ $t2("t_login_description") }}</div>
+		<div class="login-form-title">登录账号</div>
 		<div class="login-form-error-msg">{{ errorMessage }}</div>
 		<el-form
 			ref="loginForm"
@@ -94,7 +93,7 @@
 					:loading="loading"
 					class="login-submit"
 					@click="login"
-					>{{ $t2("t_login") }}</el-button
+					>登录</el-button
 				>
 			</el-form-item>
 			<el-form-item> </el-form-item>
@@ -271,8 +270,8 @@ export default {
 
 	&-title {
 		text-align: center;
-		color: #475055;
-		font-weight: 500;
+		color: #0090fe;
+		font-weight: 800;
 		font-size: 24px;
 		line-height: 32px;
 	}

jp-ui/src/views/sys/login/login.vue

@@ -1,6 +1,29 @@
 <template>
 	<div class="container">
-		<div class="logo">
+
+		<div class="banner">
+
+			<div class="content">
+				<img style="width: 340px;height: 60px;margin: 20px;" src="@/assets/img/login/logo1_b.png" />
+
+				<div class="content2">
+
+					<div style="width: 50%;display: flex;flex-direction: row-reverse;">
+						<img style="width: 80%; height: 80%;margin-top:100px " src="@/assets/img/login/loginbg2.jpg" />
+					</div>
+					<div class="content3" >
+						<LoginForm />
+					</div>
+				</div>
+
+
+
+			</div>
+
+
+		</div>
+
+		<!-- <div class="logo">
 			<img alt="logo" src="/img/logo.svg" />
 			<div class="logo-text">{{ appName }}</div>
 		</div>
@@ -12,7 +35,7 @@
 			<div class="footer">
 				<Footer />
 			</div>
-		</div>
+		</div> -->
 	</div>
 </template>
 
@@ -21,6 +44,7 @@ import Footer from "@/components/footer/index.vue";
 import LoginBanner from "./components/banner.vue";
 import LoginForm from "./components/login-form.vue";
 import configService from "@/api/sys/configService";
+import image2 from "@/assets/img/login/loginbg.jpg";
 import colorTool from "@/utils/color";
 export default {
 	components: {
@@ -31,6 +55,7 @@ export default {
 	data() {
 		return {
 			productName: "",
+			imagepic:image2
 		};
 	},
 	beforeCreate() {
@@ -71,19 +96,34 @@ export default {
 	height: 100vh;
 
 	.banner {
-		width: 50%;
-		background: linear-gradient(163.85deg, #4b94f2 0%, #4393fa 100%);
+		width: 100%;
+		background-image: url(@/assets/img/login/loginbg.jpg);
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 
 	.content {
-		position: relative;
 		display: flex;
-		flex: 1;
-		background: #ffffff;
-		align-items: center;
-		justify-content: center;
+		flex-direction: column;
+		background: #fcfdff;
+		width: 70%;
+		height: 80%;
+		border-radius: 8px;
 	}
 
+	.content2 {
+		display: flex;
+		flex-direction: row;
+	}
+
+	.content3 {
+		display: flex;
+		align-items: center;
+		width: 50%;height: 100%;
+		padding-left: 25px;
+		padding-top: 160px;
+	}
 	.footer {
 		position: absolute;
 		right: 0;