12212

20feb1ba · wangxl · 92747789 · 20feb1ba · 20feb1ba · 20feb1ba
Commit 20feb1ba authored Dec 17, 2024 by wangxl
16 changed files
--- a/src/views/report/project/components/deviceEdit.vue
+++ b/src/views/report/project/components/deviceEdit.vue
@@ -2,7 +2,7 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
          <span>设备费-购置设备预算明细表<strong>(金额单位：万元)</strong></span>
        </div>
      </a-col>

--- a/src/views/report/project/components/deviceInfo.vue
+++ b/src/views/report/project/components/deviceInfo.vue
@@ -2,7 +2,7 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
          <span>设备费-购置设备预算明细表<strong>(金额单位：万元)</strong></span>
        </div>
      </a-col>

--- a/src/views/report/project/components/fileEdit.vue
+++ b/src/views/report/project/components/fileEdit.vue
@@ -2,7 +2,7 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
          <span>附件信息</span>
        </div>
      </a-col>

--- a/src/views/report/project/components/fileInfo.vue
+++ b/src/views/report/project/components/fileInfo.vue
@@ -2,7 +2,7 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
          <span>附件信息</span>
        </div>
      </a-col>

--- a/src/views/report/project/components/manufactureEdit.vue
+++ b/src/views/report/project/components/manufactureEdit.vue
@@ -2,7 +2,7 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
+        <div class="mian-title">
          <span>设备费-试制设备预算明细表<strong>(金额单位：万元)</strong></span>
        </div>
      </a-col>

--- a/src/views/report/project/components/manufactureInfo.vue
+++ b/src/views/report/project/components/manufactureInfo.vue
@@ -2,7 +2,7 @@
    <div>
      <a-row>
        <a-col :span="24">
-          <div class="tb-title">
+          <div class="main-title">
            <span>设备费-试制设备预算明细表<strong>(金额单位：万元)</strong></span>
          </div>
        </a-col>

--- a/src/views/report/project/components/participateUnitsEdit.vue
+++ b/src/views/report/project/components/participateUnitsEdit.vue
@@ -3,7 +3,7 @@
    <a-row>
      <a-col :span="24">
        <div class="tb-title">
-          <span>项目主要参与单位及分工</span>
+          <span>项目主要参与单位及分工 <span style="color: red;margin-left: 16px;">(注：若没有填写项，请点击列表后【删除】按钮删除)</span></span>
        </div>
      </a-col>
    </a-row>

--- a/src/views/report/project/components/projStageGoalsEdit.vue
+++ b/src/views/report/project/components/projStageGoalsEdit.vue
@@ -2,7 +2,7 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
          <span>项目实施阶段及任务</span>
        </div>
      </a-col>

--- a/src/views/report/project/components/projStageGoalsInfo.vue
+++ b/src/views/report/project/components/projStageGoalsInfo.vue
@@ -2,7 +2,7 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
          <span>项目实施阶段及任务</span>
        </div>
      </a-col>

--- a/src/views/report/project/components/projectEdit.vue
+++ b/src/views/report/project/components/projectEdit.vue
@@ -281,7 +281,7 @@
      </a-row>

      <!-- 项目合作单位 -->
-      <cooperative-units-edit :cooperativeUnits.sync="formData.cooperativeUnits" />
+      <!-- <cooperative-units-edit :cooperativeUnits.sync="formData.cooperativeUnits" /> -->

      <a-row>
        <a-col :span="24" style="border-top: 0px">
@@ -386,9 +386,9 @@
          </a-form-model-item>
        </a-col>
      </a-row>
-
      <!-- 项目主要参与单位及分工 -->
      <participate-units-edit :participateUnits.sync="formData.participateUnits" />
+
      <a-row>
        <a-col :span="24" style="border-top: 0px">
          <div class="main-title">
@@ -406,36 +406,6 @@
        </a-col>
      </a-row>

