Parcourir la source

1、修改双创问题
2、build

zengyicheng il y a 1 an
Parent
commit
6d8283d47b
75 fichiers modifiés avec 3195 ajouts et 2117 suppressions
  1. 0 0
      dist/css/164.312b1cb3.css
  2. 0 0
      dist/css/176.9df2180f.css
  3. 0 0
      dist/css/210.7b1bb6c8.css
  4. 0 0
      dist/css/278.3c99c5e3.css
  5. 0 0
      dist/css/316.6c24c98e.css
  6. 0 0
      dist/css/376.59e19617.css
  7. 0 0
      dist/css/390.700c1d23.css
  8. 0 0
      dist/css/564.1966fb8d.css
  9. 0 0
      dist/css/601.5276ea91.css
  10. 0 0
      dist/css/748.09bca31f.css
  11. 0 0
      dist/css/803.97e61cd7.css
  12. 0 0
      dist/css/899.17d7f0dc.css
  13. BIN
      dist/img/zzpic426.fcaf0a8f.jpg
  14. 1 1
      dist/index.html
  15. 0 0
      dist/js/125.71838efd.js
  16. 0 0
      dist/js/125.71838efd.js.map
  17. 0 0
      dist/js/164.25b95f16.js
  18. 0 0
      dist/js/164.25b95f16.js.map
  19. 0 0
      dist/js/176.0389c052.js
  20. 0 0
      dist/js/176.0389c052.js.map
  21. 0 0
      dist/js/181.f42cca8a.js.map
  22. 0 0
      dist/js/210.268b39e2.js
  23. 0 0
      dist/js/210.268b39e2.js.map
  24. 0 0
      dist/js/278.3f58c3f1.js
  25. 0 0
      dist/js/278.3f58c3f1.js.map
  26. 0 0
      dist/js/296.8ddf5b72.js.map
  27. 0 0
      dist/js/316.e5f54602.js
  28. 0 0
      dist/js/316.e5f54602.js.map
  29. 0 0
      dist/js/363.42af8ef3.js
  30. 0 0
      dist/js/363.42af8ef3.js.map
  31. 0 0
      dist/js/376.a791cf14.js
  32. 0 0
      dist/js/376.a791cf14.js.map
  33. 0 0
      dist/js/390.8312bb4e.js
  34. 0 0
      dist/js/390.8312bb4e.js.map
  35. 0 0
      dist/js/520.c9d3ffce.js.map
  36. 0 0
      dist/js/551.5d4841b7.js
  37. 0 0
      dist/js/551.5d4841b7.js.map
  38. 0 0
      dist/js/564.a98f0cce.js
  39. 0 0
      dist/js/564.a98f0cce.js.map
  40. 0 0
      dist/js/597.b1f87e13.js
  41. 0 0
      dist/js/597.b1f87e13.js.map
  42. 0 0
      dist/js/601.acd5ea39.js
  43. 0 0
      dist/js/601.acd5ea39.js.map
  44. 0 0
      dist/js/675.7f5e30ff.js.map
  45. 0 0
      dist/js/73.8fe0159c.js
  46. 0 0
      dist/js/73.8fe0159c.js.map
  47. 0 0
      dist/js/748.3a048cc1.js
  48. 0 0
      dist/js/748.3a048cc1.js.map
  49. 0 0
      dist/js/803.20d1fe5d.js
  50. 0 0
      dist/js/803.20d1fe5d.js.map
  51. 0 0
      dist/js/872.7c27936b.js
  52. 0 0
      dist/js/872.7c27936b.js.map
  53. 0 0
      dist/js/899.44c9a212.js
  54. 0 0
      dist/js/899.44c9a212.js.map
  55. 0 0
      dist/js/904.76b4f0de.js
  56. 0 0
      dist/js/904.76b4f0de.js.map
  57. 0 0
      dist/js/app.8177271e.js
  58. 0 0
      dist/js/app.a1b67638.js
  59. 0 0
      dist/js/app.a1b67638.js.map
  60. BIN
      src/assets/img/pdf.png
  61. BIN
      src/assets/img/word.png
  62. 952 795
      src/components/markeractivityWord.vue
  63. 1 1
      src/components/studentProjectWord.vue
  64. 2 2
      src/config/config.js
  65. 2 0
      src/permission.js
  66. 70 47
      src/views/home.vue
  67. 1 2
      src/views/projectApply/components/MakerSpaceWord.vue
  68. 78 51
      src/views/projectApply/components/studentProjectWord.vue
  69. 2 2
      src/views/projectApply/components/studentProjectWordDetail.vue
  70. 5 3
      src/views/projectApply/components/studentProjectWordShow.vue
  71. 344 281
      src/views/projectApply/newStudentProjectApply.vue
  72. 862 594
      src/views/projectManage/ProjectManagement.vue
  73. 873 336
      src/views/projectManage/components/Closingstatement.vue
  74. 1 1
      src/views/projectSettlement/components/projectSettlementBook.vue
  75. 1 1
      src/views/projectSettlement/projectSettlement.vue

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/164.312b1cb3.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/176.9df2180f.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/210.7b1bb6c8.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/278.3c99c5e3.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/316.6c24c98e.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/376.59e19617.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/390.700c1d23.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/564.1966fb8d.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/601.5276ea91.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/748.09bca31f.css


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/css/803.97e61cd7.css


+ 0 - 0
dist/css/675.17d7f0dc.css → dist/css/899.17d7f0dc.css


BIN
dist/img/zzpic426.fcaf0a8f.jpg


+ 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.8177271e.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.878f2d55.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.a1b67638.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.878f2d55.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/125.71838efd.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/125.71838efd.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/164.25b95f16.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/164.25b95f16.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/176.0389c052.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/176.0389c052.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/181.f42cca8a.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/210.268b39e2.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/210.268b39e2.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/278.3f58c3f1.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/278.3f58c3f1.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/296.8ddf5b72.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/316.e5f54602.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/316.e5f54602.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/363.42af8ef3.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/363.42af8ef3.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/376.a791cf14.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/376.a791cf14.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/390.8312bb4e.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/390.8312bb4e.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/520.c9d3ffce.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/551.5d4841b7.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/551.5d4841b7.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/564.a98f0cce.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/564.a98f0cce.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/597.b1f87e13.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/597.b1f87e13.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/601.acd5ea39.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/601.acd5ea39.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/675.7f5e30ff.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/73.8fe0159c.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/73.8fe0159c.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/748.3a048cc1.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/748.3a048cc1.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/803.20d1fe5d.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/803.20d1fe5d.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/872.7c27936b.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/872.7c27936b.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/899.44c9a212.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/899.44c9a212.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/904.76b4f0de.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/904.76b4f0de.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/app.8177271e.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/app.a1b67638.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
dist/js/app.a1b67638.js.map


BIN
src/assets/img/pdf.png


BIN
src/assets/img/word.png


+ 952 - 795
src/components/markeractivityWord.vue

@@ -1,183 +1,247 @@
 <template>
-    <div id="MarkeractivityWord">
-        <div id="title">
-            <div class="school">深圳技师学院</div>
-            <div class="wordTitle">创客专项资金及项目申请表(创客活动)</div>
-            <div class="date">申请日期:{{wordData.applicationDate}}</div>
-        </div>
-        <table border="1" cellspacing="0" class="table">
-            <tr v-if="this.$route.path=='/newMarkerActivity'?1:0">
-              <td colspan="4">关联项目</td>
-              <td colspan="12">
-                <el-select v-model="wordData['associatedProjects']" @change="checkProjectMoney()" style="width: 100%;" placeholder="请选择关联项目(无关联项目可为空)">
-                  <el-option
-                    v-for="item in ProjectData"
-                    :key="item.courseId"
-                    :label="item.title"
-                    :value="item.courseId">
-                  </el-option>
-                </el-select>
-              </td>
-            </tr>
-            <tr>
-                <td colspan="4">活动名称</td>
-                <td colspan="5">
-                    <el-input
-                        type="textarea"
-                        autosize
-                        resize="none"
-                        placeholder="请输入活动名称"
-                        v-model="wordData['activityName']">
-                    </el-input>
-                </td>
-                <td colspan="3">预算经费</td>
-                <td colspan="4">
-                    <el-input
-                        type="textarea"
-                        autosize
-                        resize="none"
-                        placeholder="请输入预算经费"
-                        v-model="total">
-                    </el-input>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="4">项目负责人</td><td colspan="3">
-                    <el-input
-                        type="textarea"
-                        autosize
-                        resize="none"
-                        placeholder="请输入负责人"
-                        v-model="wordData['pro_leader']">
-                    </el-input>
-                </td><td colspan="2">所在部门</td><td colspan="3">
-                    <!-- <el-input
+  <div id="MarkeractivityWord">
+    <div id="title">
+      <div class="school">深圳技师学院</div>
+      <div class="wordTitle">创客专项资金及项目申请表(创客活动)</div>
+      <div class="date">申请日期:{{ wordData.applicationDate }}</div>
+    </div>
+    <table border="1" cellspacing="0" class="table">
+      <tr v-if="this.$route.path == '/newMarkerActivity' ? 1 : 0">
+        <td colspan="4">关联项目</td>
+        <td colspan="12">
+          <el-select
+            v-model="wordData['associatedProjects']"
+            @change="checkProjectMoney()"
+            style="width: 100%"
+            placeholder="请选择关联项目(无关联项目可为空)"
+          >
+            <el-option
+              v-for="item in ProjectData"
+              :key="item.courseId"
+              :label="item.title"
+              :value="item.courseId"
+            >
+            </el-option>
+          </el-select>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4">活动名称</td>
+        <td colspan="5">
+          <el-input
+            type="textarea"
+            autosize
+            resize="none"
+            placeholder="请输入活动名称"
+            v-model="wordData['activityName']"
+          >
+          </el-input>
+        </td>
+        <td colspan="3">预算经费</td>
+        <td colspan="4">
+          <el-input
+            type="textarea"
+            autosize
+            resize="none"
+            placeholder="请输入预算经费"
+            v-model="total"
+          >
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4">项目负责人</td>
+        <td colspan="3">
+          <el-input
+            type="textarea"
+            autosize
+            resize="none"
+            placeholder="请输入负责人"
+            v-model="wordData['pro_leader']"
+          >
+          </el-input>
+        </td>
+        <td colspan="2">所在部门</td>
+        <td colspan="3">
+          <!-- <el-input
                         type="textarea"
                         autosize
                         resize="none"
                         placeholder="请输入所在部门"
                         v-model="wordData['college']">
                     </el-input> -->
-                    <el-select v-model="wordData['college']" style="width: 100%;" placeholder="请选择所在学院">
-                      <el-option
-                        v-for="item in DepartmentData"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id">
-                      </el-option>
-                    </el-select>
-                </td><td colspan="2">联系电话</td><td colspan="3">
-                    <el-input
-                        type="textarea"
-                        autosize
-                        resize="none"
-                        placeholder="请输入联系电话"
-                        v-model="wordData['tel']">
-                    </el-input>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="4">活动时间</td>
-                <td colspan="5">
-                  <el-date-picker
-                    v-model="wordData['activityTime']"
-                    type="daterange"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    range-separator="至"
-                    prefix-icon="none"
-                    start-placeholder="项目起始时间"
-                    end-placeholder="项目完成时间">
-                  </el-date-picker>
-                    <!-- <el-date-picker
+          <el-select
+            v-model="wordData['college']"
+            style="width: 100%"
+            placeholder="请选择所在学院"
+          >
+            <el-option
+              v-for="item in DepartmentData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </td>
+        <td colspan="2">联系电话</td>
+        <td colspan="3">
+          <el-input
+            type="textarea"
+            autosize
+            resize="none"
+            placeholder="请输入联系电话"
+            v-model="wordData['tel']"
+          >
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4">活动时间</td>
+        <td colspan="5">
+          <el-date-picker
+            v-model="wordData['activityTime']"
+            type="daterange"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            range-separator="至"
+            prefix-icon="none"
+            start-placeholder="项目起始时间"
+            end-placeholder="项目完成时间"
+          >
+          </el-date-picker>
+          <!-- <el-date-picker
                         v-model="wordData['']"
                         type="date"
                         placeholder="请选择活动时间"
                         prefix-icon="none"
                         value-format="yyyy-MM-dd HH:mm:ss">
                     </el-date-picker> -->
