瀏覽代碼

新增代办公文流程

zengyicheng 1 年之前
父節點
當前提交
1e3cb8357d

文件差異過大導致無法顯示
+ 0 - 0
dist/css/530.5ae692da.css


+ 1 - 0
dist/css/665.e1ed1379.css

@@ -0,0 +1 @@
+.projectApplication .btnClass[data-v-5001ed53]{width:70px!important;max-width:70px;min-width:70px}

+ 0 - 1
dist/css/802.7a9062cd.css

@@ -1 +0,0 @@
-.projectApplication .btnClass[data-v-518e370d]{width:70px!important;max-width:70px;min-width:70px}

文件差異過大導致無法顯示
+ 0 - 0
dist/css/991.2fa233ab.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.c0eb00f6.js"></script><script defer="defer" src="/js/app.8f68b066.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.65f4fb3f.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.c0eb00f6.js"></script><script defer="defer" src="/js/app.5859561b.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.65f4fb3f.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

文件差異過大導致無法顯示
+ 0 - 0
dist/js/275.b0597a57.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/275.b0597a57.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/530.af6845dc.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/530.af6845dc.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/609.9701135e.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/609.9701135e.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/665.963a881e.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/665.963a881e.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/697.0897631e.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/697.0897631e.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/802.83437ccc.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/991.46e8a397.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/991.46e8a397.js.map


文件差異過大導致無法顯示
+ 0 - 0
dist/js/app.5859561b.js


文件差異過大導致無法顯示
+ 0 - 0
dist/js/app.5859561b.js.map


二進制
src/assets/img/wrong.png


+ 120 - 23
src/views/commission/components/projectBook.vue

@@ -4,8 +4,19 @@
     <table border="1" cellspacing="0">
       <div class="onePage">
         <div class="titSchool">深圳技师学院</div>
-        <div class="title">二级学院特色创客空间建设项目立项申报书</div>
-        <div class="dateCss">申请日期:</div>
+        <div
+          class="title"
+          v-if="bookData.typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
+        >
+          二级学院特色创客空间建设项目立项申报书
+        </div>
+        <div
+          class="title"
+          v-if="bookData.typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
+        >
+          学生创客项目申报书
+        </div>
+        <div class="dateCss">申请日期:{{ bookData.createAt }}</div>
       </div>
 
       <tr>
@@ -16,21 +27,37 @@
       </tr>
       <tr>
         <td rowspan="2" class="bold"><span>*</span>项目状态</td>
-        <td>
+        <td v-if="bookData.typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'">
           {{
             bookData.typeName == "00a3aa2f-f51e-11ed-a3f6-509a4c5b67cf"
               ? "√"
               : "□"
           }}已建设
         </td>
