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

src/views/report/project/components/budgetEdit.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>
@@ -34,7 +34,6 @@
         </div>
       </a-col>
     </a-row>
-
     <a-row v-for="(item, index) in budget" :key="index" type="flex" class="row_center">
       <a-col :span="6" style="text-align: right;">
         <div class="special-middle">{{ item.budgetName }}</div>
@@ -43,21 +42,27 @@
         <div class="special-middle">{{parseFloat(item.totalBudget).toFixed(2)}}</div>
       </a-col>
       <a-col :span="3">
-        <a-form-model-item v-if="!invisibleApplyFunds.includes(index)" :prop="'budget.' + index + '.applyFunds'" :rules="{required: true, message: '*', trigger: 'blur',}">
-          <a-input-number v-model="item.applyFunds" @change="outNumberChange(index)" :min="0" :step="0.01" style="width: 80%" />
-        </a-form-model-item>
-        <div class="special-middle" v-else>{{parseFloat(item.applyFunds).toFixed(2)}}</div>
+        <div class="special-middle">
+          <a-form-model-item v-if="!invisibleApplyFunds.includes(index)" :prop="'budget.' + index + '.applyFunds'" :rules="{required: true, message: '*', trigger: 'blur',}">
+            <a-input-number v-model="item.applyFunds" @change="outNumberChange(index)" :min="0" :step="0.01" style="width: 80%" />
+          </a-form-model-item>
+          <div v-else>{{parseFloat(item.applyFunds).toFixed(2)}}</div>
+        </div>
       </a-col>
       <a-col :span="3">
-        <a-form-model-item v-if="!invisibleSelfFunds.includes(index)" :prop="'budget.' + index + '.selfFunds'" :rules="{required: true, message: '*', trigger: 'blur',}">
-          <a-input-number v-model="item.selfFunds" @change="outNumberChange(index)" :min="0" :step="0.01" style="width: 80%" />
-        </a-form-model-item>
-        <div class="special-middle" v-else>{{parseFloat(item.selfFunds).toFixed(2)}}</div>
+        <div class="special-middle">
+          <a-form-model-item v-if="!invisibleSelfFunds.includes(index)" :prop="'budget.' + index + '.selfFunds'" :rules="{required: true, message: '*', trigger: 'blur',}">
+            <a-input-number v-model="item.selfFunds" @change="outNumberChange(index)" :min="0" :step="0.01" style="width: 80%" />
+          </a-form-model-item>
+          <div v-else>{{parseFloat(item.selfFunds).toFixed(2)}}</div>
+        </div>
       </a-col>
       <a-col :span="9">
-        <a-form-model-item :prop="'budget.' + index + '.calculationBasis'">
-          <a-input v-model="item.calculationBasis" :maxLength="100" style="width: 90%;" />
-        </a-form-model-item>
+        <div class="special-middle">
+          <a-form-model-item :prop="'budget.' + index + '.calculationBasis'">
+            <a-input v-model="item.calculationBasis" :maxLength="100" style="width: 90%;" />
+          </a-form-model-item>
+        </div>
       </a-col>
     </a-row>
   </div>