-                </td>
-                <td colspan="3">参与学生人数</td><td colspan="5">
-                    <el-input
-                        type="number"
-                        autosize
-                        :min="0"
-                        style="width: 100%;"
-                        resize="none"
-                        placeholder="请输入参与学生人数"
-                        v-model="wordData['student']">
-                      </el-input>
-                </td>
-            </tr>
-            
-            <tr>
-                <td colspan="2" :rowspan="wordData['member'].length+1"><p>活</p> <p>动</p> <p>指</p> <p>导</p> <p>老</p> <p>师</p></td><td colspan="2">姓名</td><td colspan="3">工作单位/部门</td><td colspan="9">项目分工</td>
-            </tr>
-            <tr v-for="(item,index) in wordData['member']" :key="index+'b'">
-                <td colspan="2" style="border-left: none;">
-                    <el-input
-                        type="textarea"
-                        autosize
-                        resize="none"
-                        placeholder="请输入姓名"
-                        v-model="item['name']">
-                    </el-input>
-                </td><td colspan="3">
-                    <el-input
-                        type="textarea"
-                        autosize
-                        resize="none"
-                        placeholder="请输入工作单位/部门"
-                        v-model="item['collage']">
-                    </el-input>
-                </td><td colspan="10">
-                    <el-input
-                        type="textarea"
-                        autosize
-                        resize="none"
-                        placeholder="请输入项目分工"
-                        v-model="item['work']">
-                    </el-input>
-                </td>
-                <div class="operate">
-                  <el-button @click="addPerson" v-if="wordData['member'].length-1==index" type="primary" size="mini">添加</el-button>
-                  <el-button @click="DelPerson(index)"  type="primary" size="mini">删除</el-button>
-                </div>
-            </tr>
-            <tr class="textLeft">
-                <td colspan="2"><p>活动</p><br> <p>计划</p></td><td style="text-align: left;" colspan="15">
-                    <el-input
-                      type="textarea"
-                      :rows="12"
-                      style="width: 100%;"
-                      resize="none"
-                      v-model="wordData['activityPlan']">
-                    </el-input>
-                </td>
-            </tr>
-            <tr class="textLeft">
-                <td colspan="2"><p>预期</p><br><p>目标</p> </td><td colspan="15" style="text-align: left;">
-                    <el-input
-                      type="textarea"
-                      :rows="10"
-                      style="width: 100%;"
-                      resize="none"
-                      v-model="wordData['expectations']">
-                    </el-input>
-                </td>
-            </tr>
-            <tr class="textLeft">
-                <td colspan="2"><p>活动受</p><br> <p>众面</p></td><td style="text-align: left;" colspan="15">
-                    <p>参与学生范围:</p>
-                    <el-input
-                      type="textarea"
-                      :rows="12"
-                      style="width: 100%;"
-                      resize="none"
-                      v-model="wordData['eventAudience']">
-                    </el-input>
-                </td>
-            </tr>
-            <!-- <tr class="textLeft">
+        </td>
+        <td colspan="3">参与学生人数</td>
+        <td colspan="5">
+          <el-input
+            type="number"
+            autosize
+            :min="0"
+            style="width: 100%"
+            resize="none"
+            placeholder="请输入参与学生人数"
+            v-model="wordData['student']"
+          >
+          </el-input>
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="2" :rowspan="wordData['member'].length + 1">
+          <p>活</p>
+          <p>动</p>
+          <p>指</p>
+          <p>导</p>
+          <p>老</p>
+          <p>师</p>
+        </td>
+        <td colspan="2">姓名</td>
+        <td colspan="3">工作单位/部门</td>
+        <td colspan="9">项目分工</td>
+      </tr>
+      <tr v-for="(item, index) in wordData['member']" :key="index + 'b'">
+        <td colspan="2" style="border-left: none">
+          <el-input
+            type="textarea"
+            autosize
+            resize="none"
+            placeholder="请输入姓名"
+            v-model="item['name']"
+          >
+          </el-input>
+        </td>
+        <td colspan="3">
+          <el-input
+            type="textarea"
+            autosize
+            resize="none"
+            placeholder="请输入工作单位/部门"
+            v-model="item['collage']"
+          >
+          </el-input>
+        </td>
+        <td colspan="10">
+          <el-input
+            type="textarea"
+            autosize
+            resize="none"
+            placeholder="请输入项目分工"
+            v-model="item['work']"
+          >
+          </el-input>
+        </td>
+        <div class="operate">
+          <el-button
+            @click="addPerson"
+            v-if="wordData['member'].length - 1 == index"
+            type="primary"
+            size="mini"
+            >添加</el-button
+          >
+          <el-button @click="DelPerson(index)" type="primary" size="mini"
+            >删除</el-button
+          >
+        </div>
+      </tr>
+      <tr class="textLeft">
+        <td colspan="2">
+          <p>活动</p>
+          <br />
+          <p>计划</p>
+        </td>
+        <td style="text-align: left" colspan="15">
+          <el-input
+            type="textarea"
+            :rows="12"
+            style="width: 100%"
+            resize="none"
+            v-model="wordData['activityPlan']"
+          >
+          </el-input>
+        </td>
+      </tr>
+      <tr class="textLeft">
+        <td colspan="2">
+          <p>预期</p>
+          <br />
+          <p>目标</p>
+        </td>
+        <td colspan="15" style="text-align: left">
+          <el-input
+            type="textarea"
+            :rows="10"
+            style="width: 100%"
+            resize="none"
+            v-model="wordData['expectations']"
+          >
+          </el-input>
+        </td>
+      </tr>
+      <tr class="textLeft">
+        <td colspan="2">
+          <p>活动受</p>
+          <br />
+          <p>众面</p>
+        </td>
+        <td style="text-align: left" colspan="15">
+          <p>参与学生范围:</p>
+          <el-input
+            type="textarea"
+            :rows="12"
+            style="width: 100%"
+            resize="none"
+            v-model="wordData['eventAudience']"
+          >
+          </el-input>
+        </td>
+      </tr>
+      <!-- <tr class="textLeft">
                 <td colspan="15" style="text-align: left;border-left: none;">
                   <p>二、创新点</p>
                     <el-input
@@ -190,157 +254,204 @@
                 </td>
             </tr> -->
 
-           
-            <tr class="textLeft">
-                <td colspan="2"><p>经费</p><br><p>支出</p> <br><p>计划</p></td><td colspan="15" style="text-align: left;">
-                    <el-input
-                      type="textarea"
-                      :rows="10"
-                      style="width: 100%;"
-                      resize="none"
-                      v-model="wordData['fundingPlan']">
-                    </el-input>
-                </td>
-            </tr>
-            <tr>
-                <td rowspan="14"><p>预</p> <p>算</p> <p>经</p> <p>费</p></td>
-            </tr>
-            <tr>
-                <td rowspan="4" style="border-left: none;">总经费</td><td rowspan="4" colspan="2" >{{total}}元</td>
-            </tr>
-            <tr>
-                <td colspan="12" style="border-left: none;">经费月支出计划 (元)</td>
-            </tr>
-            <tr>
-              <td style="border-left: none;">第1个月</td><td>第2个月</td><td>第3个月</td><td>第4个月</td><td>第5个月</td><td>第6个月</td><td>第7个月</td><td>第8个月</td><td>第9个月</td><td>第10个月</td><td>第11个月</td><td>第12个月</td>
-            </tr>
-            <tr>
-                <td v-for="(item,index) in wordData['expenditureMothPlan']" :key="index" style="border-left: none;">
-                  <el-input
-                    type="number"
-                    autosize
-                    min="0"
-                    style="width: 100%;"
-                    resize="none"
-                    v-model.number="wordData['expenditureMothPlan'][index]"
-                    @input="checkExpenditureMothPlan(index)">
-                  </el-input>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="4" style="border-left: none;">支出类别</td><td colspan="4">支出项目</td><td colspan="2">金额(元)</td><td colspan="5">备注</td>
-            </tr>
-            <tr>
-              <td rowspan="4" colspan="4" style="border-left: none;">直接经费</td>
-              <td colspan="4">小型仪器设备费</td>
-              <td colspan="2">
-                <el-input
-                      type="number"
-                      autosize
-                      resize="none"
-                      placeholder="小型仪器设备费"
-                      v-model.number="wordData['fund']['device']"
-                      @change="checkProjectFund(device)"
-                      ></el-input>
-              </td>
-              <td colspan="5">
-                项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。
-              </td>
-            </tr>
-            <tr>
-              <td colspan="4" style="border-left: none;">材料费</td>
-              <td colspan="2">
-                <el-input
-                      type="number"
-                      autosize
-                      resize="none"
-                      placeholder="材料费"
-                      v-model.number="wordData['fund']['Material']"
-                      @change="checkProjectFund('Material')"></el-input>
-              </td>
-              <td colspan="5">项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。</td>
-            </tr>
-            <tr>
-              <td colspan="4" style="border-left: none;">测试化验加工费</td>
-              <td colspan="2">
-                <el-input
-                      type="number"
-                      autosize
-                      resize="none"
-                      placeholder="测试化验加工费"
-                      @change="checkProjectFund('processing')"
-                      v-model.number="wordData['fund']['processing']"></el-input>
-              </td>
-              <td colspan="5">项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。</td>
-            </tr>
-            <tr>
-              <td colspan="4" style="border-left: none;">项目协作费</td>
-              <td colspan="2">
-                <el-input
-                      type="number"
-                      autosize
-                      resize="none"
-                      placeholder="项目协作费"
-                      @change="checkProjectFund('Collaboration')"
-                      v-model.number="wordData['fund']['Collaboration']"></el-input>
-              </td>
-              <td colspan="5">按合同规定支付给协作单位的费用</td>
-            </tr>
-            <tr>
-              <td rowspan="4" colspan="4" style="border-left: none;">间接经费</td>
-              <td colspan="4">项目成果鉴定费</td>
-              <td colspan="2">
-                <el-input
-                      type="number"
-                      autosize
-                      resize="none"
-                      placeholder="项目成果鉴定费"
-                      @change="checkProjectFund('APPRAISAL')"
-                      v-model.number="wordData['fund']['APPRAISAL']"></el-input>
-              </td>
-              <td colspan="5">学术会务费、评审费、鉴定费、成果集制作费等费用。</td>
-            </tr>
-            <tr>
-              <td colspan="4" style="border-left: none;">参展参赛费</td>
-              <td colspan="2">
-                <el-input
-                      type="number"
-                      autosize
-                      resize="none"
-                      placeholder="参展参赛费"
-                      @change="checkProjectFund('entery')"
-                      v-model.number="wordData['fund']['entery']"></el-input>
-              </td>
-              <td colspan="5">参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。</td>
-            </tr>
-            <tr>
-              <td colspan="4" style="border-left: none;">创客交流活动费</td>
-              <td colspan="2">
-                <el-input
-                      type="number"
-                      autosize
-                      resize="none"
-                      placeholder="创客交流活动费"
-                      @change="checkProjectFund('activities')"
-                      v-model.number="wordData['fund']['activities']"></el-input>
-              </td>
-              <td colspan="5">创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</td>
-            </tr>
-            <tr>
-              <td colspan="4" style="border-left: none;">知识产权事务费</td>
-              <td colspan="2">
-                <el-input
-                      type="number"
-                      autosize
-                      resize="none"
-                      placeholder="知识产权事务费"
-                      @change="checkProjectFund('Transaction')"
-                      v-model.number="wordData['fund']['Transaction']">
-                    </el-input>
-              </td>
-              <td colspan="5">论文版面费、专利及其他知识产权事务等费用。</td>
-            </tr>
-            <!-- <tr v-for="(item,index) in wordData.member" :key="index">
+      <tr class="textLeft">
+        <td colspan="2">
+          <p>经费</p>
+          <br />
+          <p>支出</p>
+          <br />
+          <p>计划</p>
+        </td>
+        <td colspan="15" style="text-align: left">
+          <el-input
+            type="textarea"
+            :rows="10"
+            style="width: 100%"
+            resize="none"
+            v-model="wordData['fundingPlan']"
+          >
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="14">
+          <p>预</p>
+          <p>算</p>
+          <p>经</p>
+          <p>费</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="4" style="border-left: none">总经费</td>
+        <td rowspan="4" colspan="2">{{ total }}元</td>
+      </tr>
+      <tr>
+        <td colspan="12" style="border-left: none">经费月支出计划 (元)</td>
+      </tr>
+      <tr>
+        <td style="border-left: none">第1个月</td>
+        <td>第2个月</td>
+        <td>第3个月</td>
+        <td>第4个月</td>
+        <td>第5个月</td>
+        <td>第6个月</td>
+        <td>第7个月</td>
+        <td>第8个月</td>
+        <td>第9个月</td>
+        <td>第10个月</td>
+        <td>第11个月</td>
+        <td>第12个月</td>
+      </tr>
+      <tr>
+        <td
+          v-for="(item, index) in wordData['expenditureMothPlan']"
+          :key="index"
+          style="border-left: none"
+        >
+          <el-input
+            type="number"
+            autosize
+            min="0"
+            style="width: 100%"
+            resize="none"
+            v-model.number="wordData['expenditureMothPlan'][index]"
+            @input="checkExpenditureMothPlan(index)"
+          >
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4" style="border-left: none">支出类别</td>
+        <td colspan="4">支出项目</td>
+        <td colspan="2">金额(元)</td>
+        <td colspan="5">备注</td>
+      </tr>
+      <tr>
+        <td rowspan="4" colspan="4" style="border-left: none">直接经费</td>
+        <td colspan="4">小型仪器设备费</td>
+        <td colspan="2">
+          <el-input
+            type="number"
+            autosize
+            resize="none"
+            placeholder="小型仪器设备费"
+            v-model.number="wordData['fund']['device']"
+            @change="checkProjectFund(device)"
+          ></el-input>
+        </td>
+        <td colspan="5">
+          项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4" style="border-left: none">材料费</td>
+        <td colspan="2">
+          <el-input
+            type="number"
+            autosize
+            resize="none"
+            placeholder="材料费"
+            v-model.number="wordData['fund']['Material']"
+            @change="checkProjectFund('Material')"
+          ></el-input>
+        </td>
+        <td colspan="5">
+          项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4" style="border-left: none">测试化验加工费</td>
+        <td colspan="2">
+          <el-input
+            type="number"
+            autosize
+            resize="none"
+            placeholder="测试化验加工费"
+            @change="checkProjectFund('processing')"
+            v-model.number="wordData['fund']['processing']"
+          ></el-input>
+        </td>
+        <td colspan="5">
+          项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4" style="border-left: none">项目协作费</td>
+        <td colspan="2">
+          <el-input
+            type="number"
+            autosize
+            resize="none"
+            placeholder="项目协作费"
+            @change="checkProjectFund('Collaboration')"
+            v-model.number="wordData['fund']['Collaboration']"
+          ></el-input>
+        </td>
+        <td colspan="5">按合同规定支付给协作单位的费用</td>
+      </tr>
+      <tr>
+        <td rowspan="4" colspan="4" style="border-left: none">间接经费</td>
+        <td colspan="4">项目成果鉴定费</td>
+        <td colspan="2">
+          <el-input
+            type="number"
+            autosize
+            resize="none"
+            placeholder="项目成果鉴定费"
+            @change="checkProjectFund('APPRAISAL')"
+            v-model.number="wordData['fund']['APPRAISAL']"
+          ></el-input>
+        </td>
+        <td colspan="5">学术会务费、评审费、鉴定费、成果集制作费等费用。</td>
+      </tr>
+      <tr>
+        <td colspan="4" style="border-left: none">参展参赛费</td>
+        <td colspan="2">
+          <el-input
+            type="number"
+            autosize
+            resize="none"
+            placeholder="参展参赛费"
+            @change="checkProjectFund('entery')"
+            v-model.number="wordData['fund']['entery']"
+          ></el-input>
+        </td>
+        <td colspan="5">
+          参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4" style="border-left: none">创客交流活动费</td>
+        <td colspan="2">
+          <el-input
+            type="number"
+            autosize
+            resize="none"
+            placeholder="创客交流活动费"
+            @change="checkProjectFund('activities')"
+            v-model.number="wordData['fund']['activities']"
+          ></el-input>
+        </td>
+        <td colspan="5">
+          创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。
+        </td>
+      </tr>
+      <tr>
+        <td colspan="4" style="border-left: none">知识产权事务费</td>
+        <td colspan="2">
+          <el-input
+            type="number"
+            autosize
+            resize="none"
+            placeholder="知识产权事务费"
+            @change="checkProjectFund('Transaction')"
+            v-model.number="wordData['fund']['Transaction']"
+          >
+          </el-input>
+        </td>
+        <td colspan="5">论文版面费、专利及其他知识产权事务等费用。</td>
+      </tr>
+      <!-- <tr v-for="(item,index) in wordData.member" :key="index">
                 <td colspan="4" style="border-left: none;">
                   <el-input
                         type="textarea"
