3333

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

@@ -48,7 +48,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>组织机构代码/统一社会信用代码</div>
+            <div class="required">组织机构代码/统一社会信用代码</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -64,7 +64,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>通讯地址</div>
+            <div class="required">通讯地址</div>
           </div>
         </a-col>
         <a-col :span="20">
@@ -80,7 +80,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>注册所在地</div>
+            <div class="required">注册所在地</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -94,7 +94,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>邮编</div>
+            <div class="required">邮编</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -110,7 +110,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>法定代表人</div>
+            <div class="required">法定代表人</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -124,7 +124,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>职工总数</div>
+            <div class="required">职工总数</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -140,7 +140,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>其中专科以上人员</div>
+            <div class="required">其中专科以上人员</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -154,7 +154,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>研究开发人员</div>
+            <div class="required">研究开发人员</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -170,7 +170,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>开户银行</div>
+            <div class="required">开户银行</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -184,7 +184,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>银行账号</div>
+            <div class="required">银行账号</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -197,10 +197,10 @@
           </div>
         </a-col>
       </a-row>
-      <a-row type="flex">
+      <!-- <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>开户银行地址</div>
+            <div class="required">开户银行地址</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -214,7 +214,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>银行联行号</div>
+            <div class="required">银行联行号</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -226,11 +226,11 @@
             </div>
           </div>
         </a-col>
-      </a-row>
+      </a-row> -->
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>上年度研发经费支出总额(单位:万元)</div>
+            <div class="required">上年度研发经费支出总额(单位:万元)</div>
           </div>
         </a-col>
         <a-col :span="20">
@@ -246,7 +246,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>上年度是否填报了研发活动情况</div>
+            <div class="required">上年度是否填报了研发活动情况</div>
           </div>
         </a-col>
         <a-col :span="20">
@@ -262,7 +262,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>上一年度填报的研发投入总数(单位:万元)</div>
+            <div class="required">上一年度填报的研发投入总数(单位:万元)</div>
           </div>
         </a-col>
         <a-col :span="20">
@@ -278,7 +278,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>上一年度填报的研发人员数</div>
+            <div class="required">上一年度填报的研发人员数</div>
           </div>
         </a-col>
         <a-col :span="20">
@@ -722,8 +722,8 @@ export default {
         researchPersonnel: [{ required: true, message: '请填写研究开发人员', trigger: 'blur' },],
         depositBank: [{ required: true, message: '请填写开户银行', trigger: 'blur' },],
         bankAccount: [{ required: true, message: '请填写银行账号', trigger: 'blur' },],
-        depositBankAddress: [{ required: true, message: '请填写开户银行地址', trigger: 'blur' },],
-        interbankNumber: [{ required: true, message: '请填写开户银行地址', trigger: 'blur' },],
+        depositBankAddress: [{ required: false, message: '请填写开户银行地址', trigger: 'blur' },],
+        interbankNumber: [{ required: false, message: '请填写开户银行地址', trigger: 'blur' },],
         researchTotal: [{ required: true, message: '请填写上年度研发经费支出总额', trigger: 'blur' },],
         isResearchActive: [{ required: true, message: '请选择上年度是否填报了研发活动情况', trigger: 'change' },],
         researchCount: [{ required: true, message: '请填写上一年度填报的研发投入总数', trigger: 'blur' },],

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

@@ -185,10 +185,24 @@
       </a-col>
       <a-col :span="4" class="bg-gray">
         <div class="special-middle">
-          <div>上年度研发经费支出总额(单位:万元)</div>
+          <div>银行联行号</div>
         </div>
       </a-col>
       <a-col :span="8">
+        <div class="special-middle">
+          <div>
+            {{ value.interbankNumber }}
+          </div>
+        </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 class="special-middle">
           <div>
             {{ value.researchTotal }}
@@ -202,7 +216,7 @@
           <div>上年度是否填报了研发活动情况</div>
         </div>
       </a-col>
-      <a-col :span="8">
+      <a-col :span="20">
         <div class="special-middle">
           <div>
             {{ value.isResearchActive }}
@@ -619,7 +633,7 @@
     <!-- 设备费-购置设备预算明细表 -->
     <equipments-info :equipments.sync="value.equipments" />
     <!-- 设备费-购置设备预算明细表 -->
-    <unit-payment-info :unitPayment.sync="value.unitPayment"/>
+    <unit-payment-info :unitPayment.sync="value.unitPayment" />
     <!-- 项目绩效目标表v-if="value.projState >= 50" -->
     <project-kpi v-if="value.projectKPI" :projectKPI.sync="value.projectKPI" />