-      <!-- 经费预算 -->
-      <budget-edit :budget.sync="formData.budget" />
-      <a-row type="flex">
-        <a-col :span="24" style="text-align: center;">
-          <div class="special-middle">
-            &nbsp;
-          </div>
-        </a-col>
-      </a-row>
-      <!-- 分年度用款计划 -->
-      <fund-plan-edit :fundPlan.sync="formData.fundPlan" @save="planSave" />
-
-      <!-- 项目承担单位研究资金支出预算明细表 -->
-      <unit-payment-edit :unitPayment.sync="formData.unitPayment"/>
-      <!-- <equipments-edit :equipments.sync="formData.equipments" /> -->
-      <!-- 设备费-购置设备预算明细表 -->
-      <device-edit :deviceList.sync="formData.deviceList" />
-      <!-- 设备费-试制设备预算明细表 -->
-      <manufacture-edit :manufactureList.sync:="formData.manufactureList"/>
-
-      <a-row type="flex">
-        <a-col :span="24" style="text-align: center;">
-          <div class="special-middle">
-            &nbsp;
-          </div>
-        </a-col>
-      </a-row>
-      <!-- 项目绩效指标 -->
-      <project-kpi-edit :projectKPI.sync="formData.projectKPI" />
-
      <a-row>
        <a-col :span="24" style="border-top: 0px">
          <div class="main-title">
@@ -560,6 +530,36 @@
        </a-col>
      </a-row>

+      <!-- 经费预算 -->
+      <budget-edit :budget.sync="formData.budget" />
+      <a-row type="flex">
+        <a-col :span="24" style="text-align: center;">
+          <div class="special-middle">
+            &nbsp;
+          </div>
+        </a-col>
+      </a-row>
+      <!-- 分年度用款计划 -->
+      <fund-plan-edit :fundPlan.sync="formData.fundPlan" @save="planSave" />
+
+      <!-- 项目承担单位研究资金支出预算明细表 -->
+      <unit-payment-edit :unitPayment.sync="formData.unitPayment" />
+      <!-- <equipments-edit :equipments.sync="formData.equipments" /> -->
+      <!-- 设备费-购置设备预算明细表 -->
+      <device-edit :deviceList.sync="formData.deviceList" />
+      <!-- 设备费-试制设备预算明细表 -->
+      <manufacture-edit :manufactureList.sync:="formData.manufactureList" />
+
+      <a-row type="flex">
+        <a-col :span="24" style="text-align: center;">
+          <div class="special-middle">
+            &nbsp;
+          </div>
+        </a-col>
+      </a-row>
+      <!-- 项目绩效指标 -->
+      <project-kpi-edit :projectKPI.sync="formData.projectKPI" />
+
      <!-- 项目安排及阶段目标 -->
      <proj-stage-goals-edit :stageGoals.sync="formData.stageGoals" />

