Sfoglia il codice sorgente

修改代办公文逻辑和送件时间

SanHQin 1 anno fa
parent
commit
6b9f1cd31b

+ 0 - 1
dist/css/194.6b9069bc.css

@@ -1 +0,0 @@
-[data-v-29be49d0] .el-table__row .el-table__cell{cursor:pointer}[data-v-29be49d0] .el-table__row .el-table__cell:last-child{cursor:default}

File diff suppressed because it is too large
+ 0 - 0
dist/css/210.52d9bce0.css


+ 1 - 0
dist/css/415.cf44651d.css

@@ -0,0 +1 @@
+[data-v-4b4af58f] .el-table__row .el-table__cell{cursor:pointer}[data-v-4b4af58f] .el-table__row .el-table__cell:last-child{cursor:default}

+ 0 - 0
dist/css/8.8ef56efc.css → dist/css/595.8ef56efc.css


+ 0 - 0
dist/css/210.e839fba8.css → dist/css/8.e839fba8.css


+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.45150633.js"></script><script defer="defer" src="/js/app.1825b08f.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.431d2a6a.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.45150633.js"></script><script defer="defer" src="/js/app.48061bef.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.431d2a6a.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

File diff suppressed because it is too large
+ 0 - 0
dist/js/194.e6baeb35.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/210.3a5144eb.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/210.3a5144eb.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/210.6689b254.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/210.6689b254.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/415.162751ec.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/415.162751ec.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/595.8443ed27.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/595.8443ed27.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/8.026c9adf.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/8.026c9adf.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/8.753c4517.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/8.753c4517.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/909.864c45e3.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/909.864c45e3.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.48061bef.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.48061bef.js.map


+ 2 - 0
src/views/commission/commission.vue

@@ -363,7 +363,9 @@ export default {
     },
   },
   mounted() {
+		this.pavalues.value4 = new Date().getFullYear().toString();
     this.getData();
+		
   },
 };
 </script>

+ 44 - 21
src/views/commission/components/projectBook.vue

@@ -154,7 +154,7 @@
       </tr>
     </table>
     <div class="flowPath">
-      <div class="flowItem" v-if="showType < 5">
+      <!-- <div class="flowItem" v-if="showType < 5">
         <div></div>
         <div>评审委员会意见</div>
       </div>
@@ -169,7 +169,7 @@
       <div class="flowItem" v-if="showType < 0">
         <div></div>
         <div>创新创业综合审核-初审</div>
-      </div>
+      </div> -->
       <!-- <div class="flowItem">
         <div></div>
         <div style="font-weight: unset">
@@ -179,7 +179,7 @@
           >
         </div>
       </div> -->
-      <div class="flowItem1" v-for="(qp, qpIndex) in qpList" :key="qpIndex">
+      <!-- <div class="flowItem1" v-for="(qp, qpIndex) in qpList" :key="qpIndex">
         <div class="isRight" v-if="qp.isAgree == 1"></div>
         <div class="isWrong" v-if="qp.isAgree == 2"></div>
         <div class="flowNavBox">
@@ -190,29 +190,45 @@
           <div class="flowBottom">
             <div class="flowText" v-if="qp.isAgree == 1">
 							{{typeListStatus[qp.type]}}审核,拟通过。
-              <!-- {{
-                qp.type == 0
-                  ? "创新创业综合审核-初审"
-                  : qp.type == 1
-                  ? "所在学院领导审核"
-                  : qp.type == 2
-                  ? "所在学院部门"
-                  : "评审委员会意见"
-              }}审核,拟通过。 -->
             </div>
             <div class="flowText" v-else>{{ qp.bm }}审核,不通过。</div>
             <div class="flowReason" v-if="qp.isAgree == 2">{{ qp.text }}</div>
           </div>
         </div>
-      </div>
+      </div> -->
+			<div v-for="(item,index) in typeListStatus" :key="index">
+				<div class="flowItem" v-if="qpList.filter(i=>i.type==item.key).length<=0">
+        	<div></div>
+        	<div>{{item.tit}}</div>
+      	</div>
+				<div class="flowItem1" v-else >
+					<div class="isRight" v-if="qpList.filter(i=>i.type==item.key)[0].isAgree == 1"></div>
+        	<div class="isWrong" v-if="qpList.filter(i=>i.type==item.key)[0].isAgree == 2"></div>
+        	<div class="flowNavBox">
+        
+        	  <div class="flowBottom">
+        	    <div class="flowText" v-if="qpList.filter(i=>i.type==item.key)[0].isAgree == 1">
+								{{ typeListStatus.find(i=>i.key==item.key).tit }}审核,拟通过
+								<!-- {{typeListStatus[qpList.filter(i=>i.type==item.key)[0].type]}}审核,拟通过。 -->
+        	    </div>
+        	    <div class="flowText" v-else>{{ qpList.filter(i=>i.type==item.key)[0].bm }}审核,不通过。</div>
+        	    <div class="flowReason" v-if="qpList.filter(i=>i.type==item.key)[0].isAgree == 2">{{ qpList.filter(i=>i.type==item.key)[0].text }}</div>
+        	  </div>
+						<div class="flowTop">
+        	    <div class="flowTime">{{ qpList.filter(i=>i.type==item.key)[0].lcTime }}</div>
+        	    <div class="flowPeople">{{ qpList.filter(i=>i.type==item.key)[0].bm }}{{ qpList.filter(i=>i.type==item.key)[0].username }}</div>
+        	  </div>
+        	</div>
+				</div>
+			</div>
       <div class="flowItem1">
         <div class="firstRight"></div>
         <div class="flowNavBox">
           <div class="flowTop">
             <div class="flowTime">{{ bookData.lcCreateAt }}</div>
             <div class="flowPeople">
-              {{ $store.state.userInfo.bm ? $store.state.userInfo.bm + "-" : ""
-              }}{{ $store.state.userInfo.username }}
+              {{ bookData.bm ? bookData.bm + "-" : ""
+              }}{{ bookData.username }}
             </div>
           </div>
           <div class="flowBottom">
@@ -313,12 +329,18 @@ export default {
       showType: -1,
       isQpButton: false,
       isAgree: 0,
-			typeListStatus:{
-				"0":"创新创业综合审核-初审",
-				"3":"所在学院领导审核",
-				"4":"所在学院部门",
-				"5":"评审委员会意见"
-			}
+			typeListStatus:[
+				{tit:"评审委员会意见",key:'5'},
+				{tit:"所在学院部门",key:'4'},
+				{tit:"所在学院领导审核",key:'3'},
+				{tit:"创新创业综合审核-初审",key:'0'},
+			]
+			// typeListStatus:{
+			// 	"5":"评审委员会意见",
+			// 	"4":"所在学院部门",
+			// 	"3":"所在学院领导审核",
+			// 	"0":"创新创业综合审核-初审",
+			// }
 
     };
   },
@@ -467,6 +489,7 @@ export default {
         (res) => {
           this.isQpButton = false;
           this.qpList = res.data[0];
+					this.qpList.sort((a,b)=>new Date(b.create_at)-new Date(a.create_at))
 					this.qpList.sort((a,b)=>b.type-a.type)
           this.showType =
             res.data[0].length > 0

Some files were not shown because too many files changed in this diff