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

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

@@ -8,7 +8,7 @@
       </a-col>
     </a-row>
     <a-row type="flex" class="row_center">
-      <a-col :span="6" class="bg-gray">
+      <a-col :span="4" class="bg-gray">
         <div class="special-middle">
           <div>预算科目</div>
         </div>
@@ -28,14 +28,14 @@
           <div>自筹资金</div>
         </div>
       </a-col>
-      <a-col :span="9" class="bg-gray">
+      <a-col :span="11" class="bg-gray">
         <div class="special-middle">
           <div>备注</div>
         </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;">
+      <a-col :span="4" style="text-align: left;">
         <div class="special-middle">{{ item.budgetName }}</div>
       </a-col>
       <a-col :span="3">
@@ -57,7 +57,7 @@
           <div v-else>{{parseFloat(item.selfFunds).toFixed(2)}}</div>
         </div>
       </a-col>
-      <a-col :span="9">
+      <a-col :span="11">
         <div class="special-middle">
           <a-form-model-item :prop="'budget.' + index + '.calculationBasis'">
             <a-input v-model="item.calculationBasis" :maxLength="100" style="width: 90%;" />

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

@@ -8,7 +8,7 @@
         </a-col>
       </a-row>
       <a-row type="flex" class="row_center">
-        <a-col :span="6" class="bg-gray">
+        <a-col :span="4" class="bg-gray">
           <div class="special-middle">
             <div>预算科目</div>
           </div>
@@ -28,7 +28,7 @@
             <div>自筹资金</div>
           </div>
         </a-col>
-        <a-col :span="9" class="bg-gray">
+        <a-col :span="11" class="bg-gray">
           <div class="special-middle">
             <div>备注</div>
           </div>
@@ -36,7 +36,7 @@
       </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;">
+        <a-col :span="4" style="text-align: left;">
           <div class="special-middle">{{ item.budgetName }}</div>
         </a-col>
         <a-col :span="3">
@@ -48,7 +48,7 @@
         <a-col :span="3">
           <div class="special-middle">{{parseFloat(item.selfFunds).toFixed(2)}}</div>
         </a-col>
-        <a-col :span="9">
+        <a-col :span="11">
           <div class="special-middle">{{ item.calculationBasis }}</div>
         </a-col>
       </a-row>