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

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

@@ -569,6 +569,7 @@ const projectKPI = {
   reportYear: "",
   projName: "",
   appUnitName: "",
+  meanagerDept: "",
   projAttribute: "",
   projDeadline: "",
   startDate: "",
@@ -677,6 +678,7 @@ export default {
         projectSubList: [],
         managementRuleList: [],
         fileList: [],
+        meanagerDept: "",
       },
       rules: {
         mainResearchAreas: [{ required: true, message: '请填写主要研究领域', trigger: 'blur' },],
@@ -790,6 +792,7 @@ 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
     },
     save () {
       this.processProjectYearTarget()
@@ -852,7 +855,10 @@ export default {
     },
     endDateChange (value, dateString) {
       this.formData.projectKPI.endDate = this.formData.endDate
-      console.log(this.formData.projectKPI)
+      if (this.formData.projectKPI.startDate && this.formData.projectKPI.endDate) {
+        let projDeadline = moment(this.formData.startDate).format('YYYY-MM-DD') + "至" + moment(this.formData.endDate).format('YYYY-MM-DD')
+        this.formData.projectKPI.projDeadline = projDeadline
+      }
     }
   },
   watch: {

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

@@ -8,7 +8,7 @@
       </a-col>
     </a-row>
     <table class="tab-content" cellpadding="3" cellspacing="3" style="width: 98%">
-      <!-- <tr>
+      <tr>
           <td colspan="20" class="bg-title">{{ projectKPI.reportYear }}年度</td>
         </tr>
         <tr>
@@ -16,10 +16,14 @@
           <td colspan="19">{{ projectKPI.projName }}</td>
         </tr>
         <tr>
-          <td class="bg-title">实施单位</td>
-          <td colspan="10">{{ projectKPI.appUnitName }}</td>
-          <td colspan="2" class="bg-title">项目期</td>
-          <td colspan="7">{{ projectKPI.projDeadline }}</td>
+          <td class="bg-title">主管处室</td>
+          <td colspan="10">
+            <a-form-model-item :prop="'projectKPI.managerDept'" :rules="{required: true, message: '*', trigger: 'blur',}">
+              <a-input placeholder="主管处室" v-model="projectKPI.managerDept" :maxLength="50"  />
+            </a-form-model-item>
+          </td>
+          <td colspan="2" class="bg-title">实施单位</td>
+          <td colspan="7">{{ projectKPI.appUnitName }}</td>
         </tr>
         <tr>
           <td class="bg-title">项目属性</td>
@@ -29,8 +33,8 @@
               <a-radio :value="projAttributes[1].id">{{projAttributes[1].name}}</a-radio>
             </a-radio-group>
           </td>
-          <td colspan="2" class="bg-title"></td>
-          <td colspan="7"></td>
+          <td colspan="2" class="bg-title">项目期</td>
+          <td colspan="7">{{ projectKPI.projDeadline }}</td>
         </tr>
         <tr>
           <td rowspan="3" class="bg-title">项目资金(万元)</td>
@@ -50,7 +54,7 @@
           <td colspan="8">{{ parseFloat(projectKPI.selfFunds).toFixed(2) }}</td>
           <td colspan="2" class="bg-title">其他资金</td>
           <td colspan="7">{{ parseFloat(projectKPI.yearSelf).toFixed(2) }}</td>
-        </tr> -->
+        </tr>
       <tr>
         <td rowspan="3" class="bg-title" style="width: 100px;">总体考核目标</td>
         <td colspan="10" class="bg-title">

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

@@ -16,22 +16,22 @@
         <td colspan="19">{{ projectKPI.projName }}</td>
       </tr>
       <tr>
-        <td class="bg-title">实施单位</td>
-        <td colspan="10">{{ projectKPI.appUnitName }}</td>
-        <td colspan="2" class="bg-title">项目期</td>
-        <td colspan="7">{{ projectKPI.projDeadline }}</td>
+        <td class="bg-title">主管处室</td>
+        <td colspan="10"></td>
+        <td colspan="2" class="bg-title">实施单位</td>
+        <td colspan="7">{{ projectKPI.appUnitName }}</td>
       </tr>
-        <!-- <tr>
+        <tr>
           <td class="bg-title">项目属性</td>
           <td colspan="10">
-            <a-radio-group v-model="projectKPI.projAttribute">
+            <a-radio-group v-model="projectKPI.projAttribute" disabled="false">
               <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>
           </td>
-          <td colspan="2" class="bg-title"></td>
-          <td colspan="7"></td>
-        </tr> -->
+          <td colspan="2" class="bg-title">项目期</td>
+          <td colspan="7">{{ projectKPI.projDeadline }}</td>
+        </tr>
       <tr>
         <td rowspan="3" class="bg-title">项目资金(万元)</td>
         <td colspan="2" class="bg-title">总体资金总额：</td>

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

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