流程调整+页面调整

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

@@ -7,14 +7,12 @@
 
 
 		<div style="display: flex; flex-direction: row;">
-			<fileCard :gwId="inputForm.id" style="width: 50%;" ></fileCard>
-
-
+			<fileCard :gwId="inputForm.id" ref="filecard" v-if="visible"  style="width: 50%;" ></fileCard>
 
 			<div>
 
 
-				<div style="height: 250px; width: 450px; margin-left: 50px;">
+				<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>
@@ -24,21 +22,16 @@
 				<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="isoffice&&method=='edit'" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;" >
+					<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" 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="[
@@ -64,7 +57,8 @@
 
 						   </el-form-item>
 						</el-col>
-						<el-col :span="24" v-if="one">
+						<!-- <el-col :span="24" v-if="one"> -->
+						<el-col :span="24">
 							<el-form-item label="备注" prop="remark"
 								:rules="[
 								 ]">
@@ -74,6 +68,17 @@
 					  </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">
@@ -128,8 +133,8 @@
     <template #footer>
         <span class="dialog-footer">
           <el-button @click="visible = false" icon="circle-close">关闭</el-button>
-		  <el-button v-if="((isundertake||isleader||one )&& !loading)&&method=='edit'" type="primary"  @click="doSubmit()" icon="circle-check" v-noMoreClick>确认签字</el-button>
-		  <el-button v-if="(!(isundertake||isleader||one ) && !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 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>
@@ -152,7 +157,7 @@
 		istransmit: false,
 		one: true,
 		isAll: false,
-
+		heightpx:'400px',
 		leaderList: [],
 		auditForm: {
 					id: '',
@@ -211,9 +216,6 @@
           this.title = '文件阅办卡详情'
         }
 
-
-
-
         this.visible = true
         this.loading = false
         this.$nextTick(() => {
@@ -257,7 +259,6 @@
 				}
 				if (role == '办公室管理员') {
 					this.istransmit = true
-
 					if (gw.length == 0) {
 						let gw1 = data.filter(item => {
 							return item.which == 3
@@ -275,7 +276,8 @@
 
 
 
-
+				let a=data.length*60;
+				this.heightpx=a+"px";
 				this.assignWorkOrderRecordDTOList=data.reverse()
 			})
 
@@ -287,8 +289,8 @@
         let inputForm = {};
         this.loading = true
         if (this.istransmit) {
-        	inputForm.next = '1'
-        	if (!this.one) inputForm.which = '3'
+        	this.auditForm.next = '1'
+        	if (!this.one) this.auditForm.which = '3'
         }
         this.auditForm.state = "0"
         this.auditForm.gwId = this.inputForm.id
@@ -334,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: {

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

@@ -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: {