ly 1 жил өмнө
parent
commit
b1d8dd9b9e

+ 2 - 2
src/views/business/crm/company/index.vue

@@ -172,8 +172,8 @@
   const multiple = ref(true);
   const total = ref(0);
   const choiceType = ref("");
-  const flag = ref(checkPermission(['business:customer:person']))
-  const flag2 = ref(checkPermission(['business:customer:myself']))
+  const flag = ref(checkPermission(['business:company:person']))
+  const flag2 = ref(checkPermission(['business:company:myself']))
   const activeName = flag.value ? ref('first') : ref('second');
   const open = ref(false);
   const title = ref("");

+ 10 - 3
src/views/business/housingFund/declare/view.vue

@@ -56,7 +56,7 @@
             </el-col>
             <el-col :span="24">
               <div style="display: flex; justify-content: flex-end;margin-bottom: 10px;">
-                <el-button type="primary">导出明细表</el-button>
+                <el-button type="primary"  @click="exportExcel">导出明细表</el-button>
               </div>
             </el-col>
             <el-table :data="housingFundPersonList" border style="width: 100%" show-summary
@@ -152,7 +152,7 @@
 <script setup>
   import {
     getDetail,
-    saveDetail, turnBackDetail
+    saveDetail, turnBackDetail,exportDetail
   } from "@/api/business/production/housingFundDeclare";
   import { getMembers, getMembersNoDelete } from "@/api/business/production/housingFundDeclare";
   import { uploadFile } from "@/api/tool/file";
@@ -443,7 +443,14 @@ return sums
       form.value.individualAmount == null ? 0 : form.value.individualAmount;
     form.value.amount = amount;
   }
-
+  function exportExcel() {
+    let data = {
+      "companyId": form.value.companyId,
+      "year": form.value.year,
+      "month": form.value.month
+    }
+    exportDetail(data)
+  }
   function handleDel(row, index) {
     proxy.$modal
       .confirm("确定删除吗?")

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

@@ -68,7 +68,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="单位工伤险比例:">
+              <el-form-item label="单位工伤险比例:" required  label-width="130px">
                 <div v-if="form.status !== 3">
                   <el-input-number v-model="form.injuryRadio" size="small" placeholder="单位医疗险" :precision="2"
                     :controls="false" style="width: 80%;" @change="changeUnitInjuryRadio" />
@@ -692,6 +692,10 @@
         proxy.$modal.msgError("请输入政务网账号");
         return;
       }
+      if (!form.value.injuryRadio) {
+        proxy.$modal.msgError("请输入单位工伤险比例");
+        return;
+      }
       if (!form.value.governmentPassword) {
         proxy.$modal.msgError("请输入政务网密码");
         return;