xujun

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

@@ -666,6 +666,10 @@ const projectKPI = {
   projDeadline: "",
   startDate: "",
   endData: "",
+  yearTarget: "",
+  year1Goal: "",
+  year2Goal: "",
+  year3Goal: "",
   totalBudget: 0.00,
   applyFunds: 0.00,
   selfFunds: 0.00,
@@ -686,6 +690,7 @@ const projectKPI = {
   sustainableTarget: 0, //二级指标(可持续影响指标)
   serviceTarget: 0, //二级指标(服务对象满意度指标)
   threeLevel: [],
+  kpiList: [],
 };
 
 export default {
@@ -747,6 +752,10 @@ export default {
         economyTarget: null,
         achievementTarget: null,
         otherTarget: null,
+        yearTarget: null,
+        year1Goal: null,
+        year2Goal: null,
+        year3Goal: null,
         projectKPI: projectKPI,
         unitPayment: [],
         cooperativeUnits: [],
@@ -862,9 +871,15 @@ export default {
         this.formData.fileList = []
       }
     },
-    //processProjectYearTarget
+    processProjectYearTarget() {
+      this.formData.yearTarget = this.formData.projectKPI.yearTarget
+      this.formData.year1Goal = this.formData.projectKPI.year1Goal
+      this.formData.year2Goal = this.formData.projectKPI.year2Goal
+      this.formData.year3Goal = this.formData.projectKPI.year3Goal
+      this.formData.projectKPI.kpiList = this.formData.projectKPI.threeLevel
+    },
     save () {
-      console.log(this.formData)
+      this.processProjectYearTarget()
       if (this.checkProjName()) {
         this.$emit('load', true)
         let pars = isEmptyParams(this.formData)
@@ -882,6 +897,7 @@ export default {
       }
     },
     submit () {
+      this.processProjectYearTarget()
       if (this.formData.members.length == 0) {
         this.$message.error('至少添加一位项目组成员！')
         return

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

@@ -52,22 +52,38 @@
           <td colspan="7">{{ parseFloat(projectKPI.yearSelf).toFixed(2) }}</td>
         </tr> -->
       <tr>
-        <td rowspan="3" class="bg-title">总体考核目标</td>
+        <td rowspan="3" class="bg-title" style="width: 100px;">总体考核目标</td>
         <td colspan="10" class="bg-title">
           总体目标({{ moment(projectKPI.startDate).year() }}年—{{moment(projectKPI.endDate).year()}}年)
         </td>
         <td class="bg-title" colspan="9">分年度指标</td>
       </tr>
       <tr>
-        <td colspan="10" rowspan="2"></td>
+        <td colspan="10" rowspan="2">
+          <a-form-model-item :prop="'projectKPI.yearTarget'" :rules="{required: true, message: '*', trigger: 'blur',}">
+            <a-textarea placeholder="总体目标" v-model="projectKPI.yearTarget" :maxLength="600" style="width: 400px; height: 100px;" />
+          </a-form-model-item>
+        </td>
         <td class="target-value" colspan="3">{{ moment(projectKPI.startDate).year() }}年</td>
         <td class="target-value" colspan="3">{{ moment(projectKPI.startDate).add(1, 'year').year() }}年</td>
         <td class="target-value" colspan="3">{{ moment(projectKPI.startDate).add(2, 'year').year() }}年</td>
       </tr>
       <tr>
-        <td colspan="3"></td>
-        <td colspan="3"></td>
-        <td colspan="3"></td>
+        <td colspan="3">
+          <a-form-model-item :prop="'projectKPI.year1Goal'" :rules="{required: true, message: '*', trigger: 'blur',}">
+            <a-textarea v-model="projectKPI.year1Goal" :maxLength="200" style="width: 200px; height: 60px;" />
+          </a-form-model-item>
+        </td>
+        <td colspan="3">
+          <a-form-model-item :prop="'projectKPI.year2Goal'" :rules="{required: true, message: '*', trigger: 'blur',}">
+            <a-textarea v-model="projectKPI.year2Goal" :maxLength="200" style="width: 200px; height: 60px;" />
+          </a-form-model-item>
+        </td>
+        <td colspan="3">
+          <a-form-model-item :prop="'projectKPI.year3Goal'" :rules="{required: true, message: '*', trigger: 'blur',}">
+            <a-textarea v-model="projectKPI.year3Goal" :maxLength="200" style="width: 200px; height: 60px;" />
+          </a-form-model-item>
+        </td>
       </tr>
       <tr>
         <td :rowspan="projectKPI.totalRowSpan"></td>

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

@@ -26,6 +26,10 @@ const projectKPI = {
   projDeadline: "",
   startDate: "",
   endData: "",
+  yearTarget: "",
+  year1Goal: "",
+  year2Goal: "",
+  year3Goal: "",
   totalBudget: 0.00,
   applyFunds: 0.00,
   selfFunds: 0.00,
@@ -46,6 +50,7 @@ const projectKPI = {
   sustainableTarget: 0, //二级指标(可持续影响指标)
   serviceTarget: 0, //二级指标(服务对象满意度指标)
   threeLevel: [],
+  kpiList: [],
 };
 
 import { budgetList } from '@/views/report/project/config'
@@ -113,6 +118,10 @@ export default {
         economyTarget: null,
         achievementTarget: null,
         otherTarget: null,
+        yearTarget: null,
+        year1Goal: null,
+        year2Goal: null,
+        year3Goal: null,
         projectKPI: projectKPI,
         cooperativeUnits: [],
         members: [],