修改专家意见

src/views/projectManage/ProjectManagement.vue

@@ -274,6 +274,12 @@
                 size="mini"
                 >修改结项</el-button
               >
+              <!-- <el-button
+                type="primary"
+                v-show="scope.row.isupload == 3"
+                size="mini"
+                >待结项</el-button
+              > -->
               <el-button
                 type="primary"
                 v-show="scope.row.isupload == 4"
@@ -707,6 +713,7 @@ export default {
                 pid: val.courseId,
               })
               .then((res) => {
+                // return console.log('提交结项',res);
 
                 let num = 0;
                 res.data[1].forEach((i) => {
@@ -726,7 +733,7 @@ export default {
                 data[0].course_student = JSON.parse(data[0].course_student);
                 data[0].course_teacher = JSON.parse(data[0].course_teacher);
 
-					      data[0].promotion = data[0].promotion.indexOf(data.ProjectNo);
+					      data[0].promotion = data[0].promotion.indexOf(data[0].ProjectNo);
 
                 if (data[0].multiSelectProject != null) {
                   data[0].multiSelectProject = JSON.parse(
@@ -808,7 +815,7 @@ export default {
           pid: val.courseId,
         })
         .then((res) => {
-          // return console.log(res);
+          console.log('修改结项', res);
 
           let num = 0;
           res.data[1].forEach((i) => {
@@ -821,22 +828,26 @@ export default {
               }
             }
           });
-          console.log(num);
+          // console.log(num);
 
           let data = res.data[0];
           data[0].course_student = JSON.parse(data[0].course_student);
           data[0].course_teacher = JSON.parse(data[0].course_teacher);
           data[0].multiSelectProject = JSON.parse(data[0].multiSelectProject);
+					data[0].promotion = data[0].promotion.indexOf(data[0].ProjectNo);
+
           data[0].ClosingstatementData = JSON.parse(
             data[0].ClosingstatementData
           );
           data[0].money = JSON.parse(data[0].money);
           // data[0].multiSelectProject=JSON.parse(data[0].multiSelectProject)
-
+          if (data[0].opinion != null) {
+            data[0].opinion = JSON.parse(data[0].opinion);
+          }
           this.myArrayProp = data;
           this.myArrayProp[0].actualuse = num; //添加已经使用过的经费
 
-          console.log(this.myArrayProp);
+          console.log('this.myArrayProp',this.myArrayProp);
           this.endDialog = true;
         })
         .catch((err) => {
@@ -1051,112 +1062,6 @@ export default {
 			cursor: default;
 		}
 	}
-  // .pagination{
-  //   float: right;
-  //   margin: 0px 85px 10px;
-  // }
-  // .projectBlock{   //循环列表大框
-  //   width: 100%;
-  //   // height: 560px;
-  //   display: flex;
-  //   flex-wrap: wrap;
-  //   overflow:auto;
-  //   .classBlock{   //每个独立小框
-  //       flex-shrink: 0;
-  //       overflow: hidden;
-  //       position: relative;
-  //       margin-right: 20px;
-  //       margin-bottom: 5px;
-  //       width: 250px;
-  //       height: 300px;
-  //       background-color: rgb(255, 255, 255);
-  //       // box-shadow: 1px 2px 3px #ccc;
-  //       border: 1px solid #ccc;
-  //       border-radius: 5px;
-  //       display: flex;
-  //       flex-direction: column;
-  //       .projectBlockPosition{    //完成状态
-  //         border-radius: 30px;
-  //         position: absolute;
-  //         top: 5px;
-  //         left: 5px;
-  //         width: 80px;
-  //         height: 30px;
-  //         display: flex;
-  //         justify-content: center;
-  //         align-items: center;
-  //         background: #000;
-  //         opacity: 0.7;
-  //         font-size: 16px;
-  //         color:#fff;
-  //         // font-size: 14px;
-  //       }
-  //       img{
-  //         width: 100%;
-  //         height: 140px;
-  //         object-fit: cover;
-  //       }
-
-  //       .classBlock1{   //中间栏
-  //         margin-bottom: 10px;
-  //         margin-top: 0px;
-  //         box-sizing: border-box;
-  //         padding: 0 5px;
-  //         flex: 1;
-  //         display: flex;
-  //         flex-direction: column;
-  //         justify-content: space-around;
-  //         .classBlock2{   //项目名称
-  //           margin-left: 5px;
-  //           margin-bottom: 4px;
-  //           margin-top: 4px;
-  //           text-align: left;
-  //           font-size: 16px;
-  //         }
-  //         .classBlock3{   //学校、姓名
-  //           box-sizing: border-box;
-  //           padding: 0 5px;
-  //           font-size: 14px;
-  //           width: 100%;
-  //           // margin-top: 10px;
-  //           display: flex;
-  //           flex-wrap: wrap;
-  //           color: #adacac;
-  //           margin: 10px 0 0;
-  //         }
-  //         .classBlock4{  //博客、编号
-  //           margin-top: 4px;
-  //         }
-  //       }
-
-  //       .classBlockBtn{  //按钮栏
-  //         box-sizing: border-box;
-  //         padding:0 6px;
-  //         display: flex;
-  //         flex: 1;
-  //         width: 100%;
-  //         max-height: 40px;
-  //         justify-content: space-around;
-  //         align-items: center;
-  //         background-color:#F5F4F4 ;
-  //         span{
-  //           font-size: 14px;
-  //           color: black;
-  //           transition: .1s;
-  //           cursor: pointer;
-  //           &:hover{
-  //             color: #79a2ff;
-  //           }
-  //         }
-
-  //         .bt1{
-  //           width: 100px;
-  //           height: 35px;
-  //           font-size: 14px;
-  //         }
-  //       }
-  //   }
-  // }
 
   .endDialog {
     //结项对话框的

src/views/projectManage/components/Closingstatement.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 结项书组件 -->
-  <div ref="downPDF">
+  <div ref="downPDF" v-if="myArrayProp.length">
     <!-- <header>创新创业学院管理系统</header> -->
     <div class="onePage">
       <div class="titSchool">深圳技师学院</div>
@@ -1171,9 +1171,9 @@
         <tr style="height: 350px">
           <td class="vertical">专家意见</td>
           <td colspan="7" style="position: relative">
-            <span v-if="myArrayProp[0][promotion]!=-1" style="position: absolute;left: 15px;top: 15px;">经专家组评审，一致通过，同意该项目立项。</span>
+            <span v-if="myArrayProp[0]['promotion']!=-1" style="position: absolute;left: 15px;top: 15px;">经专家组评审，一致通过，同意该项目立项。</span>
             <div
-              :class="myArrayProp[0].opinion.length > 0 ? 'bigBlock' : 'noFileBox'"
+              :class="!!myArrayProp[0].opinion ? 'bigBlock' : 'noFileBox'"
             >
               <div
                 class="fileBlock"
@@ -1742,6 +1742,7 @@ export default {
     changeInput() {
       this.$emit("myArrayProp2:update", this.myArrayProp);
     },
+    // 获取代办公文审批
     getSign() {
       let param = {
         pid: this.iid,
@@ -1751,6 +1752,7 @@ export default {
       this.ajax.get(this.$store.state.api + "/selectSign", param).then(
         (res) => {
           this.qpList = res.data[0];
+          // console.log('this.qpList',this.qpList);
         },
         (err) => {
           console.log(err);
@@ -2055,17 +2057,18 @@ export default {
     myArrayProp2: {
       handler(newVal) {
         if (newVal) {
-          this.myArrayProp = JSON.parse(JSON.stringify(this.myArrayProp2));
+          this.myArrayProp = JSON.parse(JSON.stringify(newVal));
           this.getPrice(1);
         }
       },
       deep: true,
     },
   },
-  mounted() {
+  created() {
     // console.log(this.myArrayProp);
     //    this.getData();
     this.myArrayProp = JSON.parse(JSON.stringify(this.myArrayProp2));
+    // console.log('this.myArrayProp',this.myArrayProp);
     this.getPrice(1);
     this.getSign();
   },

src/views/projectManage/components/Closingstatement1.vue

@@ -6,6 +6,7 @@
       :myArrayProp2="myArrayProp"
       :iid="iid"
       :isDownPdf="isDownPdf"
+      :key="myArrayProp.toString()"
     ></Closingstatement>
 <!-- 
     <div
@@ -70,7 +71,7 @@ export default {
               }
             }
           });
-          console.log(num);
+          // console.log(num);
 
           let data = res.data[0];
 
@@ -79,7 +80,7 @@ export default {
           if (data[0].multiSelectProject != null) {
             data[0].multiSelectProject = JSON.parse(data[0].multiSelectProject);
           }
-					data[0].promotion = data[0].promotion.indexOf(data.ProjectNo);
+					data[0].promotion = data[0].promotion.indexOf(data[0].ProjectNo);
 
           data[0].money = JSON.parse(data[0].money);
           data[0].ClosingstatementData = data[0].ClosingstatementData
@@ -88,10 +89,11 @@ export default {
           if (data[0].opinion != null) {
             data[0].opinion = JSON.parse(data[0].opinion);
           }
-          this.myArrayProp = data;
-          this.myArrayProp[0].actualuse = num; //添加已经使用过的经费
+          data[0].actualuse = num; //添加已经使用过的经费
 
-          console.log(this.myArrayProp);
+          this.myArrayProp = data;
+          console.log('11111');
+          // console.log(this.myArrayProp);
         })
         .catch((err) => {
           console.log(err);