-        <td colspan="6">
+        <td v-if="bookData.typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'">
+          {{
+            bookData.typeName == "ed917c55-f51d-11ed-a3f6-509a4c5b67cf"
+              ? "√"
+              : "□"
+          }}创意组
+        </td>
+        <td
+          colspan="6"
+          v-if="bookData.typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
+        >
           指二级学院已获得政府或学校资助( 例:设计学院、信通学院、珠宝学院
           ),已有双创空间(
           创客实践室场地、设备设施并已投入运营,需对空间环境优化、规章制度建设、小型设施设备添置、创客项目物料增补,需拓展创客项目培训、辅导,创客讲座、沙龙、论坛,创客路演、竞赛、集市及成果参评、参展等方面的工作而提出的资助申请。
         </td>
+        <td
+          colspan="6"
+          v-if="bookData.typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
+        >
+          立项项目为新立项项目,项目成果应具有较好的创意和较为成型的产品原型或能提供较好的商业模式,产生较好的社会效益。
+        </td>
       </tr>
       <tr>
-        <td>
+        <td v-if="bookData.typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'">
           {{
             bookData.typeName == "04692ef6-f51e-11ed-a3f6-509a4c5b67cf"
               ? "√"
@@ -38,9 +65,26 @@
           }}
           待建设
         </td>
-        <td colspan="6">
+        <td v-if="bookData.typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'">
+          {{
+            bookData.typeName == "f3068e26-f51d-11ed-a3f6-509a4c5b67cf"
+              ? "√"
+              : "□"
+          }}
+          初创组
+        </td>
+        <td
+          colspan="6"
+          v-if="bookData.typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
+        >
           指二级学院拟立项开展学院特色创客空间建设项目,需进行项目前期调研论证、场馆规划、空间图纸设计设备选型等方面的工作而进行的资助申请。
         </td>
+        <td
+          colspan="6"
+          v-if="bookData.typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
+        >
+          立项项目为学校已结题学生创客项目或已入驻学校创业孵化基地的学生初创企业项目(毕业两年内),项目成果应为原结题项目基础上的技术升级、企业注册、规模扩张。
+        </td>
       </tr>
 
       <tr>
@@ -53,19 +97,21 @@
         <td colspan="2" class="bold"><span>*</span>项目负责人</td>
         <td colspan="2">{{ bookData.pro_leader }}</td>
         <td colspan="2" class="bold"><span>*</span>学院牵头领导</td>
-        <td colspan="2">{{ bookData.lead_leader }}</td>
+        <td colspan="2">
+          {{ bookData.lead_leader ? bookData.lead_leader : "暂无" }}
+        </td>
       </tr>
       <tr>
         <td
           colspan="8"
           style="height: 200px; box-sizing: border-box; padding-bottom: 40px"
         >
-          <div class="addMessage">
+          <div class="addMessage" v-if="!isQpButton">
             <p class="bold">部门意见:</p>
             <el-button type="primary" @click="openQp">签批</el-button>
           </div>
           <div class="flexBox">
-            <div style="padding-top: 10px;">项目简介:</div>
+            <div style="padding-top: 10px">项目简介:</div>
             <el-input
               type="textarea"
               :autosize="{ minRows: 6 }"
@@ -99,15 +145,15 @@
       </tr>
     </table>
     <div class="flowPath">
-      <div class="flowItem" v-if="showType < 3">
+      <div class="flowItem" v-if="showType < 5">
         <div></div>
         <div>评审委员会意见</div>
       </div>
-      <div class="flowItem" v-if="showType < 2">
+      <div class="flowItem" v-if="showType < 4">
         <div></div>
         <div>所在学院部门</div>
       </div>
-      <div class="flowItem" v-if="showType < 1">
+      <div class="flowItem" v-if="showType < 3">
         <div></div>
         <div>所在学院领导审核</div>
       </div>
@@ -125,7 +171,8 @@
         </div>
       </div> -->
       <div class="flowItem1" v-for="(qp, qpIndex) in qpList" :key="qpIndex">
-        <div></div>
+        <div class="isRight" v-if="qp.isAgree == 1"></div>
+        <div class="isWrong" v-if="qp.isAgree == 2"></div>
         <div class="flowNavBox">
           <div class="flowTop">
             <div class="flowTime">{{ qp.lcTime }}</div>
@@ -135,12 +182,12 @@
             <div class="flowText" v-if="qp.isAgree == 1">
               {{
                 qp.type == 0
-                  ? "部门领导"
+                  ? "创新创业综合审核-初审"
                   : qp.type == 1
-                  ? "创新创业学院"
+                  ? "所在学院领导审核"
                   : qp.type == 2
-                  ? "学术委员会"
-                  : "科研办"
+                  ? "所在学院部门"
+                  : "评审委员会意见"
               }}审核,拟同意。
             </div>
             <div class="flowText" v-else>{{ qp.bm }}审核,不同意。</div>
@@ -149,7 +196,7 @@
         </div>
       </div>
       <div class="flowItem1">
-        <div></div>
+        <div class="firstRight"></div>
         <div class="flowNavBox">
           <div class="flowTop">
             <div class="flowTime">{{ bookData.lcCreateAt }}</div>
@@ -254,6 +301,8 @@ export default {
       phList: [],
       qpList: [],
       showType: -1,
+      isQpButton: false,
+      isAgree: 0,
     };
   },
   methods: {
@@ -380,14 +429,30 @@ export default {
     getSign() {
       let param = {
         pid: this.$route.query["pid"],
-        uid: this.$store.state.userInfo.userid,
       };
       // return console.log(param);
       // console.log(param)
       this.ajax.get(this.$store.state.api + "/selectSign", param).then(
         (res) => {
+          this.isQpButton = false;
           this.qpList = res.data[0];
-          this.showType = Math.max(...res.data[0].map((obj) => obj.type));
+          this.showType =
+            res.data[0].length > 0
+              ? Math.max(...res.data[0].map((obj) => obj.type))
+              : -1;
+          this.isAgree =
+            res.data[0].length > 0
+              ? Math.max(...res.data[0].map((obj) => obj.isAgree))
+              : 0;
+          for (var i = 0; i < res.data[0].length; i++) {
+            if (
+              res.data[0][i].userid == this.$store.state.userInfo.userid &&
+              res.data[0][i].type == this.$store.state.userInfo.type &&
+              res.data[0][i].isAgree == 1
+            ) {
+              this.isQpButton = true;
+            }
+          }
         },
         (err) => {
           console.log(err);
@@ -689,15 +754,24 @@ export default {
       min-height: 60px;
       padding-bottom: 15px;
       box-sizing: border-box;
-      > div:first-child {
+      .isRight,
+      .isWrong,
+      .firstRight {
         width: 20px;
         min-width: 20px;
         height: 20px;
-        background-image: url("../../../assets/img/right.png");
         background-size: 100% 100%;
         background-repeat: no-repeat;
         z-index: 99;
       }
+      .isRight,
+      .firstRight {
+        background-image: url("../../../assets/img/right.png") !important;
+      }
+      .isWrong {
+        background-image: url("../../../assets/img/wrong.png") !important;
+      }
+
       .flowNavBox {
         font-weight: unset;
         padding-left: 15px;
@@ -720,6 +794,10 @@ export default {
           .flowText {
             font-weight: bold;
           }
+          .flowReason {
+            max-height: 500px;
+            overflow: auto;
+          }
         }
       }
     }
@@ -728,7 +806,7 @@ export default {
     position: absolute;
     content: "";
     width: 2px;
-    height: calc(100% - 105px);
+    height: calc(100% - 95px);
     background: #848484;
     left: 9px;
     top: 10px;
@@ -861,4 +939,23 @@ export default {
     }
   }
 }
+
+// 滚动条样式
+.flowReason::-webkit-scrollbar-track-piece {
+  background-color: #f8f8f800;
+}
+.flowReason::-webkit-scrollbar {
+  width: 6px;
+  transition: all 2s;
+}
+.flowReason::-webkit-scrollbar-thumb {
+  background-color: #929292;
+  border-radius: 100px;
+}
+.flowReason::-webkit-scrollbar-thumb:hover {
+  background-color: #bbb;
+}
+.flowReason::-webkit-scrollbar-corner {
+  background-color: rgba(255, 255, 255, 0);
+}
 </style>

+ 89 - 29
src/views/projectApply/projectApplication.vue

@@ -333,7 +333,11 @@
 
               <!-- <el-button type="primary"  size="mini" @click="appTable(scope.row.typeid,scope.row.courseId)" >申请表</el-button> -->
 
-              <el-button type="primary" class="btnClass" size="mini" @click="del(scope.row)"
+              <el-button
+                type="primary"
+                class="btnClass"
+                size="mini"
+                @click="del(scope.row)"
                 >删除</el-button
               >
             </div>
@@ -617,42 +621,98 @@ export default {
       }
     },
     ManagerCommit() {
-      //立项审核对话框里面的管理员通过按钮
-      // console.log(this.iid);
+      //先判断项目有没有被驳回
       let param = {
-        uid: this.$store.state.userInfo.userid,
         pid: this.iid.courseId,
-        num: 2,
       };
-      this.ajax
-        // .post(this.$store.state.api+"/ApproveProject",param)
-        .post(this.$store.state.api + "/updateIsupload", param)
-        .then(
-          (res) => {
-            // console.log(res);
-            this.dialogVisible = false;
-            this.$message.success("已通过");
-            this.getData();
-          },
-          (err) => {
-            console.log(err);
+      // return console.log(param);
+      // console.log(param)
+      this.ajax.get(this.$store.state.api + "/selectSign", param).then(
+        (res) => {
+          let isAgree =
+            res.data[0].length > 0
+              ? Math.max(...res.data[0].map((obj) => obj.isAgree))
+              : 1;
+          if (isAgree == 2) {
+            let text = "项目已被驳回,原因为:";
+            for (var i = 0; i < res.data[0].length; i++) {
+              if (res.data[0][i].isAgree == 2) {
+                text += res.data[0][i].text;
+              }
+            }
+            this.$message.warning(text);
+            return;
+          } else {
+            //立项审核对话框里面的管理员通过按钮
+            // console.log(this.iid);
+            let param = {
+              uid: this.$store.state.userInfo.userid,
+              pid: this.iid.courseId,
+              num: 2,
+            };
+            this.ajax
+              // .post(this.$store.state.api+"/ApproveProject",param)
+              .post(this.$store.state.api + "/updateIsupload", param)
+              .then(
+                (res) => {
+                  // console.log(res);
+                  this.dialogVisible = false;
+                  this.$message.success("已通过");
+                  this.getData();
+                },
+                (err) => {
+                  console.log(err);
+                }
+              );
           }
-        );
+        },
+        (err) => {
+          console.log(err);
+        }
+      );
     },
     ApplyPersonCommit() {
-      //申请人审核按钮
+      //先判断项目有没有被驳回
       let param = {
-        uid: this.$store.state.userInfo.userid,
         pid: this.iid.courseId,
-        num: 1,
       };
-      this.ajax
-        .post(this.$store.state.api + "/updateIsupload", param) //updateIsupload
-        .then((res) => {
-          this.dialogVisible = false;
-          this.$message.success("已提交");
-          this.getData();
-        });
+      // return console.log(param);
+      // console.log(param)
+      this.ajax.get(this.$store.state.api + "/selectSign", param).then(
+        (res) => {
+          let isAgree =
+            res.data[0].length > 0
+              ? Math.max(...res.data[0].map((obj) => obj.isAgree))
+              : 1;
+          if (isAgree == 2) {
+            let text = "项目已被驳回,原因为:";
+            for (var i = 0; i < res.data[0].length; i++) {
+              if (res.data[0][i].isAgree == 2) {
+                text += res.data[0][i].text;
+              }
+            }
+            this.$message.warning(text);
+            return;
+          } else {
+            //申请人审核按钮
+            let param = {
+              uid: this.$store.state.userInfo.userid,
+              pid: this.iid.courseId,
+              num: 1,
+            };
+            this.ajax
+              .post(this.$store.state.api + "/updateIsupload", param) //updateIsupload
+              .then((res) => {
+                this.dialogVisible = false;
+                this.$message.success("已提交");
+                this.getData();
+              });
+          }
+        },
+        (err) => {
+          console.log(err);
+        }
+      );
     },
     rejectApply() {
       //立项审核对话框里面的驳回申请
@@ -811,7 +871,7 @@ export default {
   //   height: 0;
   // }
 
-  .btnClass{
+  .btnClass {
     width: 70px !important;
     max-width: 70px;
     min-width: 70px;

部分文件因文件數量過多而無法顯示