444

src/components/layout/LayoutMain.vue

@@ -36,13 +36,13 @@ export default {
 
   },
   watch: {
-    $route (to, from) {
-      if (to.path != '/home') {
-        let n = Math.floor(Math.random() * this.transitionArr.length + 1) - 1;
-        this.transitionName = this.transitionArr[n]
-      } else
-        this.transitionName = ''
-    }
+    // $route (to, from) {
+    //   if (to.path != '/home') {
+    //     let n = Math.floor(Math.random() * this.transitionArr.length + 1) - 1;
+    //     this.transitionName = this.transitionArr[n]
+    //   } else
+    //     this.transitionName = ''
+    // }
   }
 }
 </script>

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

@@ -786,6 +786,7 @@
           </a-form-model-item>
         </a-col>
       </a-row>
+      
       <a-row>
         <a-col :span="24" style="border-top: 0px">
           <div class="main-title">

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

@@ -150,7 +150,7 @@
       <a-row type="flex">
         <a-col :span="3" class="bg-gray">
           <div class="special-middle">
-            <div>个人通讯地址</div>
+            <div class="required">个人通讯地址</div>
           </div>
         </a-col>
         <a-col :span="21">
@@ -458,6 +458,93 @@
       </a-row>
       <!-- 项目绩效指标 -->
       <project-kpi-edit :projectKPI.sync="formData.projectKPI" />
+
+      <a-row>
+        <a-col :span="24" style="border-top: 0px">
+          <div class="main-title">
+            <span>项目主要实施内容和目标</span>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="4" class="bg-gray">
+          <div class="special-middle">
+            <div class="required">项目实施目标</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <a-form-model-item prop="researchContent">
+            <a-textarea placeholder="项目实施目标" v-model="formData.researchContent" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
+          </a-form-model-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="24" style="border-top: 0px">
+          <div class="tb-title">
+            <span>项目考核指标</span>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="4" class="bg-gray">
+          <div class="special-middle">
+            <div class="required">主要技术指标</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <a-form-model-item prop="technologyTarget">
+            <a-textarea placeholder="主要技术指标" v-model="formData.technologyTarget" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
+          </a-form-model-item>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="4" class="bg-gray">
+          <div class="special-middle">
+            <div class="required">主要经济指标</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <a-form-model-item prop="economyTarget">
+            <a-textarea placeholder="主要经济指标" v-model="formData.economyTarget" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
+          </a-form-model-item>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="4" class="bg-gray">
+          <div class="special-middle">
+            <div class="required">项目实施中形成的示范基地、中试线、生产线及其规模等</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <a-form-model-item prop="achievementTarget">
+            <a-textarea placeholder="项目实施中形成的示范基地、中试线、生产线及其规模等" v-model="formData.achievementTarget" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
+          </a-form-model-item>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="4" class="bg-gray">
+          <div class="special-middle">
+            <div class="required">科技报告考核指标</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <a-form-model-item prop="technologyReportsTarget">
+            <a-textarea placeholder="科技报告考核指标" v-model="formData.technologyReportsTarget" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
+          </a-form-model-item>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="4" class="bg-gray">
+          <div class="special-middle">
+            <div class="required">其他应考核的指标</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <a-form-model-item prop="otherTarget">
+            <a-textarea placeholder="其他应考核的指标" v-model="formData.otherTarget" :maxLength="10000" style="width: 80%; height: 160px; margin-top: 12px" />
+          </a-form-model-item>
+        </a-col>
+      </a-row>
       <a-row type="flex">
         <a-col :span="24" style="text-align: center;">
           <div class="special-middle">
@@ -587,25 +674,32 @@ export default {
         titleName: null,
         mobile: null,
         email: null,
-        jobTime: null,
-        address: null,
         appUnitName: null,
-        mainResearchAreas: null,
         unitLinkName: null,
         unitLinkMobile: null,
         unitLinkEmail: null,
         unitLinkFax: null,
         projName: null,
         knowledgeId: null,
-        subjectScope: null,
-        projClass: null,
-        remark: null,
         startDate: null,
         endDate: null,
-        totalFunding: null,
-        govFunding: null,
+        projClass: null,
+        jobTime: null,
+        mainResearchAreas: null,
+        address: null,
+        subjectScope: null,
         projAbstract: null,
         projKeywords: null,
+        totalFunding: null,
+        govFunding: null,
+        unitFunding: null,
+        selfFunding: null,
+        researchContent: null,
+        technologyTarget: null,
+        economyTarget: null,
+        achievementTarget: null,
+        otherTarget: null,
+        remark: null,
         yearTarget: null,
         year1Goal: null,
         year2Goal: null,
@@ -638,6 +732,12 @@ export default {
         govFunding: [{ required: true, message: '请填写申请科技经费', trigger: 'blur' },],
         projAbstract: [{ required: true, message: '请填写项目摘要', trigger: 'blur' },],
         projKeywords: [{ required: true, message: '请填写关键词', trigger: 'blur' },],
+        researchContent: { required: true, message: '请填写项目实施目标', trigger: 'blur' },
+        technologyTarget: { required: true, message: '请填写主要技术指标', trigger: 'blur' },
+        economyTarget: { required: true, message: '请填写主要经济指标', trigger: 'blur' },
+        achievementTarget: [{ required: true, message: '请填写项目实施中形成的示范基地、中试线、生产线及其规模等', trigger: 'blur' },],
+        technologyReportsTarget: { required: true, message: '请填写科技报告考核指标', trigger: 'blur' },
+        otherTarget: { required: true, message: '请填写其他应考核的指标', trigger: 'blur' },
         downloadUrl: [{ required: true, message: '请填写关键词', trigger: 'blur' },],
       },
     }