@@ -66,7 +71,7 @@
 // 用法 <budget-edit  :budget.sync="formData.budget" />
 export default {
   name: "BudgetEdit",
-  data() {
+  data () {
     return {
       invisibleTotalBudget: [],
       invisibleApplyFunds: [0, 2, 3, 4, 5, 6, 7, 8, 9],
@@ -81,7 +86,7 @@ export default {
       },
     },
   },
-  created() {},
+  created () { },
   methods: {
     // //资金来源计算
     // calFundFrom() {
@@ -113,40 +118,40 @@ export default {
     //     this.$message.info('资金支出总数不能大于资金来源总数！')
     // },
     //一、资金来源合计
-    calTotalFund() {
+    calTotalFund () {
       this.budget[0].totalBudget = this.budget[0].applyFunds + this.budget[0].selfFunds
     },
     //(一)财政资金
-    calFundFrom() {
+    calFundFrom () {
       this.budget[0].applyFunds = this.budget[1].applyFunds
     },
     //(二)自筹资金
-    calSelfFee() {
+    calSelfFee () {
       this.budget[2].selfFunds = this.budget[3].selfFunds + this.budget[4].selfFunds + this.budget[5].selfFunds + this.budget[6].selfFunds
       this.budget[0].selfFunds = this.budget[2].selfFunds
       this.calRowTotalAmount(2)
     },
     //1.设备费
-    calEquipment() {
+    calEquipment () {
       this.budget[9].applyFunds = this.budget[10].applyFunds + this.budget[11].applyFunds + this.budget[12].applyFunds + this.budget[13].applyFunds
       this.budget[9].selfFunds = this.budget[10].selfFunds + this.budget[11].selfFunds + this.budget[12].selfFunds + this.budget[13].selfFunds
       this.calRowTotalAmount(9)
     },
     //(一)直接费用
-    calDirectFee() {
+    calDirectFee () {
       this.calEquipment()
       this.budget[8].applyFunds = this.budget[9].applyFunds + this.budget[14].applyFunds + this.budget[15].applyFunds + this.budget[16].applyFunds + this.budget[17].applyFunds + this.budget[18].applyFunds + this.budget[19].applyFunds + this.budget[20].applyFunds + this.budget[21].applyFunds
       this.budget[8].selfFunds = this.budget[9].selfFunds + this.budget[14].selfFunds + this.budget[15].selfFunds + this.budget[16].selfFunds + this.budget[17].selfFunds + this.budget[18].selfFunds + this.budget[19].selfFunds + this.budget[20].selfFunds + this.budget[21].selfFunds
       this.calRowTotalAmount(8)
     },
     //二、支出预算合计
-    calFundPayment() {
+    calFundPayment () {
       this.calDirectFee()
       this.budget[7].applyFunds = this.budget[8].applyFunds + this.budget[22].applyFunds
       this.budget[7].selfFunds = this.budget[8].selfFunds + this.budget[22].selfFunds
       this.calRowTotalAmount(7)
     },
-    calRowTotalAmount(index) {
+    calRowTotalAmount (index) {
       this.budget[index].totalBudget = this.budget[index].applyFunds + this.budget[index].selfFunds
     },
     outNumberChange (index) {

src/views/report/project/components/budgetInfo.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>

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

@@ -3,7 +3,7 @@
     <a-row>
       <a-col :span="24">
         <div class="tb-title">
-          <span>附件清单</span>
+          <span>附件信息</span>
         </div>
       </a-col>
     </a-row>

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

@@ -3,7 +3,7 @@
     <a-row>
       <a-col :span="24">
         <div class="tb-title">
-          <span>附件清单</span>
+          <span>附件信息</span>
         </div>
       </a-col>
     </a-row>

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

@@ -695,7 +695,7 @@ import { toTextarea } from '@/views/utils/common'
 
 export default {
   components: {
-    projectMemberInfo, cooperativeUnitsInfo,participateUnitsInfo, budgetInfo, fundPlanInfo, equipmentsInfo, unitPaymentInfo, projectKpiInfo,projectResearchInfo, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
+    projectMemberInfo, cooperativeUnitsInfo, participateUnitsInfo, budgetInfo, fundPlanInfo, equipmentsInfo, unitPaymentInfo, projectKpiInfo, projectResearchInfo, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
   },
   name: "ProjectInfo",
   data () {
@@ -720,17 +720,13 @@ export default {
     if (!!!this.tabsData || this.tabsData.length == 0)
       this.tabsData = [
         { 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: '8', isShow: true },
-        { title: '附件清单', key: '9', isShow: true },
-        { title: '单位科研项目及资金管理制度', key: '10', isShow: true },
-        { title: '诚信承诺书', key: '11', 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 },
       ]
   },
   mounted () {

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

@@ -2,7 +2,7 @@
   <div class="font-line-space">
     <a-row>
       <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
           <span>项目绩效目标表</span>
         </div>
       </a-col>

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

@@ -2,7 +2,7 @@
   <div class="from-table font-line-space">
     <a-row>
         <a-col :span="24">
-          <div class="tb-title">
+          <div class="main-title">
             <span>项目绩效目标表</span>
           </div>
         </a-col>