Merge branch 'dev1.0' of http://192.168.0.200:3000/suf/front-end-BI into dev1.0

src/views/dataSource/annualSetting/components/AnnualGoalAddContent.vue

@@ -60,14 +60,6 @@
             disabled
           ></cy-amount-input>
         </el-form-item>
-        <cy-info-title class="mt-[20px] mb-[20px]">
-          <template #default>
-            年度ROE目标（元）<span class="text-red-500">*</span>
-          </template>
-        </cy-info-title>
-        <div class="table-box w-full">
-          <pure-table :data="roeTableData" :columns="roeColums"></pure-table>
-        </div>
         <cy-info-title class="mt-[20px] mb-[20px]">
           <template #default> NP相关 </template>
         </cy-info-title>
@@ -106,6 +98,14 @@
             disabled
           ></cy-amount-input>
         </el-form-item>
+        <cy-info-title class="mt-[20px] mb-[20px]">
+          <template #default>
+            年度ROE目标（元）<span class="text-red-500">*</span>
+          </template>
+        </cy-info-title>
+        <div class="table-box w-full">
+          <pure-table :data="roeTableData" :columns="roeColums"></pure-table>
+        </div>
       </template>
       <template
         v-if="['assessment_profit', 'refinance'].includes(ruleForm.reportType)"