ly 1 rok pred
rodič
commit
030d0af2dc

+ 5 - 4
src/views/business/housingFund/declare/form.vue

@@ -6,6 +6,9 @@
       <div style="padding: 8px 24px 16px 24px">
         <el-form size="small" label-width="120px" v-model="form">
           <el-row :gutter="30">
+            <el-col :span="24" style="text-align: right; margin-bottom: 10px;">
+              <el-button size="small" type="success" @click="getHistory">历史记录</el-button>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="客户名称">
                 <div>{{ form.companyName }}</div>
@@ -55,9 +58,7 @@
                 <div>{{ form.housingFundDeductionPassword }}</div>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="text-align: right;">
-              <el-button size="small" type="success" @click="getHistory">历史记录</el-button>
-            </el-col>
+    
             <el-col :span="24">
               <div style="display: flex; justify-content: flex-end;margin-bottom: 10px;margin-top: 10px;"
                 v-hasPermi="['business:housingFundDeclare:exportDetail']">
@@ -159,7 +160,7 @@
     </div>
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
-    <history ref="fromDialog" :currentMember=currentMember></history>
+    <history ref="fromDialog" :currentMember="form.companyName"></history>
   </el-dialog>
 </template>
 <script setup>

+ 1 - 1
src/views/business/housingFund/declare/view.vue

@@ -155,7 +155,7 @@
     </div>
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
-    <history ref="fromDialog" :currentMember=currentMember></history>
+    <history ref="fromDialog" :currentMember="form.companyName"></history>
     <el-dialog title="退回" v-model="returnFlag" width="720px" append-to-body size="small" draggable
     :close-on-click-modal="false">
     <el-form-item label="退回理由" prop="refuseReason" style="margin-top: 10px">

+ 5 - 4
src/views/business/socialSecurity/declare/form.vue

@@ -10,6 +10,9 @@
       <div style="padding: 8px 24px 16px 24px">
         <el-form size="small" label-width="100px" v-model="form">
           <el-row :gutter="30">
+            <el-col :span="24" style="text-align: right;margin-bottom: 10px;">
+              <el-button size="small" type="success" @click="getHistory">历史记录</el-button>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="客户名称">
                 <div>{{ form.companyName }}</div>
@@ -77,9 +80,7 @@
                 <div v-else>{{ rowNum(form.injuryRadio) }}</div>
               </el-form-item>
             </el-col>
-            <el-col :span="12" style="text-align: right;">
-              <el-button size="small" type="success" @click="getHistory">历史记录</el-button>
-            </el-col>
+    
             <el-col :span="24">
               <div style="display: flex; justify-content: flex-end;margin-bottom: 10px;margin-top: 10px;" 
                 v-hasPermi="['business:socialSecurityDeclare:exportDetail']">
@@ -355,7 +356,7 @@
     </div>
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
-    <history ref="fromDialog" :currentMember=currentMember></history>
+    <history ref="fromDialog" :currentMember="form.companyName" ></history>
   </el-dialog>
 </template>
 <script setup>

+ 5 - 4
src/views/business/socialSecurity/declare/view.vue

@@ -10,6 +10,9 @@
       <div style="padding: 8px 24px 16px 24px">
         <el-form size="small" label-width="100px" v-model="form">
           <el-row :gutter="30">
+            <el-col :span="24" style="text-align: right;">
+              <el-button size="small" type="success" @click="getHistory">历史记录</el-button>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="客户名称">
                 <div>{{ form.companyName }}</div>
@@ -72,9 +75,7 @@
                 <div v-else>{{ rowNum(form.injuryRadio) + "%"}}</div>
               </el-form-item>
             </el-col>
-            <el-col :span="12" style="text-align: right;">
-              <el-button size="small" type="success" @click="getHistory">历史记录</el-button>
-            </el-col>
+   
             <el-col :span="24">
               <div style="display: flex; justify-content: flex-end;margin-bottom: 10px;margin-top: 10px;"
                 v-hasPermi="['business:socialSecurityDeclare:exportDetail']">
@@ -361,7 +362,7 @@
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
   </el-dialog>
-  <history ref="fromDialog" :currentMember=currentMember></history>
+  <history ref="fromDialog" :currentMember="form.companyName"></history>
   <el-dialog title="退回" v-model="returnFlag" width="720px" append-to-body size="small" draggable
     :close-on-click-modal="false">
     <el-form-item label="退回理由" prop="refuseReason" style="margin-top: 10px"