Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/report/project/components/projectEdit.vue

@@ -468,7 +468,7 @@
         </a-col>
         <a-col :span="8">
           <a-form-model-item prop="totalFunding">
-            <a-input-number v-model="formData.totalFunding" :min="0" :step="0.01" style="width: 100px" />
+            <a-input-number v-model="formData.totalFunding" @change="totalFundingChange" :min="0" :step="0.01" style="width: 100px" />
             <span> 单位：万元</span>
           </a-form-model-item>
         </a-col>
@@ -479,7 +479,7 @@
         </a-col>
         <a-col :span="8">
           <a-form-model-item prop="govFunding">
-            <a-input-number v-model="formData.govFunding" :min="0" :step="0.01" style="width: 100px" />
+            <a-input-number v-model="formData.govFunding" @change="govFundingChange" :min="0" :step="0.01" style="width: 100px" />
             <span> 单位：万元</span>
           </a-form-model-item>
         </a-col>
@@ -568,7 +568,7 @@ const projectKPI = {
   reportYear: "",
   projName: "",
   appUnitName: "",
-  meanagerDept: "",
+  managerDept: "",
   projAttribute: "",
   projDeadline: "",
   startDate: "",
@@ -677,7 +677,7 @@ export default {
         projectSubList: [],
         managementRuleList: [],
         fileList: [],
-        meanagerDept: "",
+        managerDept: "",
       },
       rules: {
         mainResearchAreas: [{ required: true, message: '请填写主要研究领域', trigger: 'blur' },],
@@ -793,7 +793,8 @@ export default {
       this.formData.year2Goal = this.formData.projectKPI.year2Goal
       this.formData.year3Goal = this.formData.projectKPI.year3Goal
       this.formData.projectKPI.kpiList = this.formData.projectKPI.threeLevel
-      this.formData.meanagerDept = this.formData.projectKPI.meanagerDept
+      this.formData.managerDept = this.formData.projectKPI.managerDept
+      this.formData.projAttribute = this.formData.projectKPI.projAttribute
     },
     save () {
       this.processProjectYearTarget()
@@ -860,6 +861,12 @@ export default {
         let projDeadline = moment(this.formData.startDate).format('YYYY-MM-DD') + "至" + moment(this.formData.endDate).format('YYYY-MM-DD')
         this.formData.projectKPI.projDeadline = projDeadline
       }
+    },
+    totalFundingChange() {
+      this.formData.projectKPI.totalBudget = this.formData.totalFunding
+    },
+    govFundingChange() {
+      this.formData.projectKPI.applyFunds = this.formData.govFunding
     }
   },
   watch: {

src/views/report/project/components/projectKpiInfo.vue

@@ -17,14 +17,14 @@
       </tr>
       <tr>
         <td class="bg-title">主管处室</td>
-        <td colspan="10"></td>
+        <td colspan="10">{{ projectKPI.managerDept }}</td>
         <td colspan="2" class="bg-title">实施单位</td>
         <td colspan="7">{{ projectKPI.appUnitName }}</td>
       </tr>
         <tr>
           <td class="bg-title">项目属性</td>
           <td colspan="10">
-            <a-radio-group v-model="projectKPI.projAttribute" disabled="false">
+            <a-radio-group v-model="projectKPI.projAttribute" :disabled="disabled">
               <a-radio :value="projAttributes[0].id">{{projAttributes[0].name}}</a-radio>
               <a-radio :value="projAttributes[1].id">{{projAttributes[1].name}}</a-radio>
             </a-radio-group>
@@ -117,6 +117,7 @@ export default {
         { id: "5b9d6509-aece-11ef-b6cb-0c42a1380f01", name: "新增项目" },
         { id: "5b9d6509-aece-11ef-b6cb-0c42a1380f02", name: "延期项目" },
       ],
+      disabled: true,
     };
   },
   created () {

src/views/report/project/components/projectView.vue

@@ -22,7 +22,7 @@ const projectKPI = {
   reportYear: "",
   projName: "",
   appUnitName: "",
-  meanagerDept: "",
+  managerDept: "",
   projAttribute: "",
   projDeadline: "",
   startDate: "",
@@ -133,7 +133,7 @@ export default {
         projectSubList: [],
         managementRuleList: [],
         fileList: [],
-        meanagerDept: "",
+        managerDept: "",
       },
       loading: false,
       projType: getType()