Selaa lähdekoodia

表单逻辑修改

Q-ABAB 2 vuotta sitten
vanhempi
commit
ca79f78f12
2 muutettua tiedostoa jossa 7 lisäystä ja 5 poistoa
  1. 3 2
      src/components/MakerSpaceWordPreview.vue
  2. 4 3
      src/components/tool/getWord.js

+ 3 - 2
src/components/MakerSpaceWordPreview.vue

@@ -325,8 +325,9 @@ export default {
   methods:{
     handleData(){
       //处理项目数据
-      let data = this.data[0];
-      let fund = this.data[1];
+      let data = {},fund = [];
+      Object.assign(data,this.data[0])
+      Object.assign(fund,this.data[1])
       data['chapters'] = JSON.parse(data['chapters']);
       data['course_teacher'] = JSON.parse(data['course_teacher']);
       data['course_student'] = JSON.parse(data['course_student']);

+ 4 - 3
src/components/tool/getWord.js

@@ -23,9 +23,9 @@ function MakerSpaceWord(data,fund){
             const doc = new Docxtemplater().loadZip(zip);
             console.log(data)
             //处理项目数据
-            // data['chapters'] = JSON.parse(data['chapters']);
-            // data['course_teacher'] = JSON.parse(data['course_teacher']);
-            // data['course_student'] = JSON.parse(data['course_student']);
+            data['chapters'] = JSON.parse(data['chapters']);
+            data['course_teacher'] = JSON.parse(data['course_teacher']);
+            data['course_student'] = JSON.parse(data['course_student']);
             //处理资金使用情况
             let fundDataArray = [];
             fund.forEach(item=>{
@@ -41,6 +41,7 @@ function MakerSpaceWord(data,fund){
                     Transaction:"",TransactionRemarks:""
                 }
                 //直接经费
+
                 let direct = JSON.parse(item['directFund']);
                 //间接经费
                 let indirect = JSON.parse(item['indirectFund']);