Browse Source

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

sufan 4 months ago
parent
commit
9cce67a65e
1 changed files with 26 additions and 26 deletions
  1. 26 26
      src/views/dataSource/annualSetting/components/AnnualGoalAddContent.vue

+ 26 - 26
src/views/dataSource/annualSetting/components/AnnualGoalAddContent.vue

@@ -35,6 +35,31 @@
         </el-radio-group>
       </el-form-item>
       <template v-if="ruleForm.reportType == 'NP/ROE'">
+        <cy-info-title class="mt-[20px] mb-[20px]">
+          <template #default> 股东要求ROE(SH_ROE) </template>
+          <template #right>
+            <div>
+              <el-button @click="handleCalculate" type="primary"
+                >一键测算</el-button
+              >
+            </div>
+          </template>
+        </cy-info-title>
+        <el-form-item label="股东要求ROE(SH_ROE)" prop="sHROE">
+          <cy-amount-input
+            v-model="ruleForm.sHROE"
+            unit="%"
+            placeholder="请输入股东要求"
+            :disabled="VRoute.query.type == 'see'"
+          ></cy-amount-input>
+        </el-form-item>
+        <el-form-item label="年末平均净资产(ANA)" prop="aNA">
+          <cy-amount-input
+            v-model="ruleForm.aNA"
+            unit="元"
+            disabled
+          ></cy-amount-input>
+        </el-form-item>
         <cy-info-title class="mt-[20px] mb-[20px]">
           <template #default> NP相关 </template>
         </cy-info-title>
@@ -73,31 +98,6 @@
             disabled
           ></cy-amount-input>
         </el-form-item>
-        <cy-info-title class="mt-[20px] mb-[20px]">
-          <template #default> 股东要求ROE(SH_ROE) </template>
-          <template #right>
-            <div>
-              <el-button @click="handleCalculate" type="primary"
-                >一键测算</el-button
-              >
-            </div>
-          </template>
-        </cy-info-title>
-        <el-form-item label="股东要求ROE(SH_ROE)" prop="sHROE">
-          <cy-amount-input
-            v-model="ruleForm.sHROE"
-            unit="%"
-            placeholder="请输入股东要求"
-            :disabled="VRoute.query.type == 'see'"
-          ></cy-amount-input>
-        </el-form-item>
-        <el-form-item label="年末平均净资产(ANA)" prop="aNA">
-          <cy-amount-input
-            v-model="ruleForm.aNA"
-            unit="元"
-            disabled
-          ></cy-amount-input>
-        </el-form-item>
         <cy-info-title class="mt-[20px] mb-[20px]">
           <template #default>
             年度ROE目标(元)<span class="text-red-500">*</span>
@@ -406,8 +406,8 @@
       })
       return false
     }
+    // 'orgInternalCode',
     const requiredFeilds = [
-      'orgInternalCode',
       'janIndex',
       'febIndex',
       'marIndex',