@@ -377,21 +488,35 @@
                     </td>
             </tr> -->
 
-
-            <tr class="textLeft">
-                <td><p>所在部</p> <p>门意见</p></td><td colspan="15" style="height: 200px;">
-                  <!-- <el-input
+      <tr class="textLeft">
+        <td>
+          <p>所在部</p>
+          <p>门意见</p>
+        </td>
+        <td colspan="15" style="height: 200px">
+          <!-- <el-input
                       type="textarea"
                       :rows="10"
                       style="width: 100%;"
                       resize="none"
                       v-model="input">
                     </el-input> -->
-                    <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章:</div>
-                    <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
-                </td>
-            </tr>
-            <!-- <tr>
+          <div
+            style="
+              text-align: right;
+              font-size: 18px;
+              width: 80%;
+              margin-bottom: 20px;
+            "
+          >
+            负责人签章:
+          </div>
+          <div style="text-align: right; font-size: 18px; width: 90%">
+            年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日
+          </div>
+        </td>
+      </tr>
+      <!-- <tr>
                 <td><p>主管部</p> <p>门审核</p><p>意见</p></td><td colspan="15">
                   <el-input
                       type="textarea"
@@ -404,491 +529,523 @@
                     <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
                 </td>
             </tr> -->
-            <tr>
-                <td v-for="(item,index) in 16" :key="index+'c'" style="border: none;"></td>
-            </tr>
-        </table>
-          <div class="notes">
-            <span>备注:</span>
-            <span>如表格不够可顺延或另附页。</span>
-            <div style="width: 300px;margin: 20px auto;display: flex;justify-content: space-between;">
-                <el-button @click="applyButton" style="width: 120px;margin: 20px auto;"  type="primary">提交项目</el-button>
-                <el-button style="width: 120px;margin: 20px auto;" type="primary">下载表单</el-button>
-            </div>
-          </div>
+      <tr>
+        <td
+          v-for="(item, index) in 16"
+          :key="index + 'c'"
+          style="border: none"
+        ></td>
+      </tr>
+    </table>
+    <div class="notes">
+      <span>备注:</span>
+      <span>如表格不够可顺延或另附页。</span>
+      <div
+        style="
+          width: 300px;
+          margin: 20px auto;
+          display: flex;
+          justify-content: space-between;
+        "
+      >
+        <el-button
+          @click="applyButton"
+          style="width: 120px; margin: 20px auto"
+          type="primary"
+          >提交项目</el-button
+        >
+        <el-button style="width: 120px; margin: 20px auto" type="primary"
+          >下载表单</el-button
+        >
+      </div>
     </div>
-    </template>
+  </div>
+</template>
       
     <script>