@@ -780,7 +780,7 @@ export default {
        this.formData.cooperativeUnits = [{ ...Cooperative }, { ...Cooperative }]

      if (!!!this.formData.participateUnits || this.formData.participateUnits.length == 0)
-        this.formData.participateUnits = [{ ...ParticipateUnit }]
+        this.formData.participateUnits = [{ ...ParticipateUnit }, { ...ParticipateUnit }]

      if (!!!this.formData.members || this.formData.members.length == 0)
        this.formData.members = []

--- a/src/views/report/project/components/projectInfo.vue
+++ b/src/views/report/project/components/projectInfo.vue
@@ -245,7 +245,7 @@
      </a-row>

      <!-- 项目合作单位 -->
-      <cooperative-units-info :cooperativeUnits.sync="value.cooperativeUnits" />
+      <!-- <cooperative-units-info :cooperativeUnits.sync="value.cooperativeUnits" /> -->

      <a-row>
        <a-col :span="24" style="border-top: 0px">
@@ -382,11 +382,10 @@
          </div>
        </a-col>
      </a-row>
+      <!-- 项目主要参与单位及分工 -->
+      <participate-units-info :dataList.sync="value.participateUnits" />
    </div>
    <div v-if="tabsData[2].isShow">
-
-      <!-- 项目合作单位 -->
-      <participate-units-info :dataList.sync="value.participateUnits" />
      <a-row>
        <a-col :span="24" style="border-top: 0px">
          <div class="main-title">
@@ -394,7 +393,6 @@
          </div>
        </a-col>
      </a-row>
-
      <!-- 项目组成员 -->
      <project-member-info :dataList.sync="value.members" />
      <a-row type="flex">
@@ -494,21 +492,82 @@
      </a-row>
    </div>
    <div v-if="tabsData[3].isShow">
-      <project-kpi-info v-if="value.projectKPI" :projectKPI.sync="value.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>项目实施目标</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <div v-html="toTextarea(value.researchContent)"></div>
+        </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>主要技术指标</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <div v-html="toTextarea(value.technologyTarget)"></div>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="4" class="bg-gray">
+          <div class="special-middle">
+            <div>主要经济指标</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <div v-html="toTextarea(value.economyTarget)"></div>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="4" class="bg-gray">
+          <div class="special-middle">
+            <div>项目实施中形成的示范基地、中试线、生产线及其规模等</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <div v-html="toTextarea(value.achievementTarget)"></div>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="4" class="bg-gray">
+          <div class="special-middle">
+            <div>科技报告考核指标</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <div v-html="toTextarea(value.technologyReportsTarget)"></div>
+        </a-col>
+      </a-row>
+      <a-row type="flex">
+        <a-col :span="4" class="bg-gray">
+          <div class="special-middle">
+            <div>其他应考核的指标</div>
+          </div>
+        </a-col>
+        <a-col :span="20">
+          <div v-html="toTextarea(value.otherTarget)"></div>
+        </a-col>
+      </a-row>
    </div>
    <div v-if="tabsData[4].isShow">
-      <!-- 经费预算 -->
-      <budget-info :budget.sync="value.budget" />
-      <!-- 分年度用款计划 -->
-      <fund-plan-info :fundPlan.sync="value.fundPlan" />
-      <!-- 项目承担单位研究资金支出预算明细表 -->
-      <unit-payment-info :unitPayment.sync="value.unitPayment"/>
-      <!-- 设备费-购置设备预算明细表 -->
-      <device-info :deviceList.sync="value.deviceList" />
-      <!-- 设备费-试制设备预算明细表 -->
-      <manufacture-info :manufactureList.sync:="value.manufactureList" />
-    </div>
-    <div v-if="tabsData[5].isShow">
      <a-row>
        <a-col :span="24" style="border-top: 0px">
          <div class="main-title">
@@ -524,12 +583,41 @@
        </a-col>
      </a-row>
    </div>
-
+    <div v-if="tabsData[5].isShow">
+      <!-- 经费预算 -->
+      <budget-info :budget.sync="value.budget" />
+      <a-row type="flex">
+        <a-col :span="24" style="text-align: center;">
+          <div class="special-middle">
+            &nbsp;
+          </div>
+        </a-col>
+      </a-row>
+      <!-- 分年度用款计划 -->
+      <fund-plan-info :fundPlan.sync="value.fundPlan" />
+      <!-- 设备费-购置设备预算明细表 -->
+      <device-info :deviceList.sync="value.deviceList" />
+      <!-- 设备费-试制设备预算明细表 -->
+      <manufacture-info :manufactureList.sync:="value.manufactureList" />
+      <!-- 项目承担单位研究资金支出预算明细表 -->
+      <unit-payment-info :unitPayment.sync="value.unitPayment" />
+    </div>
    <div v-if="tabsData[6].isShow">
+      <!-- 项目安排及阶段目标 -->
+      <proj-stage-goals-info :stageGoals.sync="value.stageGoals" />
+    </div>
+    <div v-if="tabsData[7].isShow">
+      <!-- 项目课题设置 -->
+      <project-sub-info :dataList.sync="value.projectSubList" />
+    </div>
+    <div v-if="tabsData[8].isShow">
+      <project-kpi-info v-if="value.projectKPI" :projectKPI.sync="value.projectKPI" />
+    </div>
+    <div v-if="tabsData[9].isShow">
      <!-- 附件 -->
      <file-info :fileList.sync="value.fileList" />
    </div>
-    <div v-if="tabsData[7].isShow">
+    <div v-if="tabsData[10].isShow">
      <a-row>
        <a-col :span="24">
          <div class="main-title">
@@ -542,10 +630,6 @@
          <audit-list v-model="value.auditList" />
        </a-col>
      </a-row>
-      <!-- 项目安排及阶段目标 -->
-      <proj-stage-goals-info :stageGoals.sync="value.stageGoals" />
-      <!-- 项目课题设置 -->
-      <project-sub-info :dataList.sync="value.projectSubList" />
    </div>

  </div>
@@ -600,11 +684,14 @@ export default {
        { title: '全部', key: '0', isShow: true },
        { title: '项目基本信息', key: '1', isShow: true },
        { title: '项目组主要成员', key: '2', isShow: true },
-        { title: '绩效目标表', key: '3', isShow: true },
-        { title: '项目经费预算表', key: '4', isShow: true },
-        { title: '申请书正文', key: '5', isShow: true },
-        { title: '附件信息', key: '6', isShow: true },
-        { title: '项目审核记录', key: '7', isShow: true },
+        { title: '项目主要实施内容和目标', key: '3', isShow: true },
+        { title: '申请书正文', key: '4', isShow: true },
+        { title: '经费预算及设备明细', key: '5', isShow: true },
+        { title: '项目实施阶段及任务', key: '6', isShow: true },
+        { title: '项目课题设置', key: '7', isShow: true },
+        { title: '绩效目标表', key: '8', isShow: true },
+        { title: '附件信息', key: '9', isShow: true },
+        { title: '项目审核记录', key: '10', isShow: true },
      ]
  },
  mounted () {

--- a/src/views/report/project/components/projectSubEdit.vue
+++ b/src/views/report/project/components/projectSubEdit.vue
@@ -2,8 +2,8 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
-          <span>项目课题设置</span>
+        <div class="main-title">
+          <span>项目课题设置<span style="color: red;margin-left: 16px;">(注：若没有填写项，请点击列表后【删除】按钮删除)</span></span>
        </div>
      </a-col>
    </a-row>

--- a/src/views/report/project/components/projectSubInfo.vue
+++ b/src/views/report/project/components/projectSubInfo.vue
@@ -2,7 +2,7 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
          <span>项目课题设置</span>
        </div>
      </a-col>

--- a/src/views/report/project/components/projectView.vue
+++ b/src/views/report/project/components/projectView.vue
@@ -69,11 +69,14 @@ export default {
        { title: '全部', key: '0', isShow: true },
        { title: '项目基本信息', key: '1', isShow: true },
        { title: '项目组主要成员', key: '2', isShow: true },
-        { title: '绩效目标表', key: '3', isShow: true },
-        { title: '项目经费预算表', key: '4', isShow: true },
-        { title: '申请书正文', key: '5', isShow: true },
-        { title: '附件信息', key: '6', isShow: true },
-        { title: '项目审核记录', key: '7', isShow: true },
+        { title: '项目主要实施内容和目标', key: '3', isShow: true },
+        { title: '申请书正文', key: '4', isShow: true },        
+        { title: '经费预算及设备明细', key: '5', isShow: true },
+        { title: '项目实施阶段及任务', key: '6', isShow: true },
+        { title: '项目课题设置', key: '7', isShow: true },
+        { title: '绩效目标表', key: '8', isShow: true },       
+        { title: '附件信息', key: '9', isShow: true },
+        { title: '项目审核记录', key: '10', isShow: true },
      ],
      formData: {
        id: null,

--- a/src/views/report/project/components/unitPaymentEdit.vue
+++ b/src/views/report/project/components/unitPaymentEdit.vue
@@ -2,7 +2,7 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
          <span>科技计划项目承担单位研究资金支出预算明细表<strong>(金额单位：万元)</strong></span>
        </div>
      </a-col>

--- a/src/views/report/project/components/unitPaymentInfo.vue
+++ b/src/views/report/project/components/unitPaymentInfo.vue
@@ -2,7 +2,7 @@
  <div>
    <a-row>
      <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
          <span>科技计划项目承担单位研究资金支出预算明细表<strong>(金额单位：万元)</strong></span>
        </div>
      </a-col>