结算资金

src/views/projectManage/ProjectManagement.vue

@@ -750,7 +750,18 @@ export default {
                 if (data[0].opinion != null) {
                   data[0].opinion = JSON.parse(data[0].opinion);
                 }
-                data[0].money = JSON.parse(data[0].money);
+                // data[0].money = JSON.parse(data[0].money);
+                data[0].money = data[0].money2?JSON.parse(data[0].money2):{
+                    "device": 0,
+                    "Material": 0,
+                    "processing": 0,
+                    "Collaboration": 0,
+                    "APPRAISAL": 0,
+                    "entery": 0,
+                    "activities": 0,
+                    "Transaction": 0
+                }
+                console.log("👉",data[0])
                 data[0].ClosingstatementData = data[0].ClosingstatementData
                   ? JSON.parse(data[0].ClosingstatementData)
                   : this.submitData;
@@ -760,7 +771,9 @@ export default {
 
                 console.log('this.myArrayProp', this.myArrayProp);
                 // window.open(`/Closingstatement1?iid=${val.courseId}`);
-                this.endDialog = true;
+                this.$nextTick(()=>{
+                  this.endDialog = true;
+                })
               })
               .catch((err) => {
                 console.log(err);
@@ -846,7 +859,16 @@ export default {
           data[0].ClosingstatementData = JSON.parse(
             data[0].ClosingstatementData
           );
-          data[0].money = JSON.parse(data[0].money);
+          data[0].money = data[0].money2?JSON.parse(data[0].money2):{
+              "device": 0,
+              "Material": 0,
+              "processing": 0,
+              "Collaboration": 0,
+              "APPRAISAL": 0,
+              "entery": 0,
+              "activities": 0,
+              "Transaction": 0
+          };
           // data[0].multiSelectProject=JSON.parse(data[0].multiSelectProject)
           if (data[0].opinion != null) {
             data[0].opinion = JSON.parse(data[0].opinion);

src/views/projectManage/components/Closingstatement.vue

@@ -1327,7 +1327,7 @@
           <td class="vertical">专家意见</td>
           <td colspan="7" style="position: relative">
             <span
-              v-if="myArrayProp[0].opinion.find(i=>i.type==2)"
+              v-if="myArrayProp[0].opinion && myArrayProp[0].opinion.find(i=>i.type==2)"
               style="position: absolute; left: 15px; top: 15px"
               >{{ myArrayProp[0].opinion.find(i=>i.type==2).text}}</span
             >

src/views/projectManage/components/Closingstatement1.vue

@@ -8,7 +8,7 @@
       :isDownPdf="isDownPdf"
       :key="myArrayProp.toString()"
     ></Closingstatement>
-<!-- 
+<!--
     <div
       slot="footer"
       class="dialog-footer"
@@ -80,9 +80,19 @@ export default {
           if (data[0].multiSelectProject != null) {
             data[0].multiSelectProject = JSON.parse(data[0].multiSelectProject);
           }
+
 					data[0].promotion = data[0].promotion.indexOf(data[0].ProjectNo);
 
-          data[0].money = JSON.parse(data[0].money);
+          data[0].money = data[0].money2?JSON.parse(data[0].money2):{
+              "device": 0,
+              "Material": 0,
+              "processing": 0,
+              "Collaboration": 0,
+              "APPRAISAL": 0,
+              "entery": 0,
+              "activities": 0,
+              "Transaction": 0
+          };
           data[0].ClosingstatementData = data[0].ClosingstatementData
             ? JSON.parse(data[0].ClosingstatementData)
             : this.submitData;

src/views/projectManage/components/studentProjectWordShow.vue

@@ -555,7 +555,16 @@ export default {
           wordData.teacherS = JSON.parse(data.course_teacher);
           wordData.brief = data.brief;
           wordData.introduce = JSON.parse(data.chapters);
-          wordData.fund = JSON.parse(data.money);
+          wordData.fund = data.money2?JSON.parse(data.money2):{
+              "device": 0,
+              "Material": 0,
+              "processing": 0,
+              "Collaboration": 0,
+              "APPRAISAL": 0,
+              "entery": 0,
+              "activities": 0,
+              "Transaction": 0
+          };
           wordData.dp = data.className;
 					wordData.attachment = data.attachment?JSON.parse(data.attachment):[]
 

src/views/projectSettlement/components/projectSettlementBook.vue

@@ -1297,7 +1297,16 @@ export default {
             };
           }
 
-          data[0].money = JSON.parse(data[0].money);
+          data[0].money = data[0].money2?JSON.parse(data[0].money2):{
+              "device": 0,
+              "Material": 0,
+              "processing": 0,
+              "Collaboration": 0,
+              "APPRAISAL": 0,
+              "entery": 0,
+              "activities": 0,
+              "Transaction": 0
+          };
           this.myArrayProp = data;
           this.myArrayProp[0].actualuse = num; //添加已经使用过的经费
 					this.loading = false;

src/views/projectSettlement/components/studentProjectWordShowNew.vue

@@ -544,7 +544,16 @@
                   wordData.teacherS=JSON.parse(data.course_teacher);
                   wordData.brief=data.brief;
                   wordData.introduce=JSON.parse(data.chapters)
-                  wordData.fund=JSON.parse(data.money)
+                  wordData.fund=data.money2?JSON.parse(data.money2):{
+              "device": 0,
+              "Material": 0,
+              "processing": 0,
+              "Collaboration": 0,
+              "APPRAISAL": 0,
+              "entery": 0,
+              "activities": 0,
+              "Transaction": 0
+          };
 									wordData.attachment = data.attachment?JSON.parse(data.attachment):[]
                   this.downWordData={...wordData,...{etime:data.eTime,btime:data.bTime,dp:data.className}}
 									this.loading = false;