SanHQin 2 dagen geleden
bovenliggende
commit
216759a75e

+ 1 - 1
src/views/projectApply/components/studentProjectWordShow.vue

@@ -641,7 +641,7 @@
               </div>
             </div>
           </div>
-          <div v-if="downWordData.promotion!=-1" style="width: 95%;margin: 10px 0; display: flex;justify-content: end;">2024年4月16日</div>
+          <div v-if="downWordData.promotion!=-1 && downWordData.opinion && downWordData.opinion.length>0" style="width: 95%;margin: 10px 0; display: flex;justify-content: end;">2024年4月16日</div>
         </td>
       </tr>
       <tr>

+ 34 - 30
src/views/projectApply/projectApplication.vue

@@ -1072,13 +1072,35 @@ export default {
                 _json["项目编号"] = item.ProjectNo;
                 _json["项目名称"] = item.title;
                 _json["项目负责人"] = item.pro_leader;
-                _json["项目状态"] = this.classType.find(i=>i.value==item.isupload).title
-								// _json["所在部门"] = item.name;
+                //_json["项目状态"] = this.classType.find(i=>i.value==item.isupload).title
+								 _json["学院"] = item.name;
                 // _json["项目简介"] = item.brief;
                // _json["分类"] = item.sort;
-               // _json["预算(万)"] = item.fund / 10000;
+
                // _json["创建时间"] = item.createTime;
-               // _json["联系电话"] = item.phone;
+               _json["联系电话"] = item.phone;
+               let money = item.money ? JSON.parse(item.money) : {};
+               _json["小型工具与耗材费"] = money["device"]
+                 ? money["device"]
+                 : "0";
+               _json["创客交流与调研活动差旅费"] = money["Material"] ? money["Material"] : "0";
+               _json["成果鉴定与认证费"] = money["processing"]
+                 ? money["processing"]
+                 : "0";
+               _json["专家咨询与评审费"] = money["Collaboration"]
+                 ? money["Collaboration"]
+                 : "0";
+               _json["论文版面费"] = money["APPRAISAL"]
+                 ? money["APPRAISAL"]
+                 : "0";
+               _json["测试与外协加工费"] = money["entery"] ? money["entery"] : "0";
+               _json["创客交流与调研活动报名费"] = money["activities"]
+                 ? money["activities"]
+                 : "0";
+               _json["其他费用"] = money["Transaction"]
+                 ? money["Transaction"]
+                 : "0";
+                _json["总经费"] = item.fund;
 //
                // _json["项目状态"] =
                //   item.isReturn == 0
@@ -1094,33 +1116,13 @@ export default {
                // _json["参与教师人数"] = teacher.length
 //
 //
-               // let money = item.money ? JSON.parse(item.money) : {};
-               // _json["小型工具与耗材费"] = money["device"]
-               //   ? money["device"]
-               //   : "0";
-               // _json["创客交流与调研活动 差旅费"] = money["Material"] ? money["Material"] : "0";
-               // _json["成果鉴定与认证费"] = money["processing"]
-               //   ? money["processing"]
-               //   : "0";
-               // _json["专家咨询与评审费"] = money["Collaboration"]
-               //   ? money["Collaboration"]
-               //   : "0";
-               // _json["论文版面费"] = money["APPRAISAL"]
-               //   ? money["APPRAISAL"]
-               //   : "0";
-               // _json["测试与外协加工费"] = money["entery"] ? money["entery"] : "0";
-               // _json["创客交流与调研活动报名费"] = money["activities"]
-               //   ? money["activities"]
-               //   : "0";
-               // _json["知识产权事务费"] = money["Transaction"]
-               //   ? money["Transaction"]
-               //   : "0";
+
 //
-               // for (let i = 0; i < student.length; i++) {
-               //   _json["学生成员" + (i + 1)] = student[i].name;
-               // 	_json["学生班级" + (i + 1)] = student[i].collage;
-               //   _json["角色分工" + (i + 1)] = student[i].work
-               // }
+               for (let i = 0; i < student.length; i++) {
+                 _json["学生成员" + (i + 1)] = student[i].name;
+               	// _json["学生班级" + (i + 1)] = student[i].collage;
+                //  _json["角色分工" + (i + 1)] = student[i].work
+               }
                for (let i = 0; i < teacher.length; i++) {
                  _json["指导老师" + (i + 1)] = teacher[i].name;
                 //  _json["所在学院" + (i + 1)] = teacher[i].collage;
@@ -1132,6 +1134,8 @@ export default {
 
 
 
+
+
                 _array.push(_json);
               });