-    import {getNowDate} from '@/components/tool/Date.js'
-    
-      export default {
-        // props:['data'],
-        data() {
-          return {
-            // teacher:[],
-            // student:[],
-            allFund:2000,
-            DepartmentData:[],
-            ProjectData:[],
-            wordData:{
-              applicationDate:getNowDate(1),//申请日期
-              associatedProjects:"",//关联项目
-              activityName:'',//项目名称
-              // money:"",//预算经费
-              pro_leader:"",//活动负责人
-              college: '',//所在学院
-              tel:'',//联系电话
-              activityTime:"",//活动时间
-              student:0,//参与学生人数
-              member:[
-                {name:"",collage:"",work:""},
-                {name:"",collage:"",work:""},
-                {name:"",collage:"",work:""},
-              ],
-              activityPlan:"",//活动计划
-              expectations:"",//预期目标
-              eventAudience:"",//活动受众面
-              fundingPlan:"",//经费支出计划
-              expenditureMothPlan:['','','','','','','','','','','',''],
-              fund:{
-                total:0,
-                device:"",
-                Material:"",
-                processing:"",
-                Collaboration:"",
-                APPRAISAL:"",
-                entery:"",
-                activities:"",
-                Transaction:"",
-              },//预算经费
+import { getNowDate } from "@/components/tool/Date.js";
+
+export default {
+  // props:['data'],
+  data() {
+    return {
+      // teacher:[],
+      // student:[],
+      allFund: 2000,
+      DepartmentData: [],
+      ProjectData: [],
+      wordData: {
+        applicationDate: getNowDate(1), //申请日期
+        associatedProjects: "", //关联项目
+        activityName: "", //项目名称
+        // money:"",//预算经费
+        pro_leader: "", //活动负责人
+        college: "", //所在学院
+        tel: "", //联系电话
+        activityTime: "", //活动时间
+        student: 0, //参与学生人数
+        member: [
+          { name: "", collage: "", work: "" },
+          { name: "", collage: "", work: "" },
+          { name: "", collage: "", work: "" },
+        ],
+        activityPlan: "", //活动计划
+        expectations: "", //预期目标
+        eventAudience: "", //活动受众面
+        fundingPlan: "", //经费支出计划
+        expenditureMothPlan: ["", "", "", "", "", "", "", "", "", "", "", ""],
+        fund: {
+          total: 0,
+          device: "",
+          Material: "",
+          processing: "",
+          Collaboration: "",
+          APPRAISAL: "",
+          entery: "",
+          activities: "",
+          Transaction: "",
+        }, //预算经费
+      },
+      //total:总经费
+      //小型仪器设备费:device        deviceRemarks
+      //材料费:Material             MaterialRemarks
+      //测试化验加工费:processing    processingRemarks
+      //项目协作费:Collaboration     CollaborationRemarks
+      //项目成果鉴定费:APPRAISAL     APPRAISALRemarks
+      //参展参赛费:entery            enteryRemarks
+      //创客交流活动费:activities    activitiesRemarks
+      //知识产权事务费:Transaction   TransactionRemarks
+    };
+  },
+  methods: {
+    getText(value) {
+      //电话验证
+      let verify =
+        /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
+      let result = verify.test(value.trim()); //判断输入框内容是否符合 正则表达式
+      if (!result) return this.$message.error("请输入正确联系号码格式");
+    },
+    addPerson() {
+      //添加学生
+      this.wordData["member"].push({ name: "", collage: "", work: "" });
+    },
+    DelPerson(index) {
+      //删除学生
+      this.wordData["member"].splice(index, 1);
+    },
+    getProjectDepartmentData() {
+      //获取项目立项申请基础信息页面所在部门数据
+      this.ajax
+        .post(this.$store.state.api + "/SelectAllDepartment", {
+          uid: this.$store.state.userInfo.userid,
+        })
+        .then(
+          (res) => {
+            this.DepartmentData = res.data[0];
+          },
+          (err) => {
+            console.log(err);
+          }
+        );
+    },
+    getProjectData() {
+      //获取未完结的项目
+      this.ajax
+        .get(this.$store.state.api + "/GetAllProjectName", {
+          uid: this.$store.state.userInfo.userid,
+        })
+        .then((res) => {
+          this.ProjectData = res.data[0].filter(
+            (item) => item.isupload != 3 && item.isupload != 4
+          );
+        })
+        .catch((err) => {
+          this.$message.error(err.message);
+        });
+    },
+    checkProjectFund(index) {
+      if (this.wordData["associatedProjects"] == "") {
+        for (let i in this.wordData["fund"]) this.wordData["fund"][i] = "";
+        return this.$message.error("请先选择关联项目");
+      }
+      if (this.total > this.allFund) {
+        this.wordData["fund"][index] = 0;
+        return this.$message.error("活动总经费不能超过项目剩余总预算");
+      }
+    },
+    applyButton() {
+      const cEmpty = /^\s*$/g;
+      const checkPhone =
+        /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
+      for (let i in this.wordData) {
+        switch (i) {
+          case "associatedProjects":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请选择关联项目");
+              return false;
             }
-            //total:总经费     
-            //小型仪器设备费:device        deviceRemarks
-            //材料费:Material             MaterialRemarks
-            //测试化验加工费:processing    processingRemarks
-            //项目协作费:Collaboration     CollaborationRemarks
-            //项目成果鉴定费:APPRAISAL     APPRAISALRemarks
-            //参展参赛费:entery            enteryRemarks
-            //创客交流活动费:activities    activitiesRemarks
-            //知识产权事务费:Transaction   TransactionRemarks
+            break;
+          case "activityName":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请输入活动名称");
+              return false;
             }
-        },
-        methods: {
-          getText(value) {     //电话验证
-              let verify = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
-              let result = verify.test(value.trim()); //判断输入框内容是否符合 正则表达式
-              if(!result) return this.$message.error('请输入正确联系号码格式')
-          },
-          addPerson(){   //添加学生
-            this.wordData['member'].push({name:"",collage:"",work:""});
-          },
-          DelPerson(index){   //删除学生
-            this.wordData['member'].splice(index,1)
-          },
-          getProjectDepartmentData(){  //获取项目立项申请基础信息页面所在部门数据
-            this.ajax.post(this.$store.state.api+'/SelectAllDepartment',{
-              uid:this.$store.state.userInfo.userid
-            }).then(res=>{
-              this.DepartmentData = res.data[0]
-            },err=>{
-              console.log(err);
-            })
-          },
-          getProjectData(){//获取未完结的项目
-            this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
-                uid:this.$store.state.userInfo.userid,
-            }).then(res=>{
-                this.ProjectData = res.data[0].filter(item=>item.isupload!=3 && item.isupload!=4 );
-            }).catch(err=>{
-                this.$message.error(err.message)
-            })
-          },
-          checkProjectFund(index){
-            if(this.wordData['associatedProjects']==''){
-              for(let i in this.wordData['fund'])this.wordData['fund'][i]='';
-              return this.$message.error("请先选择关联项目");
+            break;
+          case "pro_leader":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请输入活动负责人");
+              return false;
             }
-            if(this.total>this.allFund){
-              this.wordData['fund'][index]=0;
-              return this.$message.error("活动总经费不能超过项目剩余总预算")
+            break;
+          case "college":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请选择所在学院");
+              return false;
+            } else if (!checkPhone.test(this.wordData[i])) {
+              this.$message.error("请输入正确的手机号");
+              return false;
             }
-          },
-          applyButton(){
-            const cEmpty = /^\s*$/g;
-            const checkPhone = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
-            for(let i in this.wordData){
-              switch(i){
-                case "associatedProjects":
-                  if(cEmpty.test(this.wordData[i])){
-                    this.$message.error("请选择关联项目")
-                    return false;
-                  }
-                  break;
-                case "activityName":
-                  if(cEmpty.test(this.wordData[i])){
-                    this.$message.error("请输入活动名称")
-                    return false;
-                  }
-                  break;
-                case "pro_leader":
-                  if(cEmpty.test(this.wordData[i])){
-                    this.$message.error("请输入活动负责人")
-                    return false;
-                  }
-                  break;
-                case "college":
-                  if(cEmpty.test(this.wordData[i])){
-                    this.$message.error("请选择所在学院")
-                    return false;;
-                  }else if(!checkPhone.test(this.wordData[i])){
-                    this.$message.error("请输入正确的手机号");
-                    return false;
-                  }
-                  break;
-                case "tel":
-                  if(cEmpty.test(this.wordData[i])){
-                    this.$message.error("请输入联系电话")
-                    return false;
-                  }
-                  break;
-                case "activityTime":
-                  if(cEmpty.test(this.wordData[i][0])){
-                    this.$message.error("请选择活动时间")
-                    return false;;
-                  }
-                  break;
-                case "member":
-                    let num = 0;
-                    this.wordData[i].forEach(item=>{
-                      for(let j in item){
-                        if(cEmpty.test(item[j])){
-                          num++;
-                        }
-                      }
-                    
-                    })
-                    if(num>0){
-                      this.$message.error("请填完指导老师信息");
-                      // document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
-                      return false;
-                    }
-                  break;
-                case "activityPlan":
-                  if(cEmpty.test(this.wordData[i][0])){
-                    this.$message.error("请输入活动计划");
-                    return false;
-                  }
-                  break;
-                case "expectations":
-                  if(cEmpty.test(this.wordData[i][0])){
-                    this.$message.error("预期目标");
-                    return false;
-                  }
-                  break;
-                case "eventAudience":
-                  if(cEmpty.test(this.wordData[i][0])){
-                    this.$message.error("活动受众面")
-                    return false;
-                  }
-                  break;
-                case "fundingPlan":
-                  if(cEmpty.test(this.wordData[i][0])){
-                    this.$message.error("经费支出计划")
-                    return false;
-                  }
-                  break;
-
-
-              }
+            break;
+          case "tel":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请输入联系电话");
+              return false;
             }
-            this.$message.success("验证成功")
-          },
-          // submitWord(){
-          //   const cEmpty = /^\s*$/g;
-          //   for (let i in this.wordData){
-          //     // console.log(this.wordData[i],i);
-          //     switch(i){
-          //       case 'projectName':
-          //           if (cEmpty.test(this.wordData[i])) {
-          //             this.$message.error('请输入项目名称')
-          //             // this.$refs.projectName.style.background='rgb(236, 141, 141)'
-          //             // setTimeout(() => {
-          //             //   this.$refs.projectName.style.background='#ffffff'
-          //             // }, 2000);
-          //             document.querySelector('#projectName').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //         break;
-          //       case 'radio':
-          //           if (cEmpty.test(this.wordData[i])) {
-          //             this.$message.error('请选择项目分组')
-          //             document.querySelector('#radio').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //         break;
-          //       case 'checkList':
-          //           if (this.wordData[i].length==0) {
-          //             this.$message.error('优先支持项目')
-          //             document.querySelector('#checkList').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //       break;
-          //       case 'schoolRadio':
-          //           if (cEmpty.test(this.wordData[i])) {
-          //             this.$message.error('请选择美丽校园改造项目')
-          //             document.querySelector('#schoolRadio').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //       break;
-          //       case 'applyParsonRadio':
-          //           if (cEmpty.test(this.wordData[i])) {
-          //             this.$message.error('请选择项目申请人')
-          //             document.querySelector('#applyParsonRadio').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //       break;
-          //       case 'applyParsonName':
-          //           if (cEmpty.test(this.wordData[i])) {
-          //             this.$message.error('请填写申请人姓名')
-          //             document.querySelector('#applyParsonName').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //       break;
-          //       case 'college':
-          //           if (cEmpty.test(this.wordData[i])) {
-          //             this.$message.error('请选择所在学院')
-          //             document.querySelector('#applyParsonName').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //       break;
-          //       case 'tel':
-          //           if (cEmpty.test(this.wordData[i])) {
-          //             this.$message.error('请填写联系方式')
-          //             document.querySelector('#applyParsonName').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //       break;
-          //       case 'beginTime':
-          //           if (cEmpty.test(this.wordData[i])) {
-          //             this.$message.error('请选择项目起始时间')
-          //             document.querySelector('#beginTime').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //       break;
-          //       case 'endTime':
-          //           if (cEmpty.test(this.wordData[i])) {
-          //             this.$message.error('请选择计划完成时间')
-          //             document.querySelector('#beginTime').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //       break;
-          //       case 'studentS':
-          //           // if(this.wordData[i].length<5){
-          //           //   this.$message.error('学生团队应5人以上')
-          //           //   document.querySelector('#studentS').scrollIntoView({ behavior: "smooth" });
-          //           //   return false;
-          //           // }else{
-          //             let snum = 0;
-          //             this.wordData[i].forEach(item=>{
-          //               for(let j in item){
-          //                 if(cEmpty.test(item[j])){
-          //                   snum++;
-          //                 }
-          //               }
-          //             })
-          //             if(snum>0){
-          //               this.$message.error("请填完学生信息");
-          //               document.querySelector('#studentS').scrollIntoView({ behavior: "smooth" });
-          //               return false;
-          //             }
-          //           // }
-          //       break;
-          //       case 'teacherS':
-          //             let num = 0;
-          //             this.wordData[i].forEach(item=>{
-          //               for(let j in item){
-          //                 if(cEmpty.test(item[j])){
-          //                   num++;
-          //                 }
-          //               }
-          //             })
-          //             if(num>0){
-          //               this.$message.error("请填完老师信息");
-          //               document.querySelector('#teacherS').scrollIntoView({ behavior: "smooth" });
-          //               return false;
-          //             }
-          //       break;
-          //       case 'brief':
-          //           if (cEmpty.test(this.wordData[i])) {
-          //             this.$message.error('请填写项目简介')
-          //             // this.$refs.brief.style.background='rgb(236, 141, 141)'
-          //             // setTimeout(() => {
-          //             //   this.$refs.brief.style.background='#ffffff'
-          //             // }, 2000);
-          //             document.querySelector('#brief').scrollIntoView({ behavior: "smooth" });
-          //             return false
-          //           }
-          //       break;
-          //       case 'fund':
-          //           let mon=this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.input*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1
-          //           if(mon==0){
-          //             document.querySelector('#fund').scrollIntoView({ behavior: "smooth" });
-          //             return this.$message.error('请输入经费')
-          //           }
-          //       break;
-          //     }
-          //   }
-          // //   let param={
-          // //     projectName
-          // //   }
-          // //   this.ajax
-          // //     .post(this.$store.state.api+'/SelectAllType',param)
-          // //     .then(err,res)
-          // },
-          checkExpenditureMothPlan(index){
-            let count = 0;
-            this.wordData['expenditureMothPlan'].forEach(item=>count+=Number(item))
-            if(count>this.total){
-              this.$message.error("总经费月支出计划不能大于总经费");
-              this.wordData['expenditureMothPlan'][index]=0;
+            break;
+          case "activityTime":
+            if (cEmpty.test(this.wordData[i][0])) {
+              this.$message.error("请选择活动时间");
+              return false;
             }
-          },
-          checkProjectMoney(){
-            this.$message.info("切换项目")
-          }
-          
-        },
-        computed:{   //经费总合
-          total() {
+            break;
+          case "member":
             let num = 0;
-            for(let i in this.wordData['fund'])num += Number(this.wordData['fund'][i]);
-            return num;
-            // return (this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.input*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1)/10000
-          }
-        },
-        mounted(){
-          this.getProjectDepartmentData();
-          this.getProjectData();
-          console.log(this.$route.path);
-        }
-      };
-    </script>
-      
-    <style lang="less" scoped>
-
-    
-    #MarkeractivityWord{
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        background-color: #ffff;
-        margin: 0;
-        padding:100px;
-        box-sizing:border-box;
-        #title{
-            width: 100%;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            position: relative;
-            // margin-top: 40px;
-            .school{
-                font-size: 2.5em;
-                font-weight: 500;
-                letter-spacing: 20px;
+            this.wordData[i].forEach((item) => {
+              for (let j in item) {
+                if (cEmpty.test(item[j])) {
+                  num++;
+                }
+              }
+            });
+            if (num > 0) {
+              this.$message.error("请填完指导老师信息");
+              // document.querySelector('#five').scrollIntoView({ behavior: "smooth" });
+              return false;
             }
-            .wordTitle{
-                font-size: 2em;
-                letter-spacing: .15em;
-                margin-bottom:40px ;
+            break;
+          case "activityPlan":
+            if (cEmpty.test(this.wordData[i][0])) {
+              this.$message.error("请输入活动计划");
+              return false;
             }
-            .date{
-    
-                font-size: 1em;
-                position: absolute;
-                bottom: 0;
-                right: 100px;
-                font-weight: bold;
+            break;
+          case "expectations":
+            if (cEmpty.test(this.wordData[i][0])) {
+              this.$message.error("预期目标");
+              return false;
             }
-        }
-        .table{
-            border: none;
-            border-top: solid 1px black;
-           
-            tr{
-              position: relative;
-            td{
-              border: none;
-              border-bottom: solid 1px black;
-              border-right: solid 1px black;
-              height: 50px;
-              text-align: center;
-              line-height: 30px;
-              width: 80px;
-              &:nth-child(1){
-                border-left:  solid 1px black;
-              }
-              p{
-                font-weight: 600;
-              }
-              :deep(.el-select .el-input .el-select__caret){
-                display: none;
-              }
-              :deep(.el-textarea__inner){
-                // padding: 0;
-                border: none ;
-                border-radius: 0px;
-                text-align: center;
-                font-size: 16px;
-              }
-              :deep(.el-input__inner){
-                border: none ;
-                &::-webkit-outer-spin-button,&::-webkit-inner-spin-button{
-                  -webkit-appearance: none !important;
-                }
-                &[type='number'] {
-                  -moz-appearance: textfield;
-                }
-                
-                border-radius: 0px;
-                text-align: center;
-                font-size: 16px;
-              }
-
+            break;
+          case "eventAudience":
+            if (cEmpty.test(this.wordData[i][0])) {
+              this.$message.error("活动受众面");
+              return false;
             }
-          }
-            .textLeft{
-              :deep(.el-textarea__inner){
-                // padding: 0;
-                border: none ;
-                border-radius: 0px;
-                text-align: left !important;
-                font-size: 16px;
-              }
+            break;
+          case "fundingPlan":
+            if (cEmpty.test(this.wordData[i][0])) {
+              this.$message.error("经费支出计划");
+              return false;
             }
-          }
-        .notes{
-          width: 100%;
-          display: flex;
-          flex-direction:column;
+            break;
         }
+      }
+      this.$message.success("验证成功");
+    },
+    // submitWord(){
+    //   const cEmpty = /^\s*$/g;
+    //   for (let i in this.wordData){
+    //     // console.log(this.wordData[i],i);
+    //     switch(i){
+    //       case 'projectName':
+    //           if (cEmpty.test(this.wordData[i])) {
+    //             this.$message.error('请输入项目名称')
+    //             // this.$refs.projectName.style.background='rgb(236, 141, 141)'
+    //             // setTimeout(() => {
+    //             //   this.$refs.projectName.style.background='#ffffff'
+    //             // }, 2000);
+    //             document.querySelector('#projectName').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //         break;
+    //       case 'radio':
+    //           if (cEmpty.test(this.wordData[i])) {
+    //             this.$message.error('请选择项目分组')
+    //             document.querySelector('#radio').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //         break;
+    //       case 'checkList':
+    //           if (this.wordData[i].length==0) {
+    //             this.$message.error('优先支持项目')
+    //             document.querySelector('#checkList').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //       break;
+    //       case 'schoolRadio':
+    //           if (cEmpty.test(this.wordData[i])) {
+    //             this.$message.error('请选择美丽校园改造项目')
+    //             document.querySelector('#schoolRadio').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //       break;
+    //       case 'applyParsonRadio':
+    //           if (cEmpty.test(this.wordData[i])) {
+    //             this.$message.error('请选择项目申请人')
+    //             document.querySelector('#applyParsonRadio').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //       break;
+    //       case 'applyParsonName':
+    //           if (cEmpty.test(this.wordData[i])) {
+    //             this.$message.error('请填写申请人姓名')
+    //             document.querySelector('#applyParsonName').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //       break;
+    //       case 'college':
+    //           if (cEmpty.test(this.wordData[i])) {
+    //             this.$message.error('请选择所在学院')
+    //             document.querySelector('#applyParsonName').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //       break;
+    //       case 'tel':
+    //           if (cEmpty.test(this.wordData[i])) {
+    //             this.$message.error('请填写联系方式')
+    //             document.querySelector('#applyParsonName').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //       break;
+    //       case 'beginTime':
+    //           if (cEmpty.test(this.wordData[i])) {
+    //             this.$message.error('请选择项目起始时间')
+    //             document.querySelector('#beginTime').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //       break;
+    //       case 'endTime':
+    //           if (cEmpty.test(this.wordData[i])) {
+    //             this.$message.error('请选择计划完成时间')
+    //             document.querySelector('#beginTime').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //       break;
+    //       case 'studentS':
+    //           // if(this.wordData[i].length<5){
+    //           //   this.$message.error('学生团队应5人以上')
+    //           //   document.querySelector('#studentS').scrollIntoView({ behavior: "smooth" });
+    //           //   return false;
+    //           // }else{
+    //             let snum = 0;
+    //             this.wordData[i].forEach(item=>{
+    //               for(let j in item){
+    //                 if(cEmpty.test(item[j])){
+    //                   snum++;
+    //                 }
+    //               }
+    //             })
+    //             if(snum>0){
+    //               this.$message.error("请填完学生信息");
+    //               document.querySelector('#studentS').scrollIntoView({ behavior: "smooth" });
+    //               return false;
+    //             }
+    //           // }
+    //       break;
+    //       case 'teacherS':
+    //             let num = 0;
+    //             this.wordData[i].forEach(item=>{
+    //               for(let j in item){
+    //                 if(cEmpty.test(item[j])){
+    //                   num++;
+    //                 }
+    //               }
+    //             })
+    //             if(num>0){
+    //               this.$message.error("请填完老师信息");
+    //               document.querySelector('#teacherS').scrollIntoView({ behavior: "smooth" });
+    //               return false;
+    //             }
+    //       break;
+    //       case 'brief':
+    //           if (cEmpty.test(this.wordData[i])) {
+    //             this.$message.error('请填写项目简介')
+    //             // this.$refs.brief.style.background='rgb(236, 141, 141)'
+    //             // setTimeout(() => {
+    //             //   this.$refs.brief.style.background='#ffffff'
+    //             // }, 2000);
+    //             document.querySelector('#brief').scrollIntoView({ behavior: "smooth" });
+    //             return false
+    //           }
+    //       break;
+    //       case 'fund':
+    //           let mon=this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.input*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1
+    //           if(mon==0){
+    //             document.querySelector('#fund').scrollIntoView({ behavior: "smooth" });
+    //             return this.$message.error('请输入经费')
+    //           }
+    //       break;
+    //     }
+    //   }
+    // //   let param={
+    // //     projectName
+    // //   }
+    // //   this.ajax
+    // //     .post(this.$store.state.api+'/SelectAllType',param)
+    // //     .then(err,res)
+    // },
+    checkExpenditureMothPlan(index) {
+      let count = 0;
+      this.wordData["expenditureMothPlan"].forEach(
+        (item) => (count += Number(item))
+      );
+      if (count > this.total) {
+        this.$message.error("总经费月支出计划不能大于总经费");
+        this.wordData["expenditureMothPlan"][index] = 0;
+      }
+    },
+    checkProjectMoney() {
+      this.$message.info("切换项目");
+    },
+  },
+  computed: {
+    //经费总合
+    total() {
+      let num = 0;
+      for (let i in this.wordData["fund"])
+        num += Number(this.wordData["fund"][i]);
+      return num;
+      // return (this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.input*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1)/10000
+    },
+  },
+  mounted() {
+    this.getProjectDepartmentData();
+    this.getProjectData();
+    console.log(this.$route.path);
+  },
+};
+</script>
+      
+    <style lang="less" scoped>
+#MarkeractivityWord {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background-color: #ffff;
+  margin: 0;
+  padding: 100px;
+  box-sizing: border-box;
+  #title {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    position: relative;
+    // margin-top: 40px;
+    .school {
+      font-size: 2.5em;
+      font-weight: 500;
+      letter-spacing: 20px;
+    }
+    .wordTitle {
+      font-size: 2em;
+      letter-spacing: 0.15em;
+      margin-bottom: 40px;
+    }
+    .date {
+      font-size: 1em;
+      position: absolute;
+      bottom: 0;
+      right: 100px;
+      font-weight: bold;
     }
-    .operate{
-        right:-85px;
-        width:85px;
+  }
+  .table {
+    border: none;
+    border-top: solid 1px black;
+
+    tr {
+      position: relative;
+      td {
+        border: none;
+        border-bottom: solid 1px black;
+        border-right: solid 1px black;
         height: 50px;
-        display:flex;
-        justify-content:space-between;
-        align-items:center;
-        position:absolute;
-        .el-button{
-          max-width:10px;
-          display:flex;
-          justify-content:center;
-          align-items:center;
-          margin-left:10px;
+        text-align: center;
+        line-height: 30px;
+        width: 80px;
+        &:nth-child(1) {
+          border-left: solid 1px black;
+        }
+        p {
+          font-weight: 600;
+        }
+        :deep(.el-select .el-input .el-select__caret) {
+          display: none;
         }
+        :deep(.el-textarea__inner) {
+          // padding: 0;
+          border: none;
+          border-radius: 0px;
+          text-align: center;
+          font-size: 16px;
+        }
+        :deep(.el-input__inner) {
+          border: none;
+          &::-webkit-outer-spin-button,
+          &::-webkit-inner-spin-button {
+            -webkit-appearance: none !important;
+          }
+          &[type="number"] {
+            -moz-appearance: textfield;
+          }
+
+          border-radius: 0px;
+          text-align: center;
+          font-size: 16px;
+        }
+      }
+    }
+    .textLeft {
+      :deep(.el-textarea__inner) {
+        // padding: 0;
+        border: none;
+        border-radius: 0px;
+        text-align: left !important;
+        font-size: 16px;
+      }
     }
-    </style>
+  }
+  .notes {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+.operate {
+  right: -85px;
+  width: 85px;
+  height: 50px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: absolute;
+  .el-button {
+    max-width: 10px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-left: 10px;
+  }
+}
+</style>

+ 1 - 1
src/components/studentProjectWord.vue

@@ -548,7 +548,7 @@ import {getNowDate} from '@/components/tool/Date.js'
           if(!result) return this.$message.error('请输入正确联系号码格式')
         },
       addTeacher(){        //添加老师
-        if (this.wordData.teacherS.length>=3) return this.$message.error('指导老师最多三人')
+        // if (this.wordData.teacherS.length>=3) return this.$message.error('指导老师最多三人')
         this.wordData.teacherS.push({name:"",collage:"",work:""});
       },
       DelTeacher(index){   //删除老师

+ 2 - 2
src/config/config.js

@@ -20,11 +20,11 @@ const store = new Vuex.Store({
         systemState: 1,
         nCount: 0,
         report: "",
-        // api: 'https://pbl.cocorobo.cn/api/pbl/',
+        api: 'https://pbl.cocorobo.cn/api/pbl/',
         // socket: "https://poll.cocorobo.cn",
         // socket: "http://localhost:1473",
         // api: 'http://10.3.16.226:7003/api',//qgt后端
-        api: 'https://cxcy.ssti.net.cn/api', //服务器
+        // api: 'https://cxcy.ssti.net.cn/api', //服务器
         // api: 'http://127.0.0.1:7003/api',
         // api: 'http://10.3.13.84:7003/api',
 

+ 2 - 0
src/permission.js

@@ -58,7 +58,9 @@ router.beforeEach(async(to, from, next) => {
         let data = response.data.replaceAll("\'", "\"")
         if (data && JSON.parse(data).uid) {
             uid = JSON.parse(data).uid;
+            // uid = "1270";本地
             setToken(btoa(md5(JSON.parse(data).uid)));
+            // setToken(btoa(md5("1270")));
             // testApi();
             userLogin((isLogin) => {
                 getSystemState(to, () => {

+ 70 - 47
src/views/home.vue

@@ -287,7 +287,10 @@ export default {
       this.$forceUpdate();
       if (
         this.$store.state.userInfo.type == 1 ||
-        this.$store.state.userInfo.type == 2 ||
+        this.$store.state.userInfo.type == 2
+      ) {
+        this.$router.push("/ProjectManagement");
+      }else if (
         this.$store.state.userInfo.type == 0
       ) {
         this.$router.push("/projectApplication");
@@ -309,38 +312,38 @@ export default {
         this.$store.state.userInfo.type == 2
       ) {
         this.navList.push(
-          {
-            id: 1,
-            label: "事前申请",
-            goto: "/projectApplication",
-            icon: "iconfont icon-shuben",
-            group: [
-              {
-                id: 1,
-                label: "项目立项管理",
-                goto: "/projectApplication",
-                group: [
-                  {
-                    label: "创客项目申请",
-                    goto: "/newStudentProjectApply",
-                  },
-                  { label: "创客空间申请", goto: "/MakerSpaceApply" },
-                ],
-              },
-              {
-                id: 1,
-                label: "创客活动管理",
-                goto: "/makerActvity",
-                group: [
-                  {
-                    label: "实践活动申请",
-                    goto: "/newMarkerActivity",
-                  },
-                  // {label:"个人创客申请",power:false,goto:"/newNomMarkerActivity"},
-                ],
-              },
-            ],
-          },
+          // {
+          //   id: 1,
+          //   label: "事前申请",
+          //   goto: "/projectApplication",
+          //   icon: "iconfont icon-shuben",
+          //   group: [
+          //     {
+          //       id: 1,
+          //       label: "项目立项管理",
+          //       goto: "/projectApplication",
+          //       group: [
+          //         {
+          //           label: "创客项目申请",
+          //           goto: "/newStudentProjectApply",
+          //         },
+          //         { label: "创客空间申请", goto: "/MakerSpaceApply" },
+          //       ],
+          //     },
+          //     {
+          //       id: 1,
+          //       label: "创客活动管理",
+          //       goto: "/makerActvity",
+          //       group: [
+          //         {
+          //           label: "实践活动申请",
+          //           goto: "/newMarkerActivity",
+          //         },
+          //         // {label:"个人创客申请",power:false,goto:"/newNomMarkerActivity"},
+          //       ],
+          //     },
+          //   ],
+          // },
           // {
           //   id: 2,
           //   label: "创客活动管理",
@@ -354,21 +357,41 @@ export default {
           //     // {label:"个人创客申请",power:false,goto:"/newNomMarkerActivity"},
           //   ],
           // },
+          // {
+          //   id: 2,
+          //   label: "事后汇总",
+          //   goto: "/makerfund",
+          //   icon: "iconfont icon-zijinguanli",
+          //   group: [
+          //     {
+          //       label: "创客资金申请",
+          //       goto: "/newMarkerfundApply",
+          //       group: [],
+          //     },
+          //   ],
+          // },
           {
-            id: 2,
-            label: "事后汇总",
-            goto: "/makerfund",
-            icon: "iconfont icon-zijinguanli",
-            group: [
-              {
-                label: "创客资金申请",
-                goto: "/newMarkerfundApply",
-                group: [],
-              },
-              // {label:"创客活动资金申请",power:false,goto:"/newMarkerfundApply"},
-              // {label:"个人创客资金申请",power:false,goto:"/newNomMarkerFundApply"}
-            ],
-          }
+            id: 4,
+            label: "项目管理",
+            goto: "/ProjectManagement",
+            icon: "el-icon-receiving",
+            group: [],
+          },
+          {
+            id: 5,
+            label: "项目结项",
+            goto: "/projectSettlement",
+            icon: "iconfont icon-_yuanhuanchong",
+            group: [],
+          },
+          // {id:6,label:"学分登记",goto:"/credit",icon:"iconfont icon-yonghu"},
+          {
+            id: 7,
+            label: "成果展示",
+            goto: "/resultsShow",
+            icon: "iconfont icon-xiangmuguanli2",
+            group: [],
+          },
         );
       } else if (this.$store.state.userInfo.type == 0) {
         this.navList.push(

+ 1 - 2
src/views/projectApply/components/MakerSpaceWord.vue

@@ -337,11 +337,10 @@
         </div>
         <div class="chaptersTable">
           <div class="chaptersValue" id="seven">
-            <span>项目简介(200-300字)</span><br />
+            <span>项目简介</span><br />
             <el-input
               type="textarea"
               class="noCenter"
-              maxlength="300"
               show-word-limit
               :autosize="{ minRows: 6 }"
               resize="none"

+ 78 - 51
src/views/projectApply/components/studentProjectWord.vue

@@ -55,7 +55,8 @@
       </tr>
       <tr id="checkList">
         <td colspan="2" ref="checkList" class="bold">
-          <span style="color: red">*</span>优先支持项目(可多选)
+          <!-- <span style="color: red">*</span>优先支持项目(可多选) -->
+          优先支持项目(可多选)
         </td>
         <td colspan="5">
           <el-checkbox-group v-model="wordData.checkList">
@@ -68,21 +69,16 @@
       </tr>
       <tr id="schoolRadio">
         <td colspan="2" ref="schoolRadio" class="bold">
-          <span style="color: red">*</span>美丽校园改造项目(特色项目)
+          <!-- <span style="color: red">*</span>美丽校园改造项目(特色项目) -->
+          美丽校园改造项目(特色项目)
         </td>
         <td colspan="5">
-          <el-radio v-model="wordData.schoolRadio" label="1"
-            >校园安全项目</el-radio
-          >
-          <el-radio v-model="wordData.schoolRadio" label="2"
-            >环境治理项目</el-radio
-          >
-          <el-radio v-model="wordData.schoolRadio" label="3"
-            >校园服务项目</el-radio
-          >
-          <el-radio v-model="wordData.schoolRadio" label="4"
-            >文创装置项目</el-radio
-          >
+          <el-checkbox-group v-model="wordData.schoolRadio">
+            <el-checkbox label="1">校园安全项目</el-checkbox>
+            <el-checkbox label="2">环境治理项目</el-checkbox>
+            <el-checkbox label="3">校园服务项目</el-checkbox>
+            <el-checkbox label="4">文创装置项目</el-checkbox>
+          </el-checkbox-group>
         </td>
       </tr>
       <tr id="applyParsonRadio">
@@ -90,14 +86,10 @@
           <span style="color: red">*</span>项 目 申 请 人
         </td>
         <td colspan="2">
-          <el-radio v-model="wordData.applyParsonRadio" label="1"
-            >在校学生</el-radio
-          >
-        </td>
-        <td colspan="3">
-          <el-radio v-model="wordData.applyParsonRadio" label="2"
-            >入驻学校孵化基地的初创企业法人</el-radio
-          >
+          <el-checkbox-group v-model="wordData.applyParsonRadio">
+            <el-checkbox label="1">在校学生</el-checkbox>
+            <el-checkbox label="2">入驻学校孵化基地的初创企业法人</el-checkbox>
+          </el-checkbox-group>
         </td>
       </tr>
       <tr id="applyParsonName">
@@ -195,7 +187,7 @@
           <span class="bold">项目组</span><br /><span class="bold"
             >学生成员</span
           ><br />
-          (至少2个学院以上学生构成,团队5人以上)
+          <!-- (至少2个学院以上学生构成,团队5人以上) -->
         </td>
         <td><span style="color: red">*</span>姓名</td>
         <td colspan="2">所在学院/部门/专业</td>
@@ -248,7 +240,7 @@
             >添加</el-button
           >
           <el-button
-            v-if="wordData.studentS.length > 6"
+            v-if="wordData.studentS.length > 1"
             @click="DelStudent(index)"
             type="primary"
             size="mini"
@@ -261,7 +253,7 @@
           <span class="bold">项目组</span><br /><span class="bold"
             >指导教师</span
           ><br />
-          (2个学院以上,团队2-3人)
+          <!-- (2个学院以上,团队2-3人) -->
         </td>
         <td><span style="color: red">*</span>姓名</td>
         <td colspan="2">所在学院/部门/专业</td>
@@ -314,7 +306,7 @@
             >添加</el-button
           >
           <el-button
-            v-if="wordData.teacherS.length != 2"
+            v-if="wordData.teacherS.length > 1"
             @click="DelTeacher(index)"
             type="primary"
             size="mini"
@@ -333,12 +325,11 @@
           colspan="6"
           class="textLeft"
         >
-          <p>项目简介(200-300字)</p>
+          <p>项目简介</p>
           <el-input
             type="textarea"
             :rows="6"
             resize="none"
-            maxlength="300"
             placeholder="请输入项目简介"
             style="width: 100%"
             show-word-limit
@@ -648,23 +639,59 @@
         <td colspan="2">论文版面费、专利及其他知识产权事务等费用。</td>
       </tr>
       <tr>
-            <td class="bold">所在学院/部门意见</td><td colspan="6" class="textLeft" style="height:200px">
-                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章:</div>
-                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
-            </td>
-          </tr>
-          <tr>
-            <td class="bold">财务部门意见</td><td colspan="6" class="textLeft" style="height:200px">
-                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章:</div>
-                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
-            </td>
-          </tr>
-          <tr>
-            <td class="bold">创新创业学院审核意见</td><td colspan="6" class="textLeft" style="height:200px">
-                <div style="text-align: right;font-size: 18px;width: 80%;margin-bottom: 20px;">负责人签章:</div>
-                <div style="text-align: right;font-size: 18px;width: 90%;">年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日</div>
-            </td>
-          </tr>
+        <td class="bold">所在学院/部门意见</td>
+        <td colspan="6" class="textLeft" style="height: 200px">
+          <div
+            style="
+              text-align: right;
+              font-size: 18px;
+              width: 80%;
+              margin-bottom: 20px;
+            "
+          >
+            负责人签章:
+          </div>
+          <div style="text-align: right; font-size: 18px; width: 90%">
+            年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td class="bold">财务部门意见</td>
+        <td colspan="6" class="textLeft" style="height: 200px">
+          <div
+            style="
+              text-align: right;
+              font-size: 18px;
+              width: 80%;
+              margin-bottom: 20px;
+            "
+          >
+            负责人签章:
+          </div>
+          <div style="text-align: right; font-size: 18px; width: 90%">
+            年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td class="bold">创新创业学院审核意见</td>
+        <td colspan="6" class="textLeft" style="height: 200px">
+          <div
+            style="
+              text-align: right;
+              font-size: 18px;
+              width: 80%;
+              margin-bottom: 20px;
+            "
+          >
+            负责人签章:
+          </div>
+          <div style="text-align: right; font-size: 18px; width: 90%">
+            年&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;日
+          </div>
+        </td>
+      </tr>
       <!-- <tr style="border: none;"> -->
       <!-- <td colspan="7"  style="border: none;"> -->
       <div class="notes">
@@ -690,13 +717,13 @@ export default {
     };
   },
   methods: {
-    checkTime(){
+    checkTime() {
       var a = new Date(this.wordData.beginTime);
       var b = new Date(this.wordData.endTime);
-      if(b<a){
-        this.$message.error('计划完成时间不得在项目起始时间之前!');
+      if (b < a) {
+        this.$message.error("计划完成时间不得在项目起始时间之前!");
         this.wordData.endTime = "";
-        return
+        return;
       }
     },
     getText(value) {
@@ -708,8 +735,8 @@ export default {
     },
     addTeacher() {
       //添加老师
-      if (this.wordData.teacherS.length >= 3)
-        return this.$message.error("指导老师最多三人");
+      // if (this.wordData.teacherS.length >= 3)
+      //   return this.$message.error("指导老师最多三人");
       this.wordData.teacherS.push({ name: "", collage: "", work: "" });
     },
     DelTeacher(index) {

+ 2 - 2
src/views/projectApply/components/studentProjectWordDetail.vue

@@ -200,8 +200,8 @@ export default {
     },
     addTeacher() {
       //添加老师
-      if (this.wordData.teacherS.length >= 3)
-        return this.$message.error("指导老师最多三人");
+      // if (this.wordData.teacherS.length >= 3)
+      //   return this.$message.error("指导老师最多三人");
       this.wordData.teacherS.push({ name: "", collage: "", work: "" });
     },
     DelTeacher(index) {

+ 5 - 3
src/views/projectApply/components/studentProjectWordShow.vue

@@ -66,7 +66,8 @@
             <td>参与教师人数</td><td v-text="downWordData.teacherS.length"></td>
           </tr>
           <tr id="studentS">
-            <td :rowspan="downWordData.studentS.length+1" ref="studentS"><span class="jc">项目组</span><br><span class="jc">学生成员</span><br> (至少2 <br>个学院以上<br> 学生构成<br>,团队 5人以上)</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+            <!-- <td :rowspan="downWordData.studentS.length+1" ref="studentS"><span class="jc">项目组</span><br><span class="jc">学生成员</span><br> (至少2 <br>个学院以上<br> 学生构成<br>,团队 5人以上)</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td> -->
+            <td :rowspan="downWordData.studentS.length+1" ref="studentS"><span class="jc">项目组</span><br><span class="jc">学生成员</span><br></td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
           </tr>
           <tr style="position: relative;" v-for="(item,index) in downWordData.studentS" :key="index+'a'">
             <td v-text="item.name"></td>
@@ -74,7 +75,8 @@
             <td colspan="3" v-text="item.work"></td>
           </tr>
           <tr id="teacherS">
-            <td :rowspan="downWordData.teacherS.length+1" ref="teacherS"><span class="jc">项目组</span><br><span class="jc"> 指导教师</span><br> (2个学院以上, <br>团队2-3人)</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+            <!-- <td :rowspan="downWordData.teacherS.length+1" ref="teacherS"><span class="jc">项目组</span><br><span class="jc"> 指导教师</span><br> (2个学院以上, <br>团队2-3人)</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td> -->
+            <td :rowspan="downWordData.teacherS.length+1" ref="teacherS"><span class="jc">项目组</span><br><span class="jc"> 指导教师</span><br></td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
           </tr>
           <tr style="position: relative !important;" v-for="(item,index) in downWordData.teacherS" :key="index+'b'">
             <td v-text="item.name"></td>
@@ -83,7 +85,7 @@
           </tr>
           <tr id="brief">
             <td rowspan="5" ref="brief"> <span class="jc">研发</span><br><br> <span class="jc">内容</span></td><td colspan="6" class="textLeft">
-              <p>项目简介(200-300字)</p>
+              <p>项目简介</p>
               <div style="word-wrap: break-word;word-break: break-all;" v-text="downWordData.brief"></div>
             </td>
           </tr>

+ 344 - 281
src/views/projectApply/newStudentProjectApply.vue

@@ -1,228 +1,269 @@
 <template>
-    <!-- 测试上传组件 -->
-    <div v-loading="loading">
-      <div class="pAHeader">
-          <div class="pAHeader1">创客项目申请</div>
-      </div>
-      <hr>
-    
-         <!-- 学生项目立项 -->
-        <studentProjectWord ref="pdf" :wordData="wordData" :reversedMessage="reversedMessage"/>   
+  <!-- 测试上传组件 -->
+  <div v-loading="loading">
+    <div class="pAHeader">
+      <div class="pAHeader1">创客项目申请</div>
+    </div>
+    <hr />
 
-        <div style="position: fixed;bottom: 5%;right: 2%;">
-            <el-button  @click="test" type="primary">提交项目</el-button>
-        </div>
+    <!-- 学生项目立项 -->
+    <studentProjectWord
+      ref="pdf"
+      :wordData="wordData"
+      :reversedMessage="reversedMessage"
+    />
 
-        <el-dialog
-          title="提示"
-          :visible.sync="submitHint"
-          width="600px"
-          class="pageSubmitData">
-          
-          <div class="deleteContent">确定提交“{{wordData['projectName']}}”项目吗?</div>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitWord" class="AllDialogBtn">确认提交</el-button>
-            <el-button @click="submitHint=false" class="AllDialogBtn">取消</el-button>
-          </span>
-        </el-dialog>
+    <div style="position: fixed; bottom: 5%; right: 2%">
+      <el-button @click="test" type="primary">提交项目</el-button>
     </div>
-  </template>
+
+    <el-dialog
+      title="提示"
+      :visible.sync="submitHint"
+      width="600px"
+      class="pageSubmitData"
+    >
+      <div class="deleteContent">
+        确定提交“{{ wordData["projectName"] }}”项目吗?
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitWord" class="AllDialogBtn"
+          >确认提交</el-button
+        >
+        <el-button @click="submitHint = false" class="AllDialogBtn"
+          >取消</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
   
   <script>
-  // import MakerSpaceWord from '../components/MakerSpaceWord.vue'
-  import getProjectNo from '@/components/tool/getProjectNo';
-  import {getNowDate} from '@/components/tool/Date.js'
-  import studentProjectWord from './components/studentProjectWord.vue'
-  // import markerFundWord from '@/components/markerFundWord.vue';
-  // import markeractivityWord from '@/components/markeractivityWord.vue';
-  export default {
-    components: {
-      studentProjectWord,
-      // markerFundWord,
-      // markeractivityWord
-    },
-    data() {
-      return {
-        accept: "*",
-        loading:false,
-        submitHint:false,
-        wordData:{
-          applicationDate:getNowDate(1),//申请日期
-          projectName:'',
-          radio: '',
-          checkList:[],
-          schoolRadio:'',
-          applyParsonRadio:'',
-          applyParsonName:'',
-          college:'',
-          tel:'',
-          beginTime:'',
-          endTime:'',
-          studentS:[
-            {name:'',collage:'',work:''},
-            {name:'',collage:'',work:''},
-            {name:'',collage:'',work:''},
-            {name:'',collage:'',work:''},
-            {name:'',collage:'',work:''},
-          ],
-          teacherS:[
-            {name:'',collage:'',work:''},
-            {name:'',collage:'',work:''},
-          ],
-          brief:'',
-          introduce:{
-            back:'',
-            innovate:'',
-            path:'',
-            scene:'',
-            worth:'',
-            team:'',
-            cost:'',
-            expectResults:'',
-            expectResultsTeacher:'',
-            expectConversion:'',
-            plan:''
-          },
-          total:'',
-          fund:{
-                device:"",
-                Material:"",
-                processing:"",
-                Collaboration:"",
-                APPRAISAL:"",
-                entery:"",
-                activities:"",
-                Transaction:"",
-          }
-        }
-      };
-    },
-    computed:{
-      reversedMessage: function () {
-        return (this.wordData.fund.device*1 + this.wordData.fund.Material*1+this.wordData.fund.processing*1+ this.wordData.fund.Collaboration*1+this.wordData.fund.APPRAISAL*1+ this.wordData.fund.entery*1+this.wordData.fund.activities*1+this.wordData.fund.Transaction*1)
-      }
+// import MakerSpaceWord from '../components/MakerSpaceWord.vue'
+import getProjectNo from "@/components/tool/getProjectNo";
+import { getNowDate } from "@/components/tool/Date.js";
+import studentProjectWord from "./components/studentProjectWord.vue";
+// import markerFundWord from '@/components/markerFundWord.vue';
+// import markeractivityWord from '@/components/markeractivityWord.vue';
+export default {
+  components: {
+    studentProjectWord,
+    // markerFundWord,
+    // markeractivityWord
+  },
+  data() {
+    return {
+      accept: "*",
+      loading: false,
+      submitHint: false,
+      wordData: {
+        applicationDate: getNowDate(1), //申请日期
+        projectName: "",
+        radio: "",
+        checkList: [],
+        schoolRadio: [],
+        applyParsonRadio: [],
+        applyParsonName: "",
+        college: "",
+        tel: "",
+        beginTime: "",
+        endTime: "",
+        studentS: [
+          { name: "", collage: "", work: "" },
+        ],
+        teacherS: [
+          { name: "", collage: "", work: "" },
+        ],
+        brief: "",
+        introduce: {
+          back: "",
+          innovate: "",
+          path: "",
+          scene: "",
+          worth: "",
+          team: "",
+          cost: "",
+          expectResults: "",
+          expectResultsTeacher: "",
+          expectConversion: "",
+          plan: "",
+        },
+        total: "",
+        fund: {
+          device: "",
+          Material: "",
+          processing: "",
+          Collaboration: "",
+          APPRAISAL: "",
+          entery: "",
+          activities: "",
+          Transaction: "",
+        },
+      },
+    };
+  },
+  computed: {
+    reversedMessage: function () {
+      return (
+        this.wordData.fund.device * 1 +
+        this.wordData.fund.Material * 1 +
+        this.wordData.fund.processing * 1 +
+        this.wordData.fund.Collaboration * 1 +
+        this.wordData.fund.APPRAISAL * 1 +
+        this.wordData.fund.entery * 1 +
+        this.wordData.fund.activities * 1 +
+        this.wordData.fund.Transaction * 1
+      );
     },
-    methods:{
-      test(){    //验证
-        const cEmpty = /^\s*$/g;
-        for (let i in this.wordData){
-          // console.log(this.wordData[i],i);
-          switch(i){
-            case 'projectName':
-                if (cEmpty.test(this.wordData[i])) {
-                  this.$message.error('请输入项目名称')
-                  // this.$refs.projectName.style.background='rgb(236, 141, 141)'
-                  // setTimeout(() => {
-                  //   this.$refs.projectName.style.background='#ffffff'
-                  // }, 2000);
-                  document.querySelector('#projectName').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
-              break;
-            case 'radio':
-                if (cEmpty.test(this.wordData[i])) {
-                  this.$message.error('请选择项目分组')
-                  document.querySelector('#radio').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
-              break;
-            case 'checkList':
-                if (this.wordData[i].length==0) {
-                  this.$message.error('优先支持项目')
-                  document.querySelector('#checkList').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
+  },
+  methods: {
+    test() {
+      //验证
+      const cEmpty = /^\s*$/g;
+      for (let i in this.wordData) {
+        // console.log(this.wordData[i],i);
+        switch (i) {
+          case "projectName":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请输入项目名称");
+              // this.$refs.projectName.style.background='rgb(236, 141, 141)'
+              // setTimeout(() => {
+              //   this.$refs.projectName.style.background='#ffffff'
+              // }, 2000);
+              document
+                .querySelector("#projectName")
+                .scrollIntoView({ behavior: "smooth" });
+              return false;
+            }
             break;
-            case 'schoolRadio':
-                if (cEmpty.test(this.wordData[i])) {
-                  this.$message.error('请选择美丽校园改造项目')
-                  document.querySelector('#schoolRadio').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
+          case "radio":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请选择项目分组");
+              document
+                .querySelector("#radio")
+                .scrollIntoView({ behavior: "smooth" });
+              return false;
+            }
             break;
-            case 'applyParsonRadio':
-                if (cEmpty.test(this.wordData[i])) {
-                  this.$message.error('请选择项目申请人')
-                  document.querySelector('#applyParsonRadio').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
+          // case "checkList":
+          //   if (this.wordData[i].length == 0) {
+          //     this.$message.error("优先支持项目");
+          //     document
+          //       .querySelector("#checkList")
+          //       .scrollIntoView({ behavior: "smooth" });
+          //     return false;
+          //   }
+          //   break;
+          // case "schoolRadio":
+          //   if (this.wordData[i].length == 0) {
+          //     this.$message.error("请选择美丽校园改造项目");
+          //     document
+          //       .querySelector("#schoolRadio")
+          //       .scrollIntoView({ behavior: "smooth" });
+          //     return false;
+          //   }
+          //   break;
+          case "applyParsonRadio":
+            if (this.wordData[i].length == 0) {
+              this.$message.error("请选择项目申请人");
+              document
+                .querySelector("#applyParsonRadio")
+                .scrollIntoView({ behavior: "smooth" });
+              return false;
+            }
             break;
-            case 'applyParsonName':
-                if (cEmpty.test(this.wordData[i])) {
-                  this.$message.error('请填写申请人姓名')
-                  document.querySelector('#applyParsonName').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
+          case "applyParsonName":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请填写申请人姓名");
+              document
+                .querySelector("#applyParsonName")
+                .scrollIntoView({ behavior: "smooth" });
+              return false;
+            }
             break;
-            case 'college':
-                if (cEmpty.test(this.wordData[i])) {
-                  this.$message.error('请选择所在学院')
-                  document.querySelector('#applyParsonName').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
+          case "college":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请选择所在学院");
+              document
+                .querySelector("#applyParsonName")
+                .scrollIntoView({ behavior: "smooth" });
+              return false;
+            }
             break;
-            case 'tel':
-                if (cEmpty.test(this.wordData[i])) {
-                  this.$message.error('请填写联系方式')
-                  document.querySelector('#applyParsonName').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
+          case "tel":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请填写联系方式");
+              document
+                .querySelector("#applyParsonName")
+                .scrollIntoView({ behavior: "smooth" });
+              return false;
+            }
             break;
-            case 'beginTime':
-                if (cEmpty.test(this.wordData[i])) {
-                  this.$message.error('请选择项目起始时间')
-                  document.querySelector('#beginTime').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
+          case "beginTime":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请选择项目起始时间");
+              document
+                .querySelector("#beginTime")
+                .scrollIntoView({ behavior: "smooth" });
+              return false;
+            }
             break;
-            case 'endTime':
-                if (cEmpty.test(this.wordData[i])) {
-                  this.$message.error('请选择计划完成时间')
-                  document.querySelector('#beginTime').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
+          case "endTime":
+            if (cEmpty.test(this.wordData[i])) {
+              this.$message.error("请选择计划完成时间");
+              document
+                .querySelector("#beginTime")
+                .scrollIntoView({ behavior: "smooth" });
+              return false;
+            }
             break;
-            case 'studentS':
-                  let snum = 0;
-                  this.wordData[i].forEach(item=>{
-                    if(cEmpty.test(item['name']))snum++;
-                    // for(let j in item){
-                    //   if(cEmpty.test(item[j])){
-                    //     snum++;
-                    //   }
-                    // }
-                  })
-                  if(snum>0){
-                    this.$message.error("学生姓名请不要留空");
-                    document.querySelector('#studentS').scrollIntoView({ behavior: "smooth" });
-                    return false;
-                  }
-                // }
+          case "studentS":
+            let snum = 0;
+            this.wordData[i].forEach((item) => {
+              if (cEmpty.test(item["name"])) snum++;
+              // for(let j in item){
+              //   if(cEmpty.test(item[j])){
+              //     snum++;
+              //   }
+              // }
+            });
+            if (snum > 0) {
+              this.$message.error("学生姓名请不要留空");
+              document
+                .querySelector("#studentS")
+                .scrollIntoView({ behavior: "smooth" });
+              return false;
+            }
+            // }
             break;
-            case 'teacherS':
-                  let num = 0;
-                  this.wordData[i].forEach(item=>{
-                    if(cEmpty.test(item['name']))num++;
-                    // for(let j in item){
-                    //   if(cEmpty.test(item[j])){
-                    //     num++;
-                    //   }
-                    // }
-                  })
-                  if(num>0){
-                    this.$message.error("老师姓名请不要留空");
-                    document.querySelector('#teacherS').scrollIntoView({ behavior: "smooth" });
-                    return false;
-                  }
+          case "teacherS":
+            let num = 0;
+            this.wordData[i].forEach((item) => {
+              if (cEmpty.test(item["name"])) num++;
+              // for(let j in item){
+              //   if(cEmpty.test(item[j])){
+              //     num++;
+              //   }
+              // }
+            });
+            if (num > 0) {
+              this.$message.error("老师姓名请不要留空");
+              document
+                .querySelector("#teacherS")
+                .scrollIntoView({ behavior: "smooth" });
+              return false;
+            }
             break;
-            case 'brief':
-                if ( this.wordData[i].length>300 || this.wordData[i].length==0) {
-                  this.$message.error('请填写项目简介,字数在300字以内')
-                  document.querySelector('#brief').scrollIntoView({ behavior: "smooth" });
-                  return false
-                }
-            break;
-            case 'fund':
+          // case "brief":
+          //   if (this.wordData[i].length > 300 || this.wordData[i].length == 0) {
+          //     this.$message.error("请填写项目简介,字数在300字以内");
+          //     document
+          //       .querySelector("#brief")
+          //       .scrollIntoView({ behavior: "smooth" });
+          //     return false;
+          //   }
+          //   break;
+          case "fund":
             // device:"",
             //     Material:"",
             //     processing:"",
@@ -231,83 +272,105 @@
             //     entery:"",
             //     activities:"",
             //     Transaction:"",
-                // let mon=this.wordData.fund.device*1 + this.wordData.fund.Material*1+this.wordData.fund.processing*1+ this.wordData.fund.Collaboration*1+this.wordData.fund.APPRAISAL*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1
-                let mon=0
-                for(let k in this.wordData.fund){
-                  mon+=this.wordData.fund[k]*1
-                }
-                // console.log(mon);
-                if(mon==0){
-                  document.querySelector('#fund').scrollIntoView({ behavior: "smooth" });
-                  return this.$message.error('请输入经费')
-                }
+            // let mon=this.wordData.fund.device*1 + this.wordData.fund.Material*1+this.wordData.fund.processing*1+ this.wordData.fund.Collaboration*1+this.wordData.fund.APPRAISAL*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1
+            let mon = 0;
+            for (let k in this.wordData.fund) {
+              mon += this.wordData.fund[k] * 1;
+            }
+            // console.log(mon);
+            if (mon == 0) {
+              document
+                .querySelector("#fund")
+                .scrollIntoView({ behavior: "smooth" });
+              return this.$message.error("请输入经费");
+            }
             break;
-          }
         }
-        this.wordData['total']=this.wordData.fund.device*1 + this.wordData.fund.Material*1+this.wordData.fund.processing*1+ this.wordData.fund.Collaboration*1+this.wordData.fund.APPRAISAL*1+ this.wordData.fund.entery*1+this.wordData.fund.activities*1+this.wordData.fund.Transaction*1
-
-        this.submitHint=true;
-      },
-
-      submitWord(){  //提交
-        // return console.log(this.wordData['total']);
-        getProjectNo("XM").then((result)=>{
-                let pram = {
-                  uid:this.$store.state.userInfo.userid,//用户ID
-                  pNo:result,//项目编号
-                  tid:"5e21b204-c206-11ed-a4cd-509a4c5b67cf",//特色创客空间建设项目分类ID
-                  tit:this.wordData['projectName'],//项目名称
-                  radio:this.wordData['radio'],//项目分组
-                  checkList:JSON.stringify(this.wordData['checkList']),//优先支持项目
-                  schoolRadio:this.wordData['schoolRadio'],//美丽校园改造项目
-                  applyParsonRadio:this.wordData['applyParsonRadio'],//项 目 申 请 人
-                  applyParsonName:this.wordData['applyParsonName'],//申请人姓名
-                  cid:this.wordData['college'],//学院ID,
-                  tel:this.wordData['tel'],//联系电话
-                  beh:this.wordData['beginTime'],//项目开始时间,
-                  planEnd:this.wordData['endTime'],//计划完成时间,
-                  cs:JSON.stringify(this.wordData['studentS']),//学生组,
-                  ct:JSON.stringify(this.wordData['teacherS']),//教师组,
-                  bf:this.wordData['brief'],//项目简介
-                  introduce:JSON.stringify(this.wordData['introduce']),//项目详细
-                  mon:JSON.stringify(this.wordData['fund']),//预算经费
-                  f:this.wordData['total'],//总经费
-                  apply:this.wordData['applicationDate'],//申请日期
-                  mem:this.wordData['studentS'].length+this.wordData['teacherS'].length,//项目组人数
-                }
-                // return 
-                this.ajax
-                .post(this.$store.state.api+'/studentProjectWordApply',pram)
-                .then(result=>{
-                  console.log(result);
-                  if(result['data']==1){
-                    this.$message.success("项目提交成功");
-                    //提交项目成功,查看sessionStore是否有数据,有则删
-                    if(sessionStorage.getItem("StudentProjectApplyData"))sessionStorage.removeItem('StudentProjectApplyData');
-                    this.$router.push('/projectApplication')
-                  }else{
-                    this.$message.error("项目提交失败");
-                  }
-                },err=>{
-                  console.log(err);
-                }).catch(err=>{
-                  console.log(err);
-                })
-            })
       }
+      this.wordData["total"] =
+        this.wordData.fund.device * 1 +
+        this.wordData.fund.Material * 1 +
+        this.wordData.fund.processing * 1 +
+        this.wordData.fund.Collaboration * 1 +
+        this.wordData.fund.APPRAISAL * 1 +
+        this.wordData.fund.entery * 1 +
+        this.wordData.fund.activities * 1 +
+        this.wordData.fund.Transaction * 1;
+
+      this.submitHint = true;
     },
-    mounted(){
-      if(sessionStorage.getItem('StudentProjectApplyData'))this.wordData = JSON.parse(sessionStorage.getItem('StudentProjectApplyData'))
+
+    submitWord() {
+      //提交
+      // return console.log(this.wordData['total']);
+      getProjectNo("XM").then((result) => {
+        let pram = {
+          uid: this.$store.state.userInfo.userid, //用户ID
+          pNo: result, //项目编号
+          tid: "5e21b204-c206-11ed-a4cd-509a4c5b67cf", //特色创客空间建设项目分类ID
+          tit: this.wordData["projectName"], //项目名称
+          radio: this.wordData["radio"], //项目分组
+          checkList: JSON.stringify(this.wordData["checkList"]), //优先支持项目
+          schoolRadio: this.wordData["schoolRadio"], //美丽校园改造项目
+          applyParsonRadio: this.wordData["applyParsonRadio"], //项 目 申 请 人
+          applyParsonName: this.wordData["applyParsonName"], //申请人姓名
+          cid: this.wordData["college"], //学院ID,
+          tel: this.wordData["tel"], //联系电话
+          beh: this.wordData["beginTime"], //项目开始时间,
+          planEnd: this.wordData["endTime"], //计划完成时间,
+          cs: JSON.stringify(this.wordData["studentS"]), //学生组,
+          ct: JSON.stringify(this.wordData["teacherS"]), //教师组,
+          bf: this.wordData["brief"], //项目简介
+          introduce: JSON.stringify(this.wordData["introduce"]), //项目详细
+          mon: JSON.stringify(this.wordData["fund"]), //预算经费
+          f: this.wordData["total"], //总经费
+          apply: this.wordData["applicationDate"], //申请日期
+          mem:
+            this.wordData["studentS"].length + this.wordData["teacherS"].length, //项目组人数
+        };
+        // return
+        this.ajax
+          .post(this.$store.state.api + "/studentProjectWordApply", pram)
+          .then(
+            (result) => {
+              console.log(result);
+              if (result["data"] == 1) {
+                this.$message.success("项目提交成功");
+                //提交项目成功,查看sessionStore是否有数据,有则删
+                if (sessionStorage.getItem("StudentProjectApplyData"))
+                  sessionStorage.removeItem("StudentProjectApplyData");
+                this.$router.push("/projectApplication");
+              } else {
+                this.$message.error("项目提交失败");
+              }
+            },
+            (err) => {
+              console.log(err);
+            }
+          )
+          .catch((err) => {
+            console.log(err);
+          });
+      });
     },
-    beforeRouteLeave (to, from, next) {
-      //判断,如果还没提交然后切换页面了,则把数据存到sessionStore里;
-      if(!this.submitHint)sessionStorage.setItem('StudentProjectApplyData',JSON.stringify(this.wordData));
-      next();
-    }
-  };
-  </script>
+  },
+  mounted() {
+    if (sessionStorage.getItem("StudentProjectApplyData"))
+      this.wordData = JSON.parse(
+        sessionStorage.getItem("StudentProjectApplyData")
+      );
+  },
+  beforeRouteLeave(to, from, next) {
+    //判断,如果还没提交然后切换页面了,则把数据存到sessionStore里;
+    if (!this.submitHint)
+      sessionStorage.setItem(
+        "StudentProjectApplyData",
+        JSON.stringify(this.wordData)
+      );
+    next();
+  },
+};
+</script>
   
   <style lang="less" scoped>
-
-
-  </style>
+</style>

Fichier diff supprimé car celui-ci est trop grand
+ 862 - 594
src/views/projectManage/ProjectManagement.vue


Fichier diff supprimé car celui-ci est trop grand
+ 873 - 336
src/views/projectManage/components/Closingstatement.vue


+ 1 - 1
src/views/projectSettlement/components/projectSettlementBook.vue

@@ -649,7 +649,7 @@
       <tr>
         <td>附件</td>
         <td colspan="7">
-          <p>附:课题研究报告、用户评价意见或专家鉴定意见等</p>
+          <p>附:课题研究报告、用户评价意见或专家鉴定意见等其他文件</p>
           <beUpload
             style="position: absolute; right: 10px; top: 5px"
             @getFile="gettaskAccessory"

+ 1 - 1
src/views/projectSettlement/projectSettlement.vue

@@ -163,7 +163,7 @@
               <div class="operations">
                         <el-button type="primary" size="mini" @click="details(scope.row)">查看详情</el-button>
                         
-                        <el-button type="primary"  v-if="scope.row.isupload==3" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">结项</el-button>
+                        <el-button type="primary"  v-if="scope.row.isupload==3" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">确认结项</el-button>
                         <el-button type="info"  disabled v-if="scope.row.isupload==4" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已完结</el-button>
                         <!-- <el-button type="primary" disabled v-if="scope.row.isupload==0" style="width: 73.3px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button> -->
 

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff