ezhizao_zx 1 год назад
Родитель
Сommit
ae360330d4
37 измененных файлов с 3580 добавлено и 1094 удалено
  1. 36 10
      src/utils/index.js
  2. 3 2
      src/views/business/deduction/HousingFundViewDialog.vue
  3. 127 75
      src/views/business/deduction/MergeTaxViewDialog.vue
  4. 13 12
      src/views/business/deduction/SocialSecurityViewDialog.vue
  5. 344 74
      src/views/business/deduction/index.vue
  6. 235 50
      src/views/business/entrust/deduct/form.vue
  7. 76 19
      src/views/business/entrust/deduct/index.vue
  8. 241 69
      src/views/business/entrust/deposit/index.vue
  9. 164 37
      src/views/business/entrust/entrustOrder/index.vue
  10. 367 120
      src/views/business/entrust/statementAccount/form.vue
  11. 142 38
      src/views/business/housingFund/confirm/view.vue
  12. 2 1
      src/views/business/housingFund/declare/form.vue
  13. 3 2
      src/views/business/housingFund/declare/view.vue
  14. 2 1
      src/views/business/housingFund/memberDialog.vue
  15. 2 1
      src/views/business/production/IndividualIncomeTaxIs/FormDialog.vue
  16. 65 22
      src/views/business/production/IndividualIncomeTaxIs/MemberDialog.vue
  17. 71 29
      src/views/business/production/IndividualIncomeTaxIsZero/MemberDialog.vue
  18. 21 11
      src/views/business/production/financialReportTax/FormDialog.vue
  19. 0 2
      src/views/business/production/financialReportTax/index.vue
  20. 82 23
      src/views/business/production/keepAccount/form.vue
  21. 33 13
      src/views/business/production/keepAccount/view.vue
  22. 26 12
      src/views/business/production/salary/form.vue
  23. 37 24
      src/views/business/production/salary/view.vue
  24. 25 13
      src/views/business/production/salaryZero/form.vue
  25. 230 61
      src/views/business/production/salaryZero/index.vue
  26. 38 24
      src/views/business/production/salaryZero/view.vue
  27. 5 2
      src/views/business/service/loop/housingFundForm.vue
  28. 137 44
      src/views/business/service/loop/housingFundView.vue
  29. 496 111
      src/views/business/service/loop/keepAccountForm.vue
  30. 29 27
      src/views/business/service/loop/keepAccountView.vue
  31. 2 1
      src/views/business/service/loop/socialSecurityForm.vue
  32. 147 54
      src/views/business/service/loop/socialSecurityView.vue
  33. 1 0
      src/views/business/socialSecurity/confirm/form.vue
  34. 181 54
      src/views/business/socialSecurity/confirm/view.vue
  35. 181 42
      src/views/business/socialSecurity/declare/form.vue
  36. 13 12
      src/views/business/socialSecurity/declare/view.vue
  37. 3 2
      src/views/business/socialSecurity/memberDialog.vue

+ 36 - 10
src/utils/index.js

@@ -17,21 +17,47 @@ export function formatDate(cellValue) {
 // 数字格式化
 // 数字格式化
 export function rowNum(num) {
 export function rowNum(num) {
   if (!num) {
   if (!num) {
-    return;
+    return 0.00;
   }
   }
-  console.log("数字开始", num);
-  num = num.toLocaleString(); // 3,000
+  num = num.toLocaleString();
   if (num.indexOf(".") == -1) {
   if (num.indexOf(".") == -1) {
-    num = num + ".00"; //3,000.00
-    console.log("数字计算", num);
+    num = num + ".00";
+
+  } else {
+    var parts = num.split('.');
+    var lastPart = parts[parts.length - 1];
+    if (lastPart.length < 2) {
+      num = num + "0";
+    }
   }
   }
-  // } else if (num.charAt(num.indexOf(".") == num.length - 2)) {
-  //   num = num + "0";
-  //   console.log("数字计算2", num);
-  // }
-  console.log("数字", num);
   return num;
   return num;
 }
 }
+
+// 数字格式化
+export function numberToCurrencyNo(value) {
+  if (!value) return 0;
+  // 获取整数部分
+  const intPart = Math.trunc(value);
+
+  // 整数部分处理,增加,
+  const intPartFormat = intPart
+    .toString()
+    .replace(/(\d)(?=(?:\d{3})+$)/g, "$1,");
+  // 预定义小数部分
+
+  let floatPart = "";
+  // 将数值截取为小数部分和整数部分
+  const valueArray = value.toString().split(".");
+  if (valueArray.length === 2) {
+    // 有小数部分
+
+    floatPart = valueArray[1].toString(); // 取得小数部分
+    console.log("整数部分", intPartFormat + "." + floatPart, "小数部分");
+    return intPartFormat + "." + floatPart;
+  }
+  return intPartFormat + floatPart;
+}
+
 /**
 /**
  * @param {number} time
  * @param {number} time
  * @param {string} option
  * @param {string} option

+ 3 - 2
src/views/business/deduction/HousingFundViewDialog.vue

@@ -30,12 +30,12 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位缴纳:">
             <el-form-item label="单位缴纳:">
-              <div>{{ form.unitAmount }}</div>
+              <div>{{ rowNum(form.unitAmount) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人缴纳:">
             <el-form-item label="个人缴纳:">
-              <div>{{ form.individualAmount }}</div>
+              <div>{{ rowNum(form.individualAmount) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -91,6 +91,7 @@
 <script setup>
 <script setup>
 import { getAmountView } from "@/api/business/production/deduction";
 import { getAmountView } from "@/api/business/production/deduction";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
+import { rowNum } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);

+ 127 - 75
src/views/business/deduction/MergeTaxViewDialog.vue

@@ -1,11 +1,18 @@
 <template>
 <template>
-  <el-dialog title="税款申报信息" v-model="visible" :width="width" append-to-body draggable @close="close">
+  <el-dialog
+    title="税款申报信息"
+    v-model="visible"
+    :width="width"
+    append-to-body
+    draggable
+    @close="close"
+  >
     <!-- <div slot="title" class="dialog-title-container">
     <!-- <div slot="title" class="dialog-title-container">
       <span class="title-label"><i class="el-icon-document" /> 工资信息</span>
       <span class="title-label"><i class="el-icon-document" /> 工资信息</span>
       <i class="el-icon-close" @click="close" />
       <i class="el-icon-close" @click="close" />
     </div> -->
     </div> -->
     <!-- 功能按钮 -->
     <!-- 功能按钮 -->
-    <div style="padding: 8px 24px 16px 24px;">
+    <div style="padding: 8px 24px 16px 24px">
       <el-form size="small" label-width="140px" v-model="form">
       <el-form size="small" label-width="140px" v-model="form">
         <el-row :gutter="30">
         <el-row :gutter="30">
           <el-col :span="12">
           <el-col :span="12">
@@ -19,11 +26,13 @@
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
-            <el-divider content-position="left" style="font-size:10px;">个税</el-divider>
+            <el-divider content-position="left" style="font-size: 10px"
+              >个税</el-divider
+            >
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个税金额:">
             <el-form-item label="个税金额:">
-              <div>{{ personTax.amount }}</div>
+              <div>{{ rowNum(personTax.amount) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -33,62 +42,74 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="凭证:" required>
             <el-form-item label="凭证:" required>
-              <img v-if="!!personTax.evidenceFile" style="height: 148px; width: 148px;"
-                :src="`${baseUrl}/${personTax.evidenceFile}`" class="avatar" @click="openFile(personTax.evidenceFile)">
+              <img
+                v-if="!!personTax.evidenceFile"
+                style="height: 148px; width: 148px"
+                :src="`${baseUrl}/${personTax.evidenceFile}`"
+                class="avatar"
+                @click="openFile(personTax.evidenceFile)"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="报表:" required>
             <el-form-item label="报表:" required>
-              <el-button v-if="!!personTax.reportFile" type="text" class="avatar"
-                @click="openFile(personTax.reportFile)">打开文件</el-button>
+              <el-button
+                v-if="!!personTax.reportFile"
+                type="text"
+                class="avatar"
+                @click="openFile(personTax.reportFile)"
+                >打开文件</el-button
+              >
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
-            <el-divider content-position="left" style="font-size:10px;">其他税</el-divider>
+            <el-divider content-position="left" style="font-size: 10px"
+              >其他税</el-divider
+            >
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="增值税:">
             <el-form-item label="增值税:">
-              <div>{{ reportTax.valueAddedTax }}</div>
+              <div>{{ rowNum(reportTax.valueAddedTax) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="城建税:">
             <el-form-item label="城建税:">
-              <div>{{ reportTax.cityConstructTax }}</div>
+              <div>{{ rowNum(reportTax.cityConstructTax) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="教育费附加:">
             <el-form-item label="教育费附加:">
-              <div>{{ reportTax.additionsTaxOfEducation }}</div>
+              <div>{{ rowNum(reportTax.additionsTaxOfEducation) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="地方教育费附加:">
             <el-form-item label="地方教育费附加:">
-              <div>{{ reportTax.ladditionsTaxOfEducation }}</div>
+              <div>{{ rowNum(reportTax.ladditionsTaxOfEducation) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="企业所得税:">
             <el-form-item label="企业所得税:">
-              <div>{{ reportTax.businessIncomeTax }}</div>
+              <div>{{ rowNum(reportTax.businessIncomeTax) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="印花税:">
             <el-form-item label="印花税:">
-              <div>{{ reportTax.stampTax }}</div>
+              <div>{{ rowNum(reportTax.stampTax) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="文化事业建设税:">
             <el-form-item label="文化事业建设税:">
-              <div>{{ reportTax.culturalConstructTax }}</div>
+              <div>{{ rowNum(reportTax.culturalConstructTax) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="消费税:">
             <el-form-item label="消费税:">
-              <div>{{ reportTax.excise }}</div>
+              <div>{{ rowNum(reportTax.excise) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="合计:">
             <el-form-item label="合计:">
-              <div>{{ reportTax.sumTax }}</div>
+              <div>{{ rowNum(reportTax.sumTax) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -98,30 +119,60 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="凭证:" required>
             <el-form-item label="凭证:" required>
-              <img v-if="!!reportTax.evidenceFile" style="height: 148px; width: 148px;"
-                :src="`${baseUrl}${reportTax.evidenceFile}`" class="avatar" @click="openFile(reportTax.evidenceFile)">
+              <img
+                v-if="!!reportTax.evidenceFile"
+                style="height: 148px; width: 148px"
+                :src="`${baseUrl}${reportTax.evidenceFile}`"
+                class="avatar"
+                @click="openFile(reportTax.evidenceFile)"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="报表:" required>
             <el-form-item label="报表:" required>
-              <el-table ref="dbTable" :data="reportTax.reportFiles" size="small" border
-                header-row-class-name="list-header-row" row-class-name="list-row">
-                <el-table-column label="文件名" prop="rawFileName" align="center" show-overflow-tooltip>
+              <el-table
+                ref="dbTable"
+                :data="reportTax.reportFiles"
+                size="small"
+                border
+                header-row-class-name="list-header-row"
+                row-class-name="list-row"
+              >
+                <el-table-column
+                  label="文件名"
+                  prop="rawFileName"
+                  align="center"
+                  show-overflow-tooltip
+                >
                   <template #default="scope">
                   <template #default="scope">
-                    <el-button size="small" type="text" @click="openFile(scope.row.fileUrl)">{{ scope.row.originalFileName
-                      == '' ? '打开文件' : scope.row.originalFileName }}</el-button>
+                    <el-button
+                      size="small"
+                      type="text"
+                      @click="openFile(scope.row.fileUrl)"
+                      >{{
+                        scope.row.originalFileName == ""
+                          ? "打开文件"
+                          : scope.row.originalFileName
+                      }}</el-button
+                    >
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column label="文件类型" width="80" prop="fileType" align="center" />
+                <el-table-column
+                  label="文件类型"
+                  width="80"
+                  prop="fileType"
+                  align="center"
+                />
               </el-table>
               </el-table>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-form>
       </el-form>
     </div>
     </div>
-    <div class="form-btns-container" style="height: 40px;">
-      <el-button size="small" style="float: right;" @click="close"><i class="fa fa-close" aria-hidden="true" f />
-        取消</el-button>
+    <div class="form-btns-container" style="height: 40px">
+      <el-button size="small" style="float: right" @click="close"
+        ><i class="fa fa-close" aria-hidden="true" f /> 取消</el-button
+      >
     </div>
     </div>
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
     <print-dialog ref="printDialog" :parent="this" /> -->
@@ -129,87 +180,88 @@
 </template>
 </template>
 <script setup>
 <script setup>
 import { getAmountView } from "@/api/business/production/deduction";
 import { getAmountView } from "@/api/business/production/deduction";
-import { uploadFile } from '@/api/tool/file'
+import { uploadFile } from "@/api/tool/file";
+import { rowNum } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
-const { proxy } = getCurrentInstance()
-const visible = ref(false)
-const width = ref(800)
-const selections = ref([])
-const currentSource = ref(null)
-const editStatus = ref(false)
-const canSave = ref(false)
-const baseUrl = ref(import.meta.env.VITE_APP_BASE_API)
+const { proxy } = getCurrentInstance();
+const visible = ref(false);
+const width = ref(800);
+const selections = ref([]);
+const currentSource = ref(null);
+const editStatus = ref(false);
+const canSave = ref(false);
+const baseUrl = ref(import.meta.env.VITE_APP_BASE_API);
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
-  }
+    default: () => {},
+  },
 });
 });
 
 
-const { getList } = toRefs(props)
-const total = ref(0)
+const { getList } = toRefs(props);
+const total = ref(0);
 
 
 const employeeEmptyData = {
 const employeeEmptyData = {
   id: null,
   id: null,
-  title: '',
-  remark: '',
-  employeeName: '',
-  departmentName: '',
-  idCardImage: '',
-  idCardImageBack: '',
-  idiograph: '',
+  title: "",
+  remark: "",
+  employeeName: "",
+  departmentName: "",
+  idCardImage: "",
+  idCardImageBack: "",
+  idiograph: "",
   details: [],
   details: [],
   editStatus: true,
   editStatus: true,
-}
+};
 
 
-const form = ref({})
-const conditions = ref({})
-const reportTax = ref({})
-const personTax = ref({})
+const form = ref({});
+const conditions = ref({});
+const reportTax = ref({});
+const personTax = ref({});
 
 
 const emptyForm = {
 const emptyForm = {
-  details: []
-}
+  details: [],
+};
 
 
 function open(detail) {
 function open(detail) {
-  visible.value = true
-  conditions.value = detail
-  loadData()
+  visible.value = true;
+  conditions.value = detail;
+  loadData();
 }
 }
 
 
 function loadData() {
 function loadData() {
-  console.log(conditions.value)
-  getAmountView(conditions.value).then(res => {
-    form.value = res.data.form
-    reportTax.value = res.data.reportTax
-    personTax.value = res.data.individualTax
-  })
+  console.log(conditions.value);
+  getAmountView(conditions.value).then((res) => {
+    form.value = res.data.form;
+    reportTax.value = res.data.reportTax;
+    personTax.value = res.data.individualTax;
+  });
 }
 }
 
 
 function close() {
 function close() {
-  visible.value = false
-  reset()
+  visible.value = false;
+  reset();
 }
 }
 
 
 function reset() {
 function reset() {
-  form.value = proxy.deepClone(emptyForm)
-  reportTax.value = {}
-  personTax.value = {}
-  canSave.value = false
+  form.value = proxy.deepClone(emptyForm);
+  reportTax.value = {};
+  personTax.value = {};
+  canSave.value = false;
 }
 }
 
 
 function handleCurrentChange(row) {
 function handleCurrentChange(row) {
-  currentSource.value = row
+  currentSource.value = row;
 }
 }
 
 
 function openFile(url) {
 function openFile(url) {
-  window.open(`${baseUrl.value}${url}`)
+  window.open(`${baseUrl.value}${url}`);
 }
 }
 
 
 // 暴露给父组件的方法
 // 暴露给父组件的方法
 defineExpose({
 defineExpose({
-  open
-})
+  open,
+});
 </script>
 </script>
 <style scoped>
 <style scoped>
 .img {
 .img {

+ 13 - 12
src/views/business/deduction/SocialSecurityViewDialog.vue

@@ -30,63 +30,63 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位养老金:">
             <el-form-item label="单位养老金:">
-              <div>{{ form.unitPension }}</div>
+              <div>{{ rowNum(form.unitPension) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位医疗险:">
             <el-form-item label="单位医疗险:">
-              <div>{{ form.unitMedical }}</div>
+              <div>{{ rowNum(form.unitMedical) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位工伤险:">
             <el-form-item label="单位工伤险:">
-              <div>{{ form.unitInjury }}</div>
+              <div>{{ rowNum(form.unitInjury) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位失业金:">
             <el-form-item label="单位失业金:">
               <!-- <el-input-number v-model="form.unitUnemployment" size="small" placeholder="单位失业金" :precision="2" :controls="false" style="width: 100%;" /> -->
               <!-- <el-input-number v-model="form.unitUnemployment" size="small" placeholder="单位失业金" :precision="2" :controls="false" style="width: 100%;" /> -->
-              <div>{{ form.unitUnemployment }}</div>
+              <div>{{ rowNum(form.unitUnemployment) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位生育险:">
             <el-form-item label="单位生育险:">
-              <div>{{ form.unitProcreate }}</div>
+              <div>{{ rowNum(form.unitProcreate) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位大病险:">
             <el-form-item label="单位大病险:">
-              <div>{{ form.unitSeriousIllness }}</div>
+              <div>{{ rowNum(form.unitSeriousIllness) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位采暖费:">
             <el-form-item label="单位采暖费:">
-              <div>{{ form.unitHeatingFee }}</div>
+              <div>{{ rowNum(form.unitHeatingFee) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人养老金:">
             <el-form-item label="个人养老金:">
-              <div>{{ form.individualPension }}</div>
+              <div>{{ rowNum(form.individualPension) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人医疗险:">
             <el-form-item label="个人医疗险:">
-              <div>{{ form.individualMedical }}</div>
+              <div>{{ rowNum(form.individualMedical) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人失业金:">
             <el-form-item label="个人失业金:">
-              <div>{{ form.individualUnemployment }}</div>
+              <div>{{ rowNum(form.individualUnemployment) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人大病险:">
             <el-form-item label="个人大病险:">
-              <div>{{ form.individualSeriousIllness }}</div>
+              <div>{{ rowNum(form.individualSeriousIllness) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="合计:">
             <el-form-item label="合计:">
-              <div>{{ form.amount }}</div>
+              <div>{{ rowNum(form.amount) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -144,6 +144,7 @@
 <script setup>
 <script setup>
 import { getAmountView } from "@/api/business/production/deduction";
 import { getAmountView } from "@/api/business/production/deduction";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
+import { rowNum } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);

+ 344 - 74
src/views/business/deduction/index.vue

@@ -8,15 +8,24 @@
         </el-button>
         </el-button>
         <template #dropdown>
         <template #dropdown>
           <el-dropdown-menu>
           <el-dropdown-menu>
-            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:deposit:export']">
-              导出</el-dropdown-item>
+            <el-dropdown-item
+              icon="Download"
+              @click="handleExport"
+              v-hasPermi="['business:deposit:export']"
+            >
+              导出</el-dropdown-item
+            >
             <!-- <el-dropdown-item type="warning" size="small" icon="Download" @click="handleArea"
             <!-- <el-dropdown-item type="warning" size="small" icon="Download" @click="handleArea"
               v-hasPermi="['business:deposit:export']"> area</el-dropdown-item> -->
               v-hasPermi="['business:deposit:export']"> area</el-dropdown-item> -->
           </el-dropdown-menu>
           </el-dropdown-menu>
         </template>
         </template>
       </el-dropdown>
       </el-dropdown>
-      <el-radio-group v-model="queryRadio" style="margin-left: 20px; height: 100%" size="small"
-        @change="radioChangeHandler">
+      <el-radio-group
+        v-model="queryRadio"
+        style="margin-left: 20px; height: 100%"
+        size="small"
+        @change="radioChangeHandler"
+      >
         <el-radio-button label="全部" />
         <el-radio-button label="全部" />
         <el-radio-button label="待确认扣款" />
         <el-radio-button label="待确认扣款" />
         <el-radio-button label="可扣款" />
         <el-radio-button label="可扣款" />
@@ -29,58 +38,155 @@
       <!--<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
       <!--<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
     </div>
     </div>
     <!-- 搜索区 -->
     <!-- 搜索区 -->
-    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
-      label-width="78px">
+    <el-form
+      class="list-search-container"
+      size="small"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      label-width="78px"
+    >
       <el-form-item label="来源名:">
       <el-form-item label="来源名:">
-        <el-select v-model="queryParams.sourceNames" placeholder="请选择来源名" multiple>
-          <el-option v-for="item in sources" :key="item.value" :label="item.label" :value="item.value" />
+        <el-select
+          v-model="queryParams.sourceNames"
+          placeholder="请选择来源名"
+          multiple
+        >
+          <el-option
+            v-for="item in sources"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="客户名称:">
       <el-form-item label="客户名称:">
-        <el-input v-model.trim="queryParams.companyName" size="small" type="text" placeholder="客户名称" :clearable="true"
-          style="width: 140px" />
+        <el-input
+          v-model.trim="queryParams.companyName"
+          size="small"
+          type="text"
+          placeholder="客户名称"
+          :clearable="true"
+          style="width: 140px"
+        />
       </el-form-item>
       </el-form-item>
       <el-form-item label="所属期:">
       <el-form-item label="所属期:">
-        <el-date-picker v-model="queryParams.currentMonth" type="month" format="YYYY年MM月" value-format="YYYY-MM"
-          style="width: 130px" />
+        <el-date-picker
+          v-model="queryParams.currentMonth"
+          type="month"
+          format="YYYY年MM月"
+          value-format="YYYY-MM"
+          style="width: 130px"
+        />
       </el-form-item>
       </el-form-item>
       <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:">
       <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
 
 
     <!-- 列表区 -->
     <!-- 列表区 -->
-    <el-table v-loading="loading" :data="list" size="small" border height="100%"
-      @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="list"
+      size="small"
+      border
+      height="100%"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="客户名" prop="companyName" min-width="250" align="center" />
-      <el-table-column label="来源" min-width="100" align="center" prop="fromCompanyName" />
-      <el-table-column label="纳税性质" prop="taxType" width="100" align="center" />
-      <el-table-column label="扣款期" prop="currentMonth" min-width="100" align="center">
+      <el-table-column
+        label="客户名"
+        prop="companyName"
+        min-width="250"
+        align="center"
+      />
+      <el-table-column
+        label="来源"
+        min-width="100"
+        align="center"
+        prop="fromCompanyName"
+      />
+      <el-table-column
+        label="纳税性质"
+        prop="taxType"
+        width="100"
+        align="center"
+      />
+      <el-table-column
+        label="扣款期"
+        prop="currentMonth"
+        min-width="100"
+        align="center"
+      >
         <template #default="scope">
         <template #default="scope">
           {{ scope.row.year }}年{{ scope.row.month }}月
           {{ scope.row.year }}年{{ scope.row.month }}月
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="来源名" prop="sourceName" width="150" align="center" />
-      <el-table-column label="金额" prop="amount" width="150" align="center">
+      <el-table-column
+        label="来源名"
+        prop="sourceName"
+        width="150"
+        align="center"
+      />
+      <el-table-column
+        label="金额"
+        prop="amount"
+        width="130"
+        header-align="center"
+        align="right"
+      >
         <template #default="scope">
         <template #default="scope">
-          <el-button v-if="scope.row.deductible === 1" type="primary" link size="small"
-            @click="amountDetail(scope.row)">{{ scope.row.amount }}</el-button>
+          <el-button
+            v-if="scope.row.deductible === 1"
+            type="primary"
+            link
+            size="small"
+            @click="amountDetail(scope.row)"
+            >{{ rowNum(scope.row.amount) }}</el-button
+          >
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="确认人" prop="confirmName" width="110" align="center" />
-      <el-table-column label="确认时间" prop="confirmDate" min-width="140" align="center" />
-      <el-table-column label="操作人" prop="operationName" width="100" align="center" />
-      <el-table-column label="操作时间" min-width="140" prop="operationDate" align="center" />
+      <el-table-column
+        label="确认人"
+        prop="confirmName"
+        width="110"
+        align="center"
+      />
+      <el-table-column
+        label="确认时间"
+        prop="confirmDate"
+        min-width="140"
+        align="center"
+      />
+      <el-table-column
+        label="操作人"
+        prop="operationName"
+        width="100"
+        align="center"
+      />
+      <el-table-column
+        label="操作时间"
+        min-width="140"
+        prop="operationDate"
+        align="center"
+      />
       <el-table-column label="文件查看" align="center" width="100">
       <el-table-column label="文件查看" align="center" width="100">
         <template #default="scope">
         <template #default="scope">
-          <el-button v-if="scope.row.status === 2" size="small" type="primary" link
-            @click="showFiles(scope.row)">查看文件</el-button>
+          <el-button
+            v-if="scope.row.status === 2"
+            size="small"
+            type="primary"
+            link
+            @click="showFiles(scope.row)"
+            >查看文件</el-button
+          >
           <span v-else>--</span>
           <span v-else>--</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
@@ -89,8 +195,13 @@
           <span v-if="scope.row.status === 0">待审核</span>
           <span v-if="scope.row.status === 0">待审核</span>
           <span v-if="scope.row.status === 1">可扣款</span>
           <span v-if="scope.row.status === 1">可扣款</span>
           <span v-if="scope.row.status === 2">已扣款</span>
           <span v-if="scope.row.status === 2">已扣款</span>
-          <el-tooltip v-if="scope.row.status === 4" :content="scope.row.failureType === 1 ? scope.row.failureResult : '余额不足'
-            " placement="top">
+          <el-tooltip
+            v-if="scope.row.status === 4"
+            :content="
+              scope.row.failureType === 1 ? scope.row.failureResult : '余额不足'
+            "
+            placement="top"
+          >
             <span>扣款失败</span>
             <span>扣款失败</span>
           </el-tooltip>
           </el-tooltip>
           <span v-if="scope.row.status === 5">已申报</span>
           <span v-if="scope.row.status === 5">已申报</span>
@@ -99,30 +210,76 @@
       <el-table-column label="操作" fixed="right" width="220" align="center">
       <el-table-column label="操作" fixed="right" width="220" align="center">
         <template #default="scope">
         <template #default="scope">
           <template v-if="scope.row.deductible === 1">
           <template v-if="scope.row.deductible === 1">
-            <template v-if="(scope.row.status === 0 || scope.row.status === 4) && checkConfirm(scope.row)">
-              <el-button v-hasPermi="['business:deduction:confirm']" link type="primary" size="small"
-                @click="showConfirm(scope.row)">确认扣款</el-button>
+            <template
+              v-if="
+                (scope.row.status === 0 || scope.row.status === 4) &&
+                checkConfirm(scope.row)
+              "
+            >
+              <el-button
+                v-hasPermi="['business:deduction:confirm']"
+                link
+                type="primary"
+                size="small"
+                @click="showConfirm(scope.row)"
+                >确认扣款</el-button
+              >
             </template>
             </template>
             <div v-if="scope.row.sourceName === '公积金'">
             <div v-if="scope.row.sourceName === '公积金'">
               <template v-if="scope.row.status === 1">
               <template v-if="scope.row.status === 1">
-                <el-button link v-hasPermi="['business:deduction:declare']" style="margin-right: 5px" type="primary"
-                  size="small" @click="applySuccess(scope.row, 5)">申报成功</el-button>
+                <el-button
+                  link
+                  v-hasPermi="['business:deduction:declare']"
+                  style="margin-right: 5px"
+                  type="primary"
+                  size="small"
+                  @click="applySuccess(scope.row, 5)"
+                  >申报成功</el-button
+                >
               </template>
               </template>
             </div>
             </div>
             <div v-if="scope.row.sourceName === '公积金'">
             <div v-if="scope.row.sourceName === '公积金'">
               <template v-if="scope.row.status === 5">
               <template v-if="scope.row.status === 5">
-                <el-button link v-hasPermi="['business:deduction:deduction']" style="margin-right: 5px" type="primary"
-                  size="small" @click="openUpload(scope.row)">扣款成功</el-button>
-                <el-button link v-hasPermi="['business:deduction:deduction']" style="margin-left: 5px; :5px "
-                  type="primary" size="small" @click="showFeedbackDialog(scope.row)">扣款失败</el-button>
+                <el-button
+                  link
+                  v-hasPermi="['business:deduction:deduction']"
+                  style="margin-right: 5px"
+                  type="primary"
+                  size="small"
+                  @click="openUpload(scope.row)"
+                  >扣款成功</el-button
+                >
+                <el-button
+                  link
+                  v-hasPermi="['business:deduction:deduction']"
+                  style="margin-left: 5px; :5px "
+                  type="primary"
+                  size="small"
+                  @click="showFeedbackDialog(scope.row)"
+                  >扣款失败</el-button
+                >
               </template>
               </template>
             </div>
             </div>
             <div v-else>
             <div v-else>
               <template v-if="scope.row.status === 1">
               <template v-if="scope.row.status === 1">
-                <el-button link v-hasPermi="['business:deduction:deduction']" style="margin-right: 5px" type="primary"
-                  size="small" @click="openUpload(scope.row)">扣款成功</el-button>
-                <el-button link v-hasPermi="['business:deduction:deduction']" style="margin-left: 5px; :5px "
-                  type="primary" size="small" @click="showFeedbackDialog(scope.row)">扣款失败</el-button>
+                <el-button
+                  link
+                  v-hasPermi="['business:deduction:deduction']"
+                  style="margin-right: 5px"
+                  type="primary"
+                  size="small"
+                  @click="openUpload(scope.row)"
+                  >扣款成功</el-button
+                >
+                <el-button
+                  link
+                  v-hasPermi="['business:deduction:deduction']"
+                  style="margin-left: 5px; :5px "
+                  type="primary"
+                  size="small"
+                  @click="showFeedbackDialog(scope.row)"
+                  >扣款失败</el-button
+                >
               </template>
               </template>
             </div>
             </div>
           </template>
           </template>
@@ -130,7 +287,14 @@
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
     <!-- <Deposit-form ref="DepositRef" :get-list="getList" /> -->
     <!-- <Deposit-form ref="DepositRef" :get-list="getList" /> -->
-    <el-dialog title="扣款信息" v-model="formOpen" width="500px" append-to-body draggable @close="formCancel">
+    <el-dialog
+      title="扣款信息"
+      v-model="formOpen"
+      width="500px"
+      append-to-body
+      draggable
+      @close="formCancel"
+    >
       <el-form ref="dictRef" :model="form" label-width="100" size="small">
       <el-form ref="dictRef" :model="form" label-width="100" size="small">
         <el-row :gutter="30">
         <el-row :gutter="30">
           <el-col :span="24">
           <el-col :span="24">
@@ -141,23 +305,57 @@
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="凭证附件:" required>
             <el-form-item label="凭证附件:" required>
               <div class="details-btns-container" style="display: flex">
               <div class="details-btns-container" style="display: flex">
-                <el-upload action="#" :http-request="upload" :with-credentials="true" :show-file-list="false" multiple>
-                  <el-button size="small" type="primary" icon="Upload">点击上传</el-button>
+                <el-upload
+                  action="#"
+                  :http-request="upload"
+                  :with-credentials="true"
+                  :show-file-list="false"
+                  multiple
+                >
+                  <el-button size="small" type="primary" icon="Upload"
+                    >点击上传</el-button
+                  >
                 </el-upload>
                 </el-upload>
               </div>
               </div>
-              <el-table ref="filesTable" :data="form.files" size="small" height="200px" border
-                header-row-class-name="list-header-row">
-                <el-table-column type="index" label="序号" width="47" align="center" />
-                <el-table-column label="文件名" prop="originalFileName" align="center">
+              <el-table
+                ref="filesTable"
+                :data="form.files"
+                size="small"
+                height="200px"
+                border
+                header-row-class-name="list-header-row"
+              >
+                <el-table-column
+                  type="index"
+                  label="序号"
+                  width="47"
+                  align="center"
+                />
+                <el-table-column
+                  label="文件名"
+                  prop="originalFileName"
+                  align="center"
+                >
                   <template #default="scope">
                   <template #default="scope">
-                    <el-link :href="`${baseUrl}${scope.row.fileUrl}`" :underline="false" target="_blank" type="primary">
+                    <el-link
+                      :href="`${baseUrl}${scope.row.fileUrl}`"
+                      :underline="false"
+                      target="_blank"
+                      type="primary"
+                    >
                       {{ scope.row.originalFileName }}
                       {{ scope.row.originalFileName }}
                     </el-link>
                     </el-link>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column label="操作" width="47" align="center">
                 <el-table-column label="操作" width="47" align="center">
                   <template #default="scope">
                   <template #default="scope">
-                    <el-button link size="small" type="danger" @click="handleDelFile(scope.$index)">删除</el-button>
+                    <el-button
+                      link
+                      size="small"
+                      type="danger"
+                      @click="handleDelFile(scope.$index)"
+                      >删除</el-button
+                    >
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
               </el-table>
               </el-table>
@@ -167,57 +365,128 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <div class="dialog-footer">
         <div class="dialog-footer">
-          <el-button type="primary" size="small" icon="Finished" @click="saveHandler">确 定</el-button>
-          <el-button icon="close" size="small" @click="formCancel">取 消</el-button>
+          <el-button
+            type="primary"
+            size="small"
+            icon="Finished"
+            @click="saveHandler"
+            >确 定</el-button
+          >
+          <el-button icon="close" size="small" @click="formCancel"
+            >取 消</el-button
+          >
         </div>
         </div>
       </template>
       </template>
     </el-dialog>
     </el-dialog>
     <!-- 分页 -->
     <!-- 分页 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
-    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <el-image-viewer
+      v-if="showViewer"
+      :url-list="currentFileList"
+      @close="closeImages"
+      :initial-index="showIndex"
+    />
     <feedbackDialog ref="feedbackDialogRef" :verify="verifyDeduction" />
     <feedbackDialog ref="feedbackDialogRef" :verify="verifyDeduction" />
     <FileDialog ref="fileDialog" />
     <FileDialog ref="fileDialog" />
     <MergeTaxViewDialog ref="mergeTaxViewDialog" />
     <MergeTaxViewDialog ref="mergeTaxViewDialog" />
     <HousingFundViewDialog ref="housingFundViewDialog" />
     <HousingFundViewDialog ref="housingFundViewDialog" />
     <SocialSecurityViewDialog ref="socialSecurityViewDialog" />
     <SocialSecurityViewDialog ref="socialSecurityViewDialog" />
     <!-- 更多搜索弹窗 -->
     <!-- 更多搜索弹窗 -->
-    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body draggable>
-      <el-form :model="queryParams" ref="queryRef" size="small" label-width="100">
+    <el-dialog
+      title="更多搜索"
+      v-model="moreSearch"
+      width="620px"
+      append-to-body
+      draggable
+    >
+      <el-form
+        :model="queryParams"
+        ref="queryRef"
+        size="small"
+        label-width="100"
+      >
         <el-row :gutter="20">
         <el-row :gutter="20">
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="客户名称:">
             <el-form-item label="客户名称:">
-              <el-input v-model.trim="queryParams.companyName" size="small" type="text" placeholder="客户名称"
-                :clearable="true" />
+              <el-input
+                v-model.trim="queryParams.companyName"
+                size="small"
+                type="text"
+                placeholder="客户名称"
+                :clearable="true"
+              />
             </el-form-item>
             </el-form-item>
             <el-form-item label="来源名:" prop="sourceNames">
             <el-form-item label="来源名:" prop="sourceNames">
-              <el-select v-model="queryParams.sourceNames" placeholder="请选择来源名" multiple>
-                <el-option v-for="item in sources" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select
+                v-model="queryParams.sourceNames"
+                placeholder="请选择来源名"
+                multiple
+              >
+                <el-option
+                  v-for="item in sources"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
 
 
             <el-form-item label="来源:" prop="fromCompanyName">
             <el-form-item label="来源:" prop="fromCompanyName">
-              <el-input size="small" v-model="queryParams.fromCompanyName" type="text" placeholder="客户来源"
-                :clearable="true" />
+              <el-input
+                size="small"
+                v-model="queryParams.fromCompanyName"
+                type="text"
+                placeholder="客户来源"
+                :clearable="true"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="纳税性质:" prop="taxType">
             <el-form-item label="纳税性质:" prop="taxType">
-              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true"
-                @change="taxTypeChange">
-                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
+              <el-select
+                size="small"
+                v-model="queryParams.taxType"
+                placeholder="请选择纳税性质"
+                :clearable="true"
+                @change="taxTypeChange"
+              >
+                <el-option
+                  v-for="item in taxTypes"
+                  :key="item.label"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
             <el-form-item label="所属期:">
             <el-form-item label="所属期:">
-              <el-date-picker v-model="queryParams.currentMonth" type="month" format="YYYY年MM月" value-format="YYYY-MM" />
+              <el-date-picker
+                v-model="queryParams.currentMonth"
+                type="month"
+                format="YYYY年MM月"
+                value-format="YYYY-MM"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <div class="dialog-footer">
         <div class="dialog-footer">
-          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
-          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="handleQuery"
+            >确 定</el-button
+          >
+          <el-button icon="close" size="small" @click="moreSearch = false"
+            >取 消</el-button
+          >
         </div>
         </div>
       </template>
       </template>
     </el-dialog>
     </el-dialog>
@@ -233,6 +502,7 @@ import {
 import MergeTaxViewDialog from "./MergeTaxViewDialog";
 import MergeTaxViewDialog from "./MergeTaxViewDialog";
 import feedbackDialog from "./feedbackDialog";
 import feedbackDialog from "./feedbackDialog";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
+import { rowNum } from "@/utils/index";
 import { listCompany } from "@/api/business/crm/company";
 import { listCompany } from "@/api/business/crm/company";
 import { taxTypes } from "@/utils/default";
 import { taxTypes } from "@/utils/default";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
@@ -246,7 +516,7 @@ import SocialSecurityViewDialog from "./SocialSecurityViewDialog";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 /** 字典数组区 */
 /** 字典数组区 */
 /** 查询 对象 */
 /** 查询 对象 */
-const tenant = useUserStore().tenant
+const tenant = useUserStore().tenant;
 const list = ref([]);
 const list = ref([]);
 const loading = ref(true);
 const loading = ref(true);
 const ids = ref([]);
 const ids = ref([]);
@@ -423,7 +693,7 @@ function handleDelete(row) {
       getList();
       getList();
       proxy.$modal.msgSuccess("删除成功!");
       proxy.$modal.msgSuccess("删除成功!");
     })
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 }
 
 
 /** 导出按钮操作 */
 /** 导出按钮操作 */

+ 235 - 50
src/views/business/entrust/deduct/form.vue

@@ -5,16 +5,39 @@
       <div class="page-container form-container">
       <div class="page-container form-container">
         <!-- 功能按钮区域 -->
         <!-- 功能按钮区域 -->
         <div class="form-btns-container">
         <div class="form-btns-container">
-          <span class="title-label"><el-icon>
+          <span class="title-label"
+            ><el-icon>
               <Document />
               <Document />
             </el-icon>
             </el-icon>
-            对账单表单</span>
-
-          <el-button v-show="form.status === 0" type="primary" size="small" icon="Finished"
-            v-hasPermi="['business:deduct:confirm']" @click="handleConfirm">确认扣款</el-button>
-          <el-button v-show="form.status === 0" type="danger" icon="back" size="small" @click="handleReject"
-            v-hasPermi="['business:deduct:confirm']">驳回扣款</el-button>
-          <el-button v-if="form.id" type="success" size="small" icon="refresh" @click="getForm">刷新</el-button>
+            对账单表单</span
+          >
+
+          <el-button
+            v-show="form.status === 0"
+            type="primary"
+            size="small"
+            icon="Finished"
+            v-hasPermi="['business:deduct:confirm']"
+            @click="handleConfirm"
+            >确认扣款</el-button
+          >
+          <el-button
+            v-show="form.status === 0"
+            type="danger"
+            icon="back"
+            size="small"
+            @click="handleReject"
+            v-hasPermi="['business:deduct:confirm']"
+            >驳回扣款</el-button
+          >
+          <el-button
+            v-if="form.id"
+            type="success"
+            size="small"
+            icon="refresh"
+            @click="getForm"
+            >刷新</el-button
+          >
 
 
           <div class="screen-btn" @click="handleScreen">
           <div class="screen-btn" @click="handleScreen">
             <template v-if="!isFullscreen">
             <template v-if="!isFullscreen">
@@ -31,17 +54,33 @@
             <!-- <span>关闭</span> -->
             <!-- <span>关闭</span> -->
           </div>
           </div>
         </div>
         </div>
-        <el-form ref="companyRef" class="master-container" size="small" :model="form" :rules="rules" label-width="120px">
+        <el-form
+          ref="companyRef"
+          class="master-container"
+          size="small"
+          :model="form"
+          :rules="rules"
+          label-width="120px"
+        >
           <el-row :gutter="30">
           <el-row :gutter="30">
             <el-col :span="6"> 结算单位:{{ form.contactCompany }} </el-col>
             <el-col :span="6"> 结算单位:{{ form.contactCompany }} </el-col>
             <el-col :span="6"> 结算订单编号:{{ form.formNo }} </el-col>
             <el-col :span="6"> 结算订单编号:{{ form.formNo }} </el-col>
-            <el-col :span="4"> 上期余额:{{ form.prevRemainAmount }} </el-col>
-            <el-col :span="4"> 本期消耗:{{ form.amount }} </el-col>
-            <el-col :span="4"> 本期余额:{{ form.remainAmount }} </el-col>
+            <el-col :span="4">
+              上期余额:{{ rowNum(form.prevRemainAmount) }}
+            </el-col>
+            <el-col :span="4"> 本期消耗:{{ rowNum(form.amount) }} </el-col>
+            <el-col :span="4">
+              本期余额:{{ rowNum(form.remainAmount) }}
+            </el-col>
             <el-col :span="24">
             <el-col :span="24">
               <el-tabs v-model="activeName">
               <el-tabs v-model="activeName">
                 <el-tab-pane label="汇总" name="base" class="baseTable">
                 <el-tab-pane label="汇总" name="base" class="baseTable">
-                  <table class="header" cellspacing="0" cellpadding="0" style="table-layout: fixed">
+                  <table
+                    class="header"
+                    cellspacing="0"
+                    cellpadding="0"
+                    style="table-layout: fixed"
+                  >
                     <tbody>
                     <tbody>
                       <tr class="bg-white-color">
                       <tr class="bg-white-color">
                         <td :colspan="1" style="width: 100px">自然月</td>
                         <td :colspan="1" style="width: 100px">自然月</td>
@@ -63,17 +102,25 @@
                           说明
                           说明
                         </td>
                         </td>
                       </tr>
                       </tr>
-                      <tr class="bg-white-color" v-for="(item, index) in form.collect" :key="index">
-                        <td :colspan="1" v-if="index === 0" :rowspan="form.collect.length">
+                      <tr
+                        class="bg-white-color"
+                        v-for="(item, index) in form.collect"
+                        :key="index"
+                      >
+                        <td
+                          :colspan="1"
+                          v-if="index === 0"
+                          :rowspan="form.collect.length"
+                        >
                           {{ item.year }}年{{ item.month }}月
                           {{ item.year }}年{{ item.month }}月
                         </td>
                         </td>
                         <td :colspan="1">{{ item.taskType }}</td>
                         <td :colspan="1">{{ item.taskType }}</td>
                         <td :colspan="1">
                         <td :colspan="1">
                           {{
                           {{
                             item.taskType === "代理记账"
                             item.taskType === "代理记账"
-                            ? item.annualIncome
-                            : item.taskType === "社保代缴" ||
-                              item.taskType === "公积金代缴"
+                              ? item.annualIncome
+                              : item.taskType === "社保代缴" ||
+                                item.taskType === "公积金代缴"
                               ? item.haveChanged === 1
                               ? item.haveChanged === 1
                                 ? "有变化"
                                 ? "有变化"
                                 : "无变化"
                                 : "无变化"
@@ -81,15 +128,20 @@
                           }}
                           }}
                         </td>
                         </td>
                         <td :colspan="1">{{ item.companyNum }}</td>
                         <td :colspan="1">{{ item.companyNum }}</td>
-                        <td :colspan="1">{{ item.price }}</td>
+                        <td :colspan="1">{{ rowNum(item.price) }}</td>
                         <td :colspan="1">
                         <td :colspan="1">
-                          {{ item.amount }}
+                          {{ rowNum(item.amount) }}
                         </td>
                         </td>
-                        <td :colspan="1">{{ item.discountPrice }}</td>
-                        <td :colspan="1">{{ item.discountAmount }}</td>
-                        <td :colspan="1">{{ item.freeAmount }}</td>
-                        <td :colspan="1">{{ item.actuallyAmount }}</td>
-                        <td :colspan="2" class="tdLast" v-if="index === 0" :rowspan="form.collect.length">
+                        <td :colspan="1">{{ rowNum(item.discountPrice) }}</td>
+                        <td :colspan="1">{{ rowNum(item.discountAmount) }}</td>
+                        <td :colspan="1">{{ rowNum(item.freeAmount) }}</td>
+                        <td :colspan="1">{{ rowNum(item.actuallyAmount) }}</td>
+                        <td
+                          :colspan="2"
+                          class="tdLast"
+                          v-if="index === 0"
+                          :rowspan="form.collect.length"
+                        >
                           {{ form.description }}
                           {{ form.description }}
                         </td>
                         </td>
                       </tr>
                       </tr>
@@ -100,51 +152,129 @@
                   </table>
                   </table>
                 </el-tab-pane>
                 </el-tab-pane>
                 <el-tab-pane label="循环任务" name="loop">
                 <el-tab-pane label="循环任务" name="loop">
-                  <el-table v-loading="loading" :data="form.loopList" size="small" border height="100%">
+                  <el-table
+                    v-loading="loading"
+                    :data="form.loopList"
+                    size="small"
+                    border
+                    height="100%"
+                  >
                     <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
                     <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-                    <el-table-column label="客户名称" align="center" width="150" prop="companyName" />
-                    <el-table-column label="税号" align="center" prop="socialCreditCode" width="150" />
-                    <el-table-column label="注册地址" align="center" prop="formNo" width="120">
+                    <el-table-column
+                      label="客户名称"
+                      align="center"
+                      width="150"
+                      prop="companyName"
+                    />
+                    <el-table-column
+                      label="税号"
+                      align="center"
+                      prop="socialCreditCode"
+                      width="150"
+                    />
+                    <el-table-column
+                      label="注册地址"
+                      align="center"
+                      prop="formNo"
+                      width="120"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.province }}-{{ scope.row.city }}-{{
                         {{ scope.row.province }}-{{ scope.row.city }}-{{
                           scope.row.district
                           scope.row.district
                         }}
                         }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="年收入" align="center" prop="annualIncome" width="100">
+                    <el-table-column
+                      label="年收入"
+                      align="center"
+                      prop="annualIncome"
+                      width="100"
+                    >
                     </el-table-column>
                     </el-table-column>
                     <el-table-column label="税务申报" align="center" width="80">
                     <el-table-column label="税务申报" align="center" width="80">
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.isTax === 1 ? "是" : "否" }}
                         {{ scope.row.isTax === 1 ? "是" : "否" }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="社保" prop="remainAmount" align="center" width="80">
+                    <el-table-column
+                      label="社保"
+                      prop="remainAmount"
+                      align="center"
+                      width="80"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.isSocialSecurity === 1 ? "是" : "否" }}
                         {{ scope.row.isSocialSecurity === 1 ? "是" : "否" }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="公积金" prop="status" align="center" width="80">
+                    <el-table-column
+                      label="公积金"
+                      prop="status"
+                      align="center"
+                      width="80"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.isHousingFund === 1 ? "是" : "否" }}
                         {{ scope.row.isHousingFund === 1 ? "是" : "否" }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="纳税性质" align="center" prop="taxType" width="100" />
-                    <el-table-column label="征收方式" align="center" prop="collectionMethod" width="100" />
-                    <el-table-column label="定额金额" align="center" prop="quotaAmount" width="80" />
-                    <el-table-column label="实际年收入" align="center" prop="actuallyAnnualIncome" width="100" />
-                    <el-table-column label="社保有无变化" prop="status" align="center" width="100">
+                    <el-table-column
+                      label="纳税性质"
+                      align="center"
+                      prop="taxType"
+                      width="100"
+                    />
+                    <el-table-column
+                      label="征收方式"
+                      align="center"
+                      prop="collectionMethod"
+                      width="100"
+                    />
+                    <el-table-column
+                      label="定额金额"
+                      header-align="center"
+                      align="right"
+                      prop="quotaAmount"
+                      width="80"
+                    >
+                      <template #default="scope">
+                        <span>{{ rowNum(scope.row.quotaAmount) }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      label="实际年收入"
+                      header-align="center"
+                      align="right"
+                      prop="actuallyAnnualIncome"
+                      width="100"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                      label="社保有无变化"
+                      prop="status"
+                      align="center"
+                      width="100"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{
                         {{
                           scope.row.changedSocialSecurity === 1 ? "是" : "否"
                           scope.row.changedSocialSecurity === 1 ? "是" : "否"
                         }}
                         }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="公积金有无变化" prop="status" align="center" width="100">
+                    <el-table-column
+                      label="公积金有无变化"
+                      prop="status"
+                      align="center"
+                      width="100"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.changedHousingFund === 1 ? "是" : "否" }}
                         {{ scope.row.changedHousingFund === 1 ? "是" : "否" }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="累计年收入" prop="status" align="center" width="100">
+                    <el-table-column
+                      label="累计年收入"
+                      prop="status"
+                      align="center"
+                      width="100"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.cumulativeIncome }}
                         {{ scope.row.cumulativeIncome }}
                       </template>
                       </template>
@@ -152,31 +282,80 @@
                   </el-table>
                   </el-table>
                 </el-tab-pane>
                 </el-tab-pane>
                 <el-tab-pane label="工商任务" name="once">
                 <el-tab-pane label="工商任务" name="once">
-                  <el-table v-loading="loading" :data="form.onceList" size="small" border height="100%">
+                  <el-table
+                    v-loading="loading"
+                    :data="form.onceList"
+                    size="small"
+                    border
+                    height="100%"
+                  >
                     <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
                     <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-                    <el-table-column label="客户名称" align="center" width="200" prop="companyName" />
-                    <el-table-column label="税号" align="center" prop="socialCreditCode" width="150" />
-                    <el-table-column label="所在区" align="center" prop="formNo" width="120">
+                    <el-table-column
+                      label="客户名称"
+                      align="center"
+                      width="200"
+                      prop="companyName"
+                    />
+                    <el-table-column
+                      label="税号"
+                      align="center"
+                      prop="socialCreditCode"
+                      width="150"
+                    />
+                    <el-table-column
+                      label="所在区"
+                      align="center"
+                      prop="formNo"
+                      width="120"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.province }}-{{ scope.row.city }}-{{
                         {{ scope.row.province }}-{{ scope.row.city }}-{{
                           scope.row.district
                           scope.row.district
                         }}
                         }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="办理事项" align="center" prop="annualIncome" width="120">
+                    <el-table-column
+                      label="办理事项"
+                      align="center"
+                      prop="annualIncome"
+                      width="120"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.taskTypeName }}-{{
                         {{ scope.row.taskTypeName }}-{{
                           scope.row.taskTypeDetailName
                           scope.row.taskTypeDetailName
                         }}
                         }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="下单时间" prop="entrustDate" align="center" width="100">
+                    <el-table-column
+                      label="下单时间"
+                      prop="entrustDate"
+                      align="center"
+                      width="100"
+                    >
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="完成时间" prop="finishedDate" align="center" width="100">
+                    <el-table-column
+                      label="完成时间"
+                      prop="finishedDate"
+                      align="center"
+                      width="100"
+                    >
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="收费" prop="amount" align="center" width="80">
+                    <el-table-column
+                      label="收费"
+                      prop="amount"
+                      header-align="center"
+                      align="right"
+                      width="80"
+                    >
+                      <template #default="scope">
+                        <span>{{ rowNum(scope.row.amount) }}</span>
+                      </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="说明" align="center" prop="description" />
+                    <el-table-column
+                      label="说明"
+                      align="center"
+                      prop="description"
+                    />
                   </el-table>
                   </el-table>
                 </el-tab-pane>
                 </el-tab-pane>
               </el-tabs>
               </el-tabs>
@@ -186,7 +365,12 @@
       </div>
       </div>
     </el-drawer>
     </el-drawer>
     <!-- 图片预览 -->
     <!-- 图片预览 -->
-    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
+    <el-image-viewer
+      v-if="showViewer"
+      :url-list="currentFileList"
+      @close="closeImages"
+      :initial-index="showIndex"
+    />
   </div>
   </div>
 </template>
 </template>
 <script setup>
 <script setup>
@@ -204,6 +388,7 @@ import {
   confirmDeduct,
   confirmDeduct,
   rejectDeduct,
   rejectDeduct,
 } from "@/api/business/entrust/deduct";
 } from "@/api/business/entrust/deduct";
+import { rowNum } from "@/utils/index";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
 import { deepClone } from "@/utils";
 import { deepClone } from "@/utils";
 import {
 import {
@@ -218,7 +403,7 @@ const { proxy } = getCurrentInstance();
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   },
 });
 });
 
 

+ 76 - 19
src/views/business/entrust/deduct/index.vue

@@ -8,7 +8,9 @@
               <span>预存款余额</span>
               <span>预存款余额</span>
             </span>
             </span>
           </div>
           </div>
-          <div class="number-label">¥ {{ totalRemain ? totalRemain : 0 }}</div>
+          <div class="number-label">
+            ¥ {{ rowNum(totalRemain ? totalRemain : 0) }}
+          </div>
         </div>
         </div>
       </el-col>
       </el-col>
       <el-col :span="12">
       <el-col :span="12">
@@ -19,22 +21,29 @@
             </span>
             </span>
           </div>
           </div>
           <div class="number-label">
           <div class="number-label">
-            ¥ {{ donateRemain ? donateRemain : 0 }}
+            ¥ {{ rowNum(donateRemain ? donateRemain : 0) }}
           </div>
           </div>
         </div>
         </div>
       </el-col>
       </el-col>
     </el-row>
     </el-row>
     <!-- 功能按钮区 -->
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
     <div class="list-btns-container">
-      <el-button type="success" size="small" icon="Refresh" @click="getList">刷新</el-button>
+      <el-button type="success" size="small" icon="Refresh" @click="getList"
+        >刷新</el-button
+      >
       <el-dropdown>
       <el-dropdown>
         <el-button type="primary" size="small">
         <el-button type="primary" size="small">
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
         </el-button>
         </el-button>
         <template #dropdown>
         <template #dropdown>
           <el-dropdown-menu>
           <el-dropdown-menu>
-            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:deduct:export']">
-              导出</el-dropdown-item>
+            <el-dropdown-item
+              icon="Download"
+              @click="handleExport"
+              v-hasPermi="['business:deduct:export']"
+            >
+              导出</el-dropdown-item
+            >
             <!-- <el-dropdown-item type="warning" size="small" icon="Download" @click="handleArea"
             <!-- <el-dropdown-item type="warning" size="small" icon="Download" @click="handleArea"
               v-hasPermi="['business:workOrder:export']"> area</el-dropdown-item> -->
               v-hasPermi="['business:workOrder:export']"> area</el-dropdown-item> -->
           </el-dropdown-menu>
           </el-dropdown-menu>
@@ -54,30 +63,77 @@
     </el-form> -->
     </el-form> -->
 
 
     <!-- 列表区 -->
     <!-- 列表区 -->
-    <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
-      @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="orderList"
+      size="small"
+      border
+      height="100%"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="委托单号" align="center" prop="formNo" min-width="140" />
-      <el-table-column label="扣款单位" align="center" prop="contactCompany" min-width="150" />
+      <el-table-column
+        label="委托单号"
+        align="center"
+        prop="formNo"
+        min-width="140"
+      />
+      <el-table-column
+        label="扣款单位"
+        align="center"
+        prop="contactCompany"
+        min-width="150"
+      />
       <el-table-column label="扣款信息" align="center">
       <el-table-column label="扣款信息" align="center">
         <template #default="scope">
         <template #default="scope">
           {{ scope.row.year }}年{{ scope.row.month }}月扣款
           {{ scope.row.year }}年{{ scope.row.month }}月扣款
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="扣款时间" align="center" prop="deductDate" min-width="120" />
-      <el-table-column label="扣款金额" header-align="center" align="right" prop="amount" min-width="80" />
-      <el-table-column label="扣款明细" align="center" prop="amount" min-width="80">
+      <el-table-column
+        label="扣款时间"
+        align="center"
+        prop="deductDate"
+        min-width="120"
+      />
+      <el-table-column
+        label="扣款金额"
+        header-align="center"
+        align="right"
+        prop="amount"
+        min-width="80"
+      >
+        <template #default="scope">
+          <span> {{ rowNum(scope.row.amount) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="扣款明细"
+        align="center"
+        prop="amount"
+        min-width="80"
+      >
         <template #default="scope">
         <template #default="scope">
           <!-- <el-button link size="small" type="primary" @click="handleDetail(scope.row)">查看明细</el-button> -->
           <!-- <el-button link size="small" type="primary" @click="handleDetail(scope.row)">查看明细</el-button> -->
-          <el-button link size="small" type="primary" v-hasPermi="['business:deduct:info']"
-            @click="handleStatementAccount(scope.row)">跳转对账单</el-button>
+          <el-button
+            link
+            size="small"
+            type="primary"
+            v-hasPermi="['business:deduct:info']"
+            @click="handleStatementAccount(scope.row)"
+            >跳转对账单</el-button
+          >
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
     <statementAccountForm ref="statementAccountFormRef" :get-list="getList" />
     <statementAccountForm ref="statementAccountFormRef" :get-list="getList" />
     <!-- 分页 -->
     <!-- 分页 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
   </div>
 </template>
 </template>
 
 
@@ -88,6 +144,7 @@ import {
   delDeduct,
   delDeduct,
   exportDeduct,
   exportDeduct,
 } from "@/api/business/entrust/deduct";
 } from "@/api/business/entrust/deduct";
+import { rowNum } from "@/utils/index";
 import statementAccountForm from "./form.vue";
 import statementAccountForm from "./form.vue";
 import { getRemain } from "@/api/business/entrust/deposit";
 import { getRemain } from "@/api/business/entrust/deposit";
 // import companyForm from "./form"
 // import companyForm from "./form"
@@ -168,7 +225,7 @@ function handleDelete(row) {
       getList();
       getList();
       proxy.$modal.msgSuccess("删除成功!");
       proxy.$modal.msgSuccess("删除成功!");
     })
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 }
 
 
 /** 导出按钮操作 */
 /** 导出按钮操作 */
@@ -206,11 +263,11 @@ function saveHandler(row, field) {
           getList();
           getList();
         });
         });
       })
       })
-      .catch((_) => { });
+      .catch((_) => {});
   }
   }
 }
 }
 
 
-function handleDetail(row) { }
+function handleDetail(row) {}
 
 
 function handleStatementAccount(row) {
 function handleStatementAccount(row) {
   statementAccountFormRef.value.open(row.id);
   statementAccountFormRef.value.open(row.id);

+ 241 - 69
src/views/business/entrust/deposit/index.vue

@@ -2,20 +2,44 @@
   <div class="page-container list-container">
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
     <div class="list-btns-container">
-      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
-        v-hasPermi="['business:deposit:add']">新增</el-button>
-      <el-button type="danger" size="small" icon="Delete" :disabled="multiple" @click="handleDelete"
-        v-hasPermi="['business:deposit:remove']">删除</el-button>
-      <el-button type="success" size="small" icon="Refresh" @click="getList"
-        v-hasPermi="['business:entrustOrder:remove']">刷新</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        icon="Plus"
+        @click="handleAdd"
+        v-hasPermi="['business:deposit:add']"
+        >新增</el-button
+      >
+      <el-button
+        type="danger"
+        size="small"
+        icon="Delete"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['business:deposit:remove']"
+        >删除</el-button
+      >
+      <el-button
+        type="success"
+        size="small"
+        icon="Refresh"
+        @click="getList"
+        v-hasPermi="['business:entrustOrder:remove']"
+        >刷新</el-button
+      >
       <el-dropdown>
       <el-dropdown>
         <el-button type="primary" size="small">
         <el-button type="primary" size="small">
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
         </el-button>
         </el-button>
         <template #dropdown>
         <template #dropdown>
           <el-dropdown-menu>
           <el-dropdown-menu>
-            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:deposit:export']">
-              导出</el-dropdown-item>
+            <el-dropdown-item
+              icon="Download"
+              @click="handleExport"
+              v-hasPermi="['business:deposit:export']"
+            >
+              导出</el-dropdown-item
+            >
             <!-- <el-dropdown-item type="warning" size="small" icon="Download" @click="handleArea"
             <!-- <el-dropdown-item type="warning" size="small" icon="Download" @click="handleArea"
               v-hasPermi="['business:deposit:export']"> area</el-dropdown-item> -->
               v-hasPermi="['business:deposit:export']"> area</el-dropdown-item> -->
           </el-dropdown-menu>
           </el-dropdown-menu>
@@ -38,60 +62,146 @@
     </el-form> -->
     </el-form> -->
 
 
     <!-- 列表区 -->
     <!-- 列表区 -->
-    <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
-      @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="orderList"
+      size="small"
+      border
+      height="100%"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="日期" align="center" prop="depositDate" min-width="200" />
-      <el-table-column label="委托单号" align="center" prop="formNo" min-width="120" />
-      <el-table-column label="预存单位" align="center" prop="contactCompany" min-width="150" />
-      <el-table-column label="签约主体" align="center" prop="signingSubject" min-width="150" />
-      <el-table-column label="金额" header-align="center" align="right" prop="amount" width="120" />
-      <!-- <el-table-column label="附件" align="center" prop="files">
+      <el-table-column
+        label="日期"
+        align="center"
+        prop="depositDate"
+        min-width="200"
+      />
+      <el-table-column
+        label="委托单号"
+        align="center"
+        prop="formNo"
+        min-width="120"
+      />
+      <el-table-column
+        label="预存单位"
+        align="center"
+        prop="contactCompany"
+        min-width="150"
+      />
+      <el-table-column
+        label="签约主体"
+        align="center"
+        prop="signingSubject"
+        min-width="150"
+      />
+      <el-table-column
+        label="金额"
+        header-align="center"
+        align="right"
+        prop="amount"
+        width="120"
+      >
         <template #default="scope">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            size="small"
-            @click="showFileList(scope.row)"
-            >查看</el-button
-          >
+          <span>{{ rowNum(scope.row.amount) }}</span>
         </template>
         </template>
-      </el-table-column> -->
-      <el-table-column label="审核状态" align="center" min-width="80" prop="remark">
+      </el-table-column>
+
+      <el-table-column
+        label="审核状态"
+        align="center"
+        min-width="80"
+        prop="remark"
+      >
         <template #default="scope">
         <template #default="scope">
           <dict-tag :options="verify_status" :value="scope.row.status" />
           <dict-tag :options="verify_status" :value="scope.row.status" />
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="操作" align="center" prop="verifyStatus" min-width="200">
+      <el-table-column
+        label="操作"
+        align="center"
+        prop="verifyStatus"
+        min-width="200"
+      >
         <template #default="scope">
         <template #default="scope">
-          <el-button v-show="scope.row.status === 0" link type="warning" size="small" @click="handleInfo(scope.row)"
-            v-hasPermi="['business:deposit:edit']">修改</el-button>
-          <el-button v-show="scope.row.status === 0" link type="danger" size="small" @click="handleDelete(scope.row)"
-            v-hasPermi="['business:deposit:remove']">删除</el-button>
-          <el-button v-show="scope.row.status === 0" link type="success" size="small" @click="handleVerify(scope.row, 1)"
-            v-hasPermi="['business:deposit:verify']">审核通过</el-button>
-          <el-button v-show="scope.row.status === 0" link type="danger" size="small" @click="handleVerify(scope.row, 4)"
-            v-hasPermi="['business:deposit:verify']">驳回</el-button>
-          <el-button v-show="scope.row.status !== 0" link type="primary" size="small" @click="handleInfo(scope.row)"
-            v-hasPermi="['business:deposit:query']">查看</el-button>
+          <el-button
+            v-show="scope.row.status === 0"
+            link
+            type="warning"
+            size="small"
+            @click="handleInfo(scope.row)"
+            v-hasPermi="['business:deposit:edit']"
+            >修改</el-button
+          >
+          <el-button
+            v-show="scope.row.status === 0"
+            link
+            type="danger"
+            size="small"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:deposit:remove']"
+            >删除</el-button
+          >
+          <el-button
+            v-show="scope.row.status === 0"
+            link
+            type="success"
+            size="small"
+            @click="handleVerify(scope.row, 1)"
+            v-hasPermi="['business:deposit:verify']"
+            >审核通过</el-button
+          >
+          <el-button
+            v-show="scope.row.status === 0"
+            link
+            type="danger"
+            size="small"
+            @click="handleVerify(scope.row, 4)"
+            v-hasPermi="['business:deposit:verify']"
+            >驳回</el-button
+          >
+          <el-button
+            v-show="scope.row.status !== 0"
+            link
+            type="primary"
+            size="small"
+            @click="handleInfo(scope.row)"
+            v-hasPermi="['business:deposit:query']"
+            >查看</el-button
+          >
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
     <!-- <Deposit-form ref="DepositRef" :get-list="getList" /> -->
     <!-- <Deposit-form ref="DepositRef" :get-list="getList" /> -->
-    <el-dialog title="存款信息" v-model="formOpen" width="500px" append-to-body draggable @close="formCancel">
+    <el-dialog
+      title="存款信息"
+      v-model="formOpen"
+      width="500px"
+      append-to-body
+      draggable
+      @close="formCancel"
+    >
       <el-form ref="dictRef" :model="form" label-width="100" size="small">
       <el-form ref="dictRef" :model="form" label-width="100" size="small">
         <el-row :gutter="30">
         <el-row :gutter="30">
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="预存合同:">
             <el-form-item label="预存合同:">
-              <el-autocomplete v-if="form.status == 0" :fetch-suggestions="querySearchEntrustOrderAsync"
-                :trigger-on-focus="true" v-model="form.formNo" placeholder="请输入客户名称" popper-class="my-autocomplete"
-                @select="handleSelectEntrustOrder">
+              <el-autocomplete
+                v-if="form.status == 0"
+                :fetch-suggestions="querySearchEntrustOrderAsync"
+                :trigger-on-focus="true"
+                v-model="form.formNo"
+                placeholder="请输入客户名称"
+                popper-class="my-autocomplete"
+                @select="handleSelectEntrustOrder"
+              >
                 <template #default="{ item }">
                 <template #default="{ item }">
-                  <div style="
+                  <div
+                    style="
                       display: flex;
                       display: flex;
                       flex-direction: row;
                       flex-direction: row;
                       justify-content: space-between;
                       justify-content: space-between;
-                    ">
+                    "
+                  >
                     <div class="name" style="font-size: 12px">
                     <div class="name" style="font-size: 12px">
                       {{ item.formNo }}-{{ item.signingSubject }}
                       {{ item.formNo }}-{{ item.signingSubject }}
                     </div>
                     </div>
@@ -113,32 +223,77 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="存款金额:">
             <el-form-item label="存款金额:">
-              <el-input-number v-if="form.status == 0" v-model="form.amount" :precision="2" :step="0.1" :min="0"
-                :controls="false" />
-              <div v-else>{{ form.amount }}</div>
+              <el-input-number
+                v-if="form.status == 0"
+                v-model="form.amount"
+                :precision="2"
+                :step="0.1"
+                :min="0"
+                :controls="false"
+              />
+              <div v-else>{{ rowNum(form.amount) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="凭证附件:">
             <el-form-item label="凭证附件:">
               <div class="details-btns-container" style="display: flex">
               <div class="details-btns-container" style="display: flex">
-                <el-upload v-if="form.status == 0" action="#" :http-request="upload" :with-credentials="true"
-                  :show-file-list="false" multiple>
-                  <el-button size="small" type="primary" icon="Upload">点击上传</el-button>
+                <el-upload
+                  v-if="form.status == 0"
+                  action="#"
+                  :http-request="upload"
+                  :with-credentials="true"
+                  :show-file-list="false"
+                  multiple
+                >
+                  <el-button size="small" type="primary" icon="Upload"
+                    >点击上传</el-button
+                  >
                 </el-upload>
                 </el-upload>
               </div>
               </div>
-              <el-table ref="filesTable" :data="form.files" size="small" height="200px" border
-                header-row-class-name="list-header-row">
-                <el-table-column type="index" label="序号" width="47" align="center" />
-                <el-table-column label="文件名" prop="originalFileName" align="center">
+              <el-table
+                ref="filesTable"
+                :data="form.files"
+                size="small"
+                height="200px"
+                border
+                header-row-class-name="list-header-row"
+              >
+                <el-table-column
+                  type="index"
+                  label="序号"
+                  width="47"
+                  align="center"
+                />
+                <el-table-column
+                  label="文件名"
+                  prop="originalFileName"
+                  align="center"
+                >
                   <template #default="scope">
                   <template #default="scope">
-                    <el-link :href="`${baseUrl}${scope.row.fileUrl}`" :underline="false" target="_blank" type="primary">
+                    <el-link
+                      :href="`${baseUrl}${scope.row.fileUrl}`"
+                      :underline="false"
+                      target="_blank"
+                      type="primary"
+                    >
                       {{ scope.row.originalFileName }}
                       {{ scope.row.originalFileName }}
                     </el-link>
                     </el-link>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column v-if="form.status == 0" label="操作" width="47" align="center">
+                <el-table-column
+                  v-if="form.status == 0"
+                  label="操作"
+                  width="47"
+                  align="center"
+                >
                   <template #default="scope">
                   <template #default="scope">
-                    <el-button link size="small" type="danger" @click="handleDelFile(scope.$index)">删除</el-button>
+                    <el-button
+                      link
+                      size="small"
+                      type="danger"
+                      @click="handleDelFile(scope.$index)"
+                      >删除</el-button
+                    >
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
               </el-table>
               </el-table>
@@ -148,20 +303,37 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <div v-if="form.status == 0" class="dialog-footer">
         <div v-if="form.status == 0" class="dialog-footer">
-          <el-button type="primary" icon="Finished" size="small" @click="saveHandler">确 定</el-button>
-          <el-button @click="formCancel" icon="close" size="small">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="saveHandler"
+            >确 定</el-button
+          >
+          <el-button @click="formCancel" icon="close" size="small"
+            >取 消</el-button
+          >
         </div>
         </div>
       </template>
       </template>
     </el-dialog>
     </el-dialog>
     <!-- 分页 -->
     <!-- 分页 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
-    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <el-image-viewer
+      v-if="showViewer"
+      :url-list="currentFileList"
+      @close="closeImages"
+      :initial-index="showIndex"
+    />
   </div>
   </div>
 </template>
 </template>
 
 
 <script setup name="Company">
 <script setup name="Company">
-// import contractForm from "./form";
 import {
 import {
   listDeposit,
   listDeposit,
   delDeposit,
   delDeposit,
@@ -172,7 +344,7 @@ import {
   listEntrustOrder,
   listEntrustOrder,
   verifyDeposit,
   verifyDeposit,
 } from "@/api/business/entrust/deposit";
 } from "@/api/business/entrust/deposit";
-// import ElImageViewer from 'element-plus/lib/components/image-viewer';
+import { rowNum } from "@/utils/index";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
 import { listCompany } from "@/api/business/crm/company";
 import { listCompany } from "@/api/business/crm/company";
 import { ref } from "vue";
 import { ref } from "vue";
@@ -290,7 +462,7 @@ function handleDelete(row) {
       getList();
       getList();
       proxy.$modal.msgSuccess("删除成功!");
       proxy.$modal.msgSuccess("删除成功!");
     })
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 }
 
 
 /** 导出按钮操作 */
 /** 导出按钮操作 */
@@ -387,12 +559,12 @@ function querySearchEntrustOrderAsync(queryString, cb) {
   const query =
   const query =
     queryString.length > 0
     queryString.length > 0
       ? {
       ? {
-        keyword: queryString,
-        pageSize: 20,
-        pageNum: 1,
-        status: 1,
-        orderByColumn: "create_time",
-      }
+          keyword: queryString,
+          pageSize: 20,
+          pageNum: 1,
+          status: 1,
+          orderByColumn: "create_time",
+        }
       : { pageSize: 20, pageNum: 1, status: 1, orderByColumn: "create_time" };
       : { pageSize: 20, pageNum: 1, status: 1, orderByColumn: "create_time" };
   listEntrustOrder(query).then((res) => {
   listEntrustOrder(query).then((res) => {
     cb(res.rows);
     cb(res.rows);

+ 164 - 37
src/views/business/entrust/entrustOrder/index.vue

@@ -2,77 +2,203 @@
   <div class="page-container list-container">
   <div class="page-container list-container">
     <!-- 功能按钮区 -->
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
     <div class="list-btns-container">
-      <el-button type="primary" size="small" icon="Plus" @click="handleAdd"
-        v-hasPermi="['business:entrustOrder:add']">新增</el-button>
-      <el-button type="danger" size="small" icon="Delete" :disabled="!multiple" @click="handleDelete"
-        v-hasPermi="['business:entrustOrder:remove']">删除</el-button>
-      <el-button type="success" size="small" icon="Refresh" @click="getList"
-        v-hasPermi="['business:entrustOrder:remove']">刷新</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        icon="Plus"
+        @click="handleAdd"
+        v-hasPermi="['business:entrustOrder:add']"
+        >新增</el-button
+      >
+      <el-button
+        type="danger"
+        size="small"
+        icon="Delete"
+        :disabled="!multiple"
+        @click="handleDelete"
+        v-hasPermi="['business:entrustOrder:remove']"
+        >删除</el-button
+      >
+      <el-button
+        type="success"
+        size="small"
+        icon="Refresh"
+        @click="getList"
+        v-hasPermi="['business:entrustOrder:remove']"
+        >刷新</el-button
+      >
       <el-dropdown>
       <el-dropdown>
         <el-button type="primary" size="small">
         <el-button type="primary" size="small">
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
           其它<el-icon class="el-icon--right"><arrow-down /></el-icon>
         </el-button>
         </el-button>
         <template #dropdown>
         <template #dropdown>
           <el-dropdown-menu>
           <el-dropdown-menu>
-            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:entrustOrder:export']">
-              导出</el-dropdown-item>
+            <el-dropdown-item
+              icon="Download"
+              @click="handleExport"
+              v-hasPermi="['business:entrustOrder:export']"
+            >
+              导出</el-dropdown-item
+            >
           </el-dropdown-menu>
           </el-dropdown-menu>
         </template>
         </template>
       </el-dropdown>
       </el-dropdown>
     </div>
     </div>
     <!-- 搜索区 -->
     <!-- 搜索区 -->
-    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
-      label-width="68px" @submit.native.prevent>
+    <el-form
+      class="list-search-container"
+      size="small"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      label-width="68px"
+      @submit.native.prevent
+    >
       <el-form-item label="往来单位:" prop="contactCompany">
       <el-form-item label="往来单位:" prop="contactCompany">
-        <el-input v-model="queryParams.contactCompany" placeholder="请输入往来单位" style="width: 150px" clearable
-          @keyup.enter="handleQuery" />
+        <el-input
+          v-model="queryParams.contactCompany"
+          placeholder="请输入往来单位"
+          style="width: 150px"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
 
 
     <!-- 列表区 -->
     <!-- 列表区 -->
-    <el-table v-loading="loading" :data="list" size="small" border height="100%"
-      @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="list"
+      size="small"
+      border
+      height="100%"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
       <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-      <el-table-column label="签约主体" align="center" min-width="150" prop="signingSubject" />
-      <el-table-column label="签约日期" align="center" prop="formDate" min-width="80" />
-      <el-table-column label="合同编号" align="center" prop="formNo" min-width="150">
+      <el-table-column
+        label="签约主体"
+        align="center"
+        min-width="150"
+        prop="signingSubject"
+      />
+      <el-table-column
+        label="签约日期"
+        align="center"
+        prop="formDate"
+        min-width="80"
+      />
+      <el-table-column
+        label="合同编号"
+        align="center"
+        prop="formNo"
+        min-width="150"
+      >
       </el-table-column>
       </el-table-column>
-      <el-table-column label="往来单位" align="center" prop="contactCompany" min-width="150">
+      <el-table-column
+        label="往来单位"
+        align="center"
+        prop="contactCompany"
+        min-width="150"
+      >
       </el-table-column>
       </el-table-column>
-      <el-table-column label="预存金额" prop="depositAmount" align="center" min-width="80">
+      <el-table-column
+        label="预存金额"
+        prop="depositAmount"
+        header-align="center"
+        align="right"
+        min-width="80"
+      >
+        <template #default="scope">
+          <span>{{ rowNum(scope.row.depositAmount) }}</span>
+        </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="结余金额" prop="remainAmount" align="center" min-width="80">
+      <el-table-column
+        label="结余金额"
+        prop="remainAmount"
+        header-align="center"
+        align="right"
+        min-width="80"
+        ><template #default="scope">
+          <span>{{ rowNum(scope.row.remainAmount) }}</span>
+        </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="状态" prop="status" align="center" minm-width="100">
+      <el-table-column
+        label="状态"
+        prop="status"
+        align="center"
+        minm-width="100"
+      >
         <template #default="scope">
         <template #default="scope">
           <dict-tag :options="entrust_order_status" :value="scope.row.status" />
           <dict-tag :options="entrust_order_status" :value="scope.row.status" />
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="操作" align="center" min-width="150" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        min-width="150"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
         <template #default="scope">
-          <el-button link type="primary" size="small" @click="handleUpdate(scope.row.id)"
-            v-hasPermi="['business:entrustOrder:query']">详情</el-button>
-          <el-button v-show="scope.row.status === 0" link type="primary" size="small" @click="handleConfirm(scope.row)"
-            v-hasPermi="['business:entrustOrder:confirm']">确认订单</el-button>
-          <el-button v-show="scope.row.status === 1" link type="primary" size="small" @click="handleFinished(scope.row)"
-            v-hasPermi="['business:entrustOrder:finished']">确认完结</el-button>
-
-          <router-link v-if="scope.row.status !== 0" :to="'/entrust/statusment/order/' + scope.row.id" class="link-type">
-            <el-button link size="small" style="margin-left: 10px" type="primary"
-              v-hasPermi="['business:entrustOrder:statement:list']">对账单列表</el-button>
+          <el-button
+            link
+            type="primary"
+            size="small"
+            @click="handleUpdate(scope.row.id)"
+            v-hasPermi="['business:entrustOrder:query']"
+            >详情</el-button
+          >
+          <el-button
+            v-show="scope.row.status === 0"
+            link
+            type="primary"
+            size="small"
+            @click="handleConfirm(scope.row)"
+            v-hasPermi="['business:entrustOrder:confirm']"
+            >确认订单</el-button
+          >
+          <el-button
+            v-show="scope.row.status === 1"
+            link
+            type="primary"
+            size="small"
+            @click="handleFinished(scope.row)"
+            v-hasPermi="['business:entrustOrder:finished']"
+            >确认完结</el-button
+          >
+
+          <router-link
+            v-if="scope.row.status !== 0"
+            :to="'/entrust/statusment/order/' + scope.row.id"
+            class="link-type"
+          >
+            <el-button
+              link
+              size="small"
+              style="margin-left: 10px"
+              type="primary"
+              v-hasPermi="['business:entrustOrder:statement:list']"
+              >对账单列表</el-button
+            >
           </router-link>
           </router-link>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
     <entrust-order-form ref="entrustOrderFormRef" :getList="getList" />
     <entrust-order-form ref="entrustOrderFormRef" :getList="getList" />
     <!-- 分页 -->
     <!-- 分页 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
   </div>
 </template>
 </template>
 
 
@@ -85,6 +211,7 @@ import {
   finishedEntrustOrder,
   finishedEntrustOrder,
 } from "@/api/business/entrust/entrustOrder";
 } from "@/api/business/entrust/entrustOrder";
 import entrustOrderForm from "./form";
 import entrustOrderForm from "./form";
+import { rowNum } from "@/utils/index";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 /** 字典数组区 */
 /** 字典数组区 */
 /** 查询 对象 */
 /** 查询 对象 */
@@ -173,7 +300,7 @@ function handleDelete(row) {
       getList();
       getList();
       proxy.$modal.msgSuccess("删除成功!");
       proxy.$modal.msgSuccess("删除成功!");
     })
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 }
 
 
 function handleConfirm(row) {
 function handleConfirm(row) {
@@ -202,7 +329,7 @@ function handleFinished(row) {
     });
     });
 }
 }
 
 
-function handleViewAccountment(row) { }
+function handleViewAccountment(row) {}
 
 
 getList();
 getList();
 </script>
 </script>

+ 367 - 120
src/views/business/entrust/statementAccount/form.vue

@@ -5,18 +5,46 @@
       <div class="page-container form-container">
       <div class="page-container form-container">
         <!-- 功能按钮区域 -->
         <!-- 功能按钮区域 -->
         <div class="form-btns-container">
         <div class="form-btns-container">
-          <span class="title-label"><el-icon>
+          <span class="title-label"
+            ><el-icon>
               <Document />
               <Document />
             </el-icon>
             </el-icon>
-            对账单表单</span>
-
-          <el-button v-if="editStatus" type="primary" size="small" icon="Finished" @click="submitForm">保存</el-button>
-          <el-button v-else-if="form.entrustOrderStatus !== 2" type="warning" size="small" icon="Edit"
-            @click="editStatus = true">修改</el-button>
-          <el-button v-if="form.id && editStatus" type="info" size="small" icon="Close"
-            @click="editStatus = false">取消修改</el-button>
-          <el-button v-if="form.id" type="success" icon="refresh" size="small" @click="getForm">
-            刷新</el-button>
+            对账单表单</span
+          >
+
+          <el-button
+            v-if="editStatus"
+            type="primary"
+            size="small"
+            icon="Finished"
+            @click="submitForm"
+            >保存</el-button
+          >
+          <el-button
+            v-else-if="form.entrustOrderStatus !== 2"
+            type="warning"
+            size="small"
+            icon="Edit"
+            @click="editStatus = true"
+            >修改</el-button
+          >
+          <el-button
+            v-if="form.id && editStatus"
+            type="info"
+            size="small"
+            icon="Close"
+            @click="editStatus = false"
+            >取消修改</el-button
+          >
+          <el-button
+            v-if="form.id"
+            type="success"
+            icon="refresh"
+            size="small"
+            @click="getForm"
+          >
+            刷新</el-button
+          >
 
 
           <div class="screen-btn" @click="handleScreen">
           <div class="screen-btn" @click="handleScreen">
             <template v-if="!isFullscreen">
             <template v-if="!isFullscreen">
@@ -33,32 +61,64 @@
             <!-- <span>关闭</span> -->
             <!-- <span>关闭</span> -->
           </div>
           </div>
         </div>
         </div>
-        <el-form ref="companyRef" class="master-container" size="small" :model="form" :rules="rules" label-width="120px">
+        <el-form
+          ref="companyRef"
+          class="master-container"
+          size="small"
+          :model="form"
+          :rules="rules"
+          label-width="120px"
+        >
           <el-row :gutter="30">
           <el-row :gutter="30">
             <el-col :span="6"> 结算单位:{{ form.contactCompany }} </el-col>
             <el-col :span="6"> 结算单位:{{ form.contactCompany }} </el-col>
             <el-col :span="6"> 结算订单编号:{{ form.formNo }} </el-col>
             <el-col :span="6"> 结算订单编号:{{ form.formNo }} </el-col>
-            <el-col :span="4"> 上期余额:{{ form.prevRemainAmount }} </el-col>
-            <el-col :span="4"> 本期消耗:{{ form.amount }} </el-col>
-            <el-col :span="4"> 本期余额:{{ form.remainAmount }} </el-col>
+            <el-col :span="4">
+              上期余额:{{ rowNum(form.prevRemainAmount) }}
+            </el-col>
+            <el-col :span="4"> 本期消耗:{{ rowNum(form.amount) }} </el-col>
+            <el-col :span="4">
+              本期余额:{{ rowNum(form.remainAmount) }}
+            </el-col>
             <el-col :span="24">
             <el-col :span="24">
               <el-tabs v-model="activeName">
               <el-tabs v-model="activeName">
                 <el-tab-pane label="汇总" name="base" class="baseTable">
                 <el-tab-pane label="汇总" name="base" class="baseTable">
-                  <table class="header" cellspacing="0" cellpadding="0" style="table-layout: fixed">
+                  <table
+                    class="header"
+                    cellspacing="0"
+                    cellpadding="0"
+                    style="table-layout: fixed"
+                  >
                     <tbody>
                     <tbody>
                       <tr class="bg-white-color">
                       <tr class="bg-white-color">
                         <td :colspan="1" style="width: 100px">自然月</td>
                         <td :colspan="1" style="width: 100px">自然月</td>
                         <td :colspan="2" style="width: 200px">项目分类</td>
                         <td :colspan="2" style="width: 200px">项目分类</td>
-                        <td :colspan="1" style="width: 100px;">客户数量(单位:户)</td>
-                        <td :colspan="1" style="width: 100px;">单价(单位:元)</td>
-                        <td :colspan="1" style="width: 100px;">小计(单位:元)</td>
-                        <td :colspan="1" style="width: 100px;">优惠后单价</td>
-                        <td :colspan="1" style="width: 100px;">优惠后金额</td>
-                        <td :colspan="1" style="width: 100px;">减免金额</td>
-                        <td :colspan="1" style="width: 100px;">实际支付</td>
-                        <td :colspan="2" class="tdLast" style="width: 300px;">说明</td>
+                        <td :colspan="1" style="width: 100px">
+                          客户数量(单位:户)
+                        </td>
+                        <td :colspan="1" style="width: 100px">
+                          单价(单位:元)
+                        </td>
+                        <td :colspan="1" style="width: 100px">
+                          小计(单位:元)
+                        </td>
+                        <td :colspan="1" style="width: 100px">优惠后单价</td>
+                        <td :colspan="1" style="width: 100px">优惠后金额</td>
+                        <td :colspan="1" style="width: 100px">减免金额</td>
+                        <td :colspan="1" style="width: 100px">实际支付</td>
+                        <td :colspan="2" class="tdLast" style="width: 300px">
+                          说明
+                        </td>
                       </tr>
                       </tr>
-                      <tr class="bg-white-color" v-for="(item, index) in form.collect" :key="index">
-                        <td :colspan="1" v-if="index === 0" :rowspan="form.collect.length">
+                      <tr
+                        class="bg-white-color"
+                        v-for="(item, index) in form.collect"
+                        :key="index"
+                      >
+                        <td
+                          :colspan="1"
+                          v-if="index === 0"
+                          :rowspan="form.collect.length"
+                        >
                           <!-- {{ item.year }}年{{ item.month}}月 -->
                           <!-- {{ item.year }}年{{ item.month}}月 -->
                           {{ form.startMonth }} - {{ form.endMonth }}
                           {{ form.startMonth }} - {{ form.endMonth }}
                         </td>
                         </td>
@@ -66,9 +126,9 @@
                         <td :colspan="1">
                         <td :colspan="1">
                           {{
                           {{
                             item.taskType === "代理记账"
                             item.taskType === "代理记账"
-                            ? item.annualIncome
-                            : item.taskType === "社保代缴" ||
-                              item.taskType === "公积金代缴"
+                              ? item.annualIncome
+                              : item.taskType === "社保代缴" ||
+                                item.taskType === "公积金代缴"
                               ? item.haveChanged === 1
                               ? item.haveChanged === 1
                                 ? "有变化"
                                 ? "有变化"
                                 : "无变化"
                                 : "无变化"
@@ -77,39 +137,86 @@
                         </td>
                         </td>
                         <td :colspan="1">{{ item.companyNum }}</td>
                         <td :colspan="1">{{ item.companyNum }}</td>
                         <td :colspan="1">
                         <td :colspan="1">
-                          <template v-if="item.taskType === '工商代办'">-</template>
+                          <template v-if="item.taskType === '工商代办'"
+                            >-</template
+                          >
                           <template v-else-if="editStatus">
                           <template v-else-if="editStatus">
-                            <el-input-number v-model="item.price" size="small" placeholder="" :precision="2"
-                              :controls="false" style="width: 100%" @change="(arg) => itemChangeHandle(item, 'price')" />
+                            <el-input-number
+                              v-model="item.price"
+                              size="small"
+                              placeholder=""
+                              :precision="2"
+                              :controls="false"
+                              style="width: 100%"
+                              @change="(arg) => itemChangeHandle(item, 'price')"
+                            />
                           </template>
                           </template>
-                          <template v-else>{{ item.price }}</template>
+                          <template v-else>{{ rowNum(item.price) }}</template>
                         </td>
                         </td>
-                        <td :colspan="1">{{ item.amount }}</td>
+                        <td :colspan="1">{{ rowNum(item.amount) }}</td>
                         <td :colspan="1">
                         <td :colspan="1">
-                          <template v-if="item.taskType === '工商代办'">-</template>
+                          <template v-if="item.taskType === '工商代办'"
+                            >-</template
+                          >
                           <template v-else-if="editStatus">
                           <template v-else-if="editStatus">
-                            <el-input-number v-model="item.discountPrice" size="small" placeholder="" :precision="2"
-                              :controls="false" style="width: 100%"
-                              @change="(arg) => itemChangeHandle(item, 'discountPrice')" />
+                            <el-input-number
+                              v-model="item.discountPrice"
+                              size="small"
+                              placeholder=""
+                              :precision="2"
+                              :controls="false"
+                              style="width: 100%"
+                              @change="
+                                (arg) => itemChangeHandle(item, 'discountPrice')
+                              "
+                            />
                           </template>
                           </template>
-                          <template v-else>{{ item.discountPrice }}</template>
+                          <template v-else>{{
+                            rowNum(item.discountPrice)
+                          }}</template>
                         </td>
                         </td>
-                        <td :colspan="1">{{ item.discountAmount }}</td>
+                        <td :colspan="1">{{ rowNum(item.discountAmount) }}</td>
                         <td :colspan="1">
                         <td :colspan="1">
                           <template v-if="editStatus">
                           <template v-if="editStatus">
-                            <el-input-number v-model="item.freeAmount" size="small" placeholder="" :precision="2"
-                              :controls="false" style="width: 100%"
-                              :max="item.discountPrice == null ? item.amount : item.discountAmount"
-                              @change="(arg) => itemChangeHandle(item, 'freeAmount', arg)" />
+                            <el-input-number
+                              v-model="item.freeAmount"
+                              size="small"
+                              placeholder=""
+                              :precision="2"
+                              :controls="false"
+                              style="width: 100%"
+                              :max="
+                                item.discountPrice == null
+                                  ? item.amount
+                                  : item.discountAmount
+                              "
+                              @change="
+                                (arg) =>
+                                  itemChangeHandle(item, 'freeAmount', arg)
+                              "
+                            />
                           </template>
                           </template>
-                          <template v-else>{{ item.discountPrice }}</template>
+                          <template v-else>{{
+                            rowNum(item.discountPrice)
+                          }}</template>
                         </td>
                         </td>
-                        <td :colspan="1">{{ item.actuallyAmount }}</td>
-                        <td :colspan="2" class="tdLast" v-if="index === 0" :rowspan="form.collect.length"
-                          style="width: 300px">
+                        <td :colspan="1">{{ rowNum(item.actuallyAmount) }}</td>
+                        <td
+                          :colspan="2"
+                          class="tdLast"
+                          v-if="index === 0"
+                          :rowspan="form.collect.length"
+                          style="width: 300px"
+                        >
                           <template v-if="editStatus">
                           <template v-if="editStatus">
-                            <el-input v-model="form.description" type="textarea" style="width: 100%" autosize
-                              maxlength="200" show-word-limit />
+                            <el-input
+                              v-model="form.description"
+                              type="textarea"
+                              style="width: 100%"
+                              autosize
+                              maxlength="200"
+                              show-word-limit
+                            />
                           </template>
                           </template>
                           <template v-else>{{ form.description }}</template>
                           <template v-else>{{ form.description }}</template>
 
 
@@ -123,52 +230,127 @@
                   </table>
                   </table>
                 </el-tab-pane>
                 </el-tab-pane>
                 <el-tab-pane label="循环任务" name="loop">
                 <el-tab-pane label="循环任务" name="loop">
-                  <el-table v-loading="loading" :data="form.loopList" size="small" border height="100%">
+                  <el-table
+                    v-loading="loading"
+                    :data="form.loopList"
+                    size="small"
+                    border
+                    height="100%"
+                  >
                     <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
                     <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-                    <el-table-column label="工作月" align="center" prop="workMonth" />
-                    <el-table-column label="客户名称" align="center" width="150" prop="companyName" />
-                    <el-table-column label="税号" align="center" prop="socialCreditCode" width="150" />
-                    <el-table-column label="注册地址" align="center" prop="formNo" width="120">
+                    <el-table-column
+                      label="工作月"
+                      align="center"
+                      prop="workMonth"
+                    />
+                    <el-table-column
+                      label="客户名称"
+                      align="center"
+                      width="150"
+                      prop="companyName"
+                    />
+                    <el-table-column
+                      label="税号"
+                      align="center"
+                      prop="socialCreditCode"
+                      width="150"
+                    />
+                    <el-table-column
+                      label="注册地址"
+                      align="center"
+                      prop="formNo"
+                      width="120"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.province }}-{{ scope.row.city }}-{{
                         {{ scope.row.province }}-{{ scope.row.city }}-{{
                           scope.row.district
                           scope.row.district
                         }}
                         }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="年收入" align="center" prop="annualIncome" width="100">
+                    <el-table-column
+                      label="年收入"
+                      align="center"
+                      prop="annualIncome"
+                      width="100"
+                    >
                     </el-table-column>
                     </el-table-column>
                     <el-table-column label="税务申报" align="center" width="80">
                     <el-table-column label="税务申报" align="center" width="80">
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.isTax === 1 ? "是" : "否" }}
                         {{ scope.row.isTax === 1 ? "是" : "否" }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="社保" prop="remainAmount" align="center" width="80">
+                    <el-table-column
+                      label="社保"
+                      prop="remainAmount"
+                      align="center"
+                      width="80"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.isSocialSecurity === 1 ? "是" : "否" }}
                         {{ scope.row.isSocialSecurity === 1 ? "是" : "否" }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="公积金" prop="status" align="center" width="80">
+                    <el-table-column
+                      label="公积金"
+                      prop="status"
+                      align="center"
+                      width="80"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.isHousingFund === 1 ? "是" : "否" }}
                         {{ scope.row.isHousingFund === 1 ? "是" : "否" }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="纳税性质" align="center" prop="taxType" width="100" />
-                    <el-table-column label="征收方式" align="center" prop="collectionMethod" width="100" />
-                    <el-table-column label="定额金额" align="center" prop="quotaAmount" width="80" />
-                    <el-table-column label="实际年收入" align="center" prop="actuallyAnnualIncome" width="100" />
-                    <el-table-column label="社保有无变化" prop="status" align="center" width="100">
+                    <el-table-column
+                      label="纳税性质"
+                      align="center"
+                      prop="taxType"
+                      width="100"
+                    />
+                    <el-table-column
+                      label="征收方式"
+                      align="center"
+                      prop="collectionMethod"
+                      width="100"
+                    />
+                    <el-table-column
+                      label="定额金额"
+                      align="center"
+                      prop="quotaAmount"
+                      width="80"
+                    />
+                    <el-table-column
+                      label="实际年收入"
+                      align="center"
+                      prop="actuallyAnnualIncome"
+                      width="100"
+                    />
+                    <el-table-column
+                      label="社保有无变化"
+                      prop="status"
+                      align="center"
+                      width="100"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{
                         {{
                           scope.row.changedSocialSecurity === 1 ? "是" : "否"
                           scope.row.changedSocialSecurity === 1 ? "是" : "否"
                         }}
                         }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="公积金有无变化" prop="status" align="center" width="100">
+                    <el-table-column
+                      label="公积金有无变化"
+                      prop="status"
+                      align="center"
+                      width="100"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.changedHousingFund === 1 ? "是" : "否" }}
                         {{ scope.row.changedHousingFund === 1 ? "是" : "否" }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="累计年收入" prop="status" align="center" width="100">
+                    <el-table-column
+                      label="累计年收入"
+                      prop="status"
+                      align="center"
+                      width="100"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.cumulativeIncome }}
                         {{ scope.row.cumulativeIncome }}
                       </template>
                       </template>
@@ -176,38 +358,90 @@
                   </el-table>
                   </el-table>
                 </el-tab-pane>
                 </el-tab-pane>
                 <el-tab-pane label="工商任务" name="once">
                 <el-tab-pane label="工商任务" name="once">
-                  <el-table v-loading="loading" :data="form.onceList" size="small" border height="100%">
+                  <el-table
+                    v-loading="loading"
+                    :data="form.onceList"
+                    size="small"
+                    border
+                    height="100%"
+                  >
                     <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
                     <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-                    <el-table-column label="客户名称" align="center" width="200" prop="companyName" />
-                    <el-table-column label="税号" align="center" prop="socialCreditCode" width="150" />
-                    <el-table-column label="所在区" align="center" prop="formNo" width="150">
+                    <el-table-column
+                      label="客户名称"
+                      align="center"
+                      width="200"
+                      prop="companyName"
+                    />
+                    <el-table-column
+                      label="税号"
+                      align="center"
+                      prop="socialCreditCode"
+                      width="150"
+                    />
+                    <el-table-column
+                      label="所在区"
+                      align="center"
+                      prop="formNo"
+                      width="150"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.province }}-{{ scope.row.city }}-{{
                         {{ scope.row.province }}-{{ scope.row.city }}-{{
                           scope.row.district
                           scope.row.district
                         }}
                         }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="办理事项" align="center" prop="annualIncome" width="120">
+                    <el-table-column
+                      label="办理事项"
+                      align="center"
+                      prop="annualIncome"
+                      width="120"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         {{ scope.row.taskTypeName }}-{{
                         {{ scope.row.taskTypeName }}-{{
                           scope.row.taskTypeDetailName
                           scope.row.taskTypeDetailName
                         }}
                         }}
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="下单时间" prop="entrustDate" align="center" width="100">
+                    <el-table-column
+                      label="下单时间"
+                      prop="entrustDate"
+                      align="center"
+                      width="100"
+                    >
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="完成时间" prop="finishedDate" align="center" width="100">
+                    <el-table-column
+                      label="完成时间"
+                      prop="finishedDate"
+                      align="center"
+                      width="100"
+                    >
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="收费" prop="amount" align="center" width="100">
+                    <el-table-column
+                      label="收费"
+                      prop="amount"
+                      align="center"
+                      width="100"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         <template v-if="editStatus">
                         <template v-if="editStatus">
-                          <el-input-number v-model="scope.row.amount" size="small" placeholder="" :precision="2"
-                            :controls="false" style="width: 100%" @change="onceChangeHandle(scope.row, 'amount')" />
+                          <el-input-number
+                            v-model="scope.row.amount"
+                            size="small"
+                            placeholder=""
+                            :precision="2"
+                            :controls="false"
+                            style="width: 100%"
+                            @change="onceChangeHandle(scope.row, 'amount')"
+                          />
                         </template>
                         </template>
                         <template v-else>{{ scope.row.amount }}</template>
                         <template v-else>{{ scope.row.amount }}</template>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="说明" align="center" prop="description" />
+                    <el-table-column
+                      label="说明"
+                      align="center"
+                      prop="description"
+                    />
                   </el-table>
                   </el-table>
                 </el-tab-pane>
                 </el-tab-pane>
               </el-tabs>
               </el-tabs>
@@ -217,11 +451,17 @@
       </div>
       </div>
     </el-drawer>
     </el-drawer>
     <!-- 图片预览 -->
     <!-- 图片预览 -->
-    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
+    <el-image-viewer
+      v-if="showViewer"
+      :url-list="currentFileList"
+      @close="closeImages"
+      :initial-index="showIndex"
+    />
   </div>
   </div>
 </template>
 </template>
 <script setup>
 <script setup>
 import { getToken } from "@/utils/auth";
 import { getToken } from "@/utils/auth";
+import { rowNum } from "@/utils/index";
 import {
 import {
   addFollow,
   addFollow,
   listFollow,
   listFollow,
@@ -247,7 +487,7 @@ const { proxy } = getCurrentInstance();
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   },
 });
 });
 
 
@@ -417,8 +657,8 @@ function checkZero() {
 /** 提交保存 */
 /** 提交保存 */
 function submitForm() {
 function submitForm() {
   if (form.value.amount < 0) {
   if (form.value.amount < 0) {
-    proxy.$modal.msgError('本期消耗不能小于0')
-    return
+    proxy.$modal.msgError("本期消耗不能小于0");
+    return;
   }
   }
   proxy.$modal.confirm("确认保存么").then((res) => {
   proxy.$modal.confirm("确认保存么").then((res) => {
     if (form.value.id == null) {
     if (form.value.id == null) {
@@ -543,57 +783,64 @@ function validDetails() {
 }
 }
 
 
 function itemChangeHandle(item, field) {
 function itemChangeHandle(item, field) {
-  const price = item.price == null ? 0 : item.price
-  const num = item.companyNum == null ? 0 : item.companyNum
-  const discountPrice = item.discountPrice == null ? 0 : item.discountPrice
-  const amount = price * num
-  const freeAmount = item.freeAmount == null ? 0 : item.freeAmount
-  item.amount = amount
-  item.discountAmount = discountPrice * num
-  item.actuallyAmount = (item.discountPrice == null ? item.amount : item.discountAmount) - freeAmount
-  computedTotal()
+  const price = item.price == null ? 0 : item.price;
+  const num = item.companyNum == null ? 0 : item.companyNum;
+  const discountPrice = item.discountPrice == null ? 0 : item.discountPrice;
+  const amount = price * num;
+  const freeAmount = item.freeAmount == null ? 0 : item.freeAmount;
+  item.amount = amount;
+  item.discountAmount = discountPrice * num;
+  item.actuallyAmount =
+    (item.discountPrice == null ? item.amount : item.discountAmount) -
+    freeAmount;
+  computedTotal();
 }
 }
 
 
 function itemChangeHandleEnd(item, field, arg) {
 function itemChangeHandleEnd(item, field, arg) {
-  let freeAmount = item.freeAmount
-  let discountPrice = item.discountPrice
-  let discountAmount = item.discountAmount
-  let num = item.companyNum == null ? 0 : item.companyNum
-  let amount = item.amount
-  let actuallyAmount = item.actuallyAmount
-  if (item.taskType === '工商代办') {
+  let freeAmount = item.freeAmount;
+  let discountPrice = item.discountPrice;
+  let discountAmount = item.discountAmount;
+  let num = item.companyNum == null ? 0 : item.companyNum;
+  let amount = item.amount;
+  let actuallyAmount = item.actuallyAmount;
+  if (item.taskType === "工商代办") {
     switch (field) {
     switch (field) {
-      case 'freeAmount':
-        freeAmount = arg == null ? 0 : arg
-        const actuallyAmount = freeAmount > item.amount ? 0 : item.amount - freeAmount
-        item.freeAmount = freeAmount > item.amount ? item.amount : freeAmount
-        item.actuallyAmount = actuallyAmount
-        break
+      case "freeAmount":
+        freeAmount = arg == null ? 0 : arg;
+        const actuallyAmount =
+          freeAmount > item.amount ? 0 : item.amount - freeAmount;
+        item.freeAmount = freeAmount > item.amount ? item.amount : freeAmount;
+        item.actuallyAmount = actuallyAmount;
+        break;
     }
     }
   } else {
   } else {
     switch (field) {
     switch (field) {
-      case 'discountPrice':
-        discountPrice = arg
-        discountAmount = discountPrice * item.companyNum
-        item.discountAmount = discountAmount
-        actuallyAmount = freeAmount > discountAmount ? 0 : discountAmount - freeAmount
-        item.actuallyAmount = actuallyAmount
-        item.freeAmount = freeAmount > discountAmount ? discountAmount : freeAmount
-        break
-      case 'price':
-        price = arg
-        amount = price * num
-        item.amount = amount
-        break
-      case 'freeAmount':
-        actuallyAmount = freeAmount > discountAmount ? 0 : discountAmount - freeAmount
-        item.actuallyAmount = actuallyAmount
-        item.freeAmount = freeAmount > discountAmount ? discountAmount : freeAmount
-        break
+      case "discountPrice":
+        discountPrice = arg;
+        discountAmount = discountPrice * item.companyNum;
+        item.discountAmount = discountAmount;
+        actuallyAmount =
+          freeAmount > discountAmount ? 0 : discountAmount - freeAmount;
+        item.actuallyAmount = actuallyAmount;
+        item.freeAmount =
+          freeAmount > discountAmount ? discountAmount : freeAmount;
+        break;
+      case "price":
+        price = arg;
+        amount = price * num;
+        item.amount = amount;
+        break;
+      case "freeAmount":
+        actuallyAmount =
+          freeAmount > discountAmount ? 0 : discountAmount - freeAmount;
+        item.actuallyAmount = actuallyAmount;
+        item.freeAmount =
+          freeAmount > discountAmount ? discountAmount : freeAmount;
+        break;
     }
     }
   }
   }
 
 
-  computedTotal()
+  computedTotal();
 }
 }
 
 
 function computedTotal() {
 function computedTotal() {

+ 142 - 38
src/views/business/housingFund/confirm/view.vue

@@ -1,5 +1,12 @@
 <template>
 <template>
-  <el-dialog title="公积金人员信息" v-model="visible" :width="width" append-to-body draggable @close="close">
+  <el-dialog
+    title="公积金人员信息"
+    v-model="visible"
+    :width="width"
+    append-to-body
+    draggable
+    @close="close"
+  >
     <!-- 功能按钮 -->
     <!-- 功能按钮 -->
     <div style="padding: 8px 24px 16px 24px">
     <div style="padding: 8px 24px 16px 24px">
       <el-form size="small" label-width="120px" v-model="form">
       <el-form size="small" label-width="120px" v-model="form">
@@ -56,29 +63,58 @@
             <div class="details-head">
             <div class="details-head">
               <div class="title">
               <div class="title">
                 <i class="fa fa-th-list" aria-hidden="true" /> 人员信息
                 <i class="fa fa-th-list" aria-hidden="true" /> 人员信息
-                <el-button size="small" @click="printSalary" icon="printer" type="primary">打印</el-button>
-                <el-button size="small" @click="exportSalary" icon="download" type="info">导出</el-button>
+                <el-button
+                  size="small"
+                  @click="printSalary"
+                  icon="printer"
+                  type="primary"
+                  >打印</el-button
+                >
+                <el-button
+                  size="small"
+                  @click="exportSalary"
+                  icon="download"
+                  type="info"
+                  >导出</el-button
+                >
               </div>
               </div>
             </div>
             </div>
             <div class="details-body">
             <div class="details-body">
               <div>
               <div>
-                <el-table ref="sourceTable" :data="form.details" size="small" max-height="260px" border
-                  highlight-current-row header-row-class-name="list-header-row" row-class-name="list-row"
-                  @selection-change="handleCheckChange" @current-change="handleCurrentChange">
+                <el-table
+                  ref="sourceTable"
+                  :data="form.details"
+                  size="small"
+                  max-height="260px"
+                  border
+                  highlight-current-row
+                  header-row-class-name="list-header-row"
+                  row-class-name="list-row"
+                  @selection-change="handleCheckChange"
+                  @current-change="handleCurrentChange"
+                >
                   <el-table-column type="selection" width="40" align="center" />
                   <el-table-column type="selection" width="40" align="center" />
-                  <el-table-column type="index" label="序号" width="55" align="center" />
+                  <el-table-column
+                    type="index"
+                    label="序号"
+                    width="55"
+                    align="center"
+                  />
                   <el-table-column label="姓名" width="80" align="center">
                   <el-table-column label="姓名" width="80" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
                         {{ scope.row.employeeName }}
                         {{ scope.row.employeeName }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="电话号" width="130" align="center">
                   <el-table-column label="电话号" width="130" align="center">
@@ -86,69 +122,106 @@
                       <div>
                       <div>
                         {{ scope.row.phone }}
                         {{ scope.row.phone }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="身份证正面" width="120" align="center">
+                  <el-table-column
+                    label="身份证正面"
+                    width="120"
+                    align="center"
+                  >
                     <template #default="scope">
                     <template #default="scope">
-                      <div class="show-image" style="display: flex; justify-content: center">
-                        <img class="img" :src="baseUrl + '/' + scope.row.idCardImage" alt=""
-                          @click="handleImageView(scope.row.idCardImage)" />
+                      <div
+                        class="show-image"
+                        style="display: flex; justify-content: center"
+                      >
+                        <img
+                          class="img"
+                          :src="baseUrl + '/' + scope.row.idCardImage"
+                          alt=""
+                          @click="handleImageView(scope.row.idCardImage)"
+                        />
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="身份证反面" width="120" align="center">
+                  <el-table-column
+                    label="身份证反面"
+                    width="120"
+                    align="center"
+                  >
                     <template #default="scope">
                     <template #default="scope">
-                      <div class="show-image" style="display: flex; justify-content: center">
-                        <img class="img" :src="baseUrl + '/' + scope.row.idCardImageBack" alt=""
-                          @click="handleImageView(scope.row.idCardImageBack)" />
+                      <div
+                        class="show-image"
+                        style="display: flex; justify-content: center"
+                      >
+                        <img
+                          class="img"
+                          :src="baseUrl + '/' + scope.row.idCardImageBack"
+                          alt=""
+                          @click="handleImageView(scope.row.idCardImageBack)"
+                        />
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="基数" width="100" align="center">
                   <el-table-column label="基数" width="100" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.cardinalNumber }}
+                        {{ rowNum(scope.row.cardinalNumber) }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="比例" width="100" align="center">
                   <el-table-column label="比例" width="100" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>{{ scope.row.ratio }}%</div>
                       <div>{{ scope.row.ratio }}%</div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="备注" header-align="center">
                   <el-table-column label="备注" header-align="center">
@@ -180,23 +253,53 @@
           </el-col>
           </el-col>
           <el-col v-if="showVerify()" :span="24">
           <el-col v-if="showVerify()" :span="24">
             <el-form-item label="备注">
             <el-form-item label="备注">
-              <el-input v-model.trim="form.verifyContent" type="textarea" rows="2" />
+              <el-input
+                v-model.trim="form.verifyContent"
+                type="textarea"
+                rows="2"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-form>
       </el-form>
     </div>
     </div>
     <div class="form-btns-container" style="height: 40px">
     <div class="form-btns-container" style="height: 40px">
-      <el-button v-show="showVerify()" type="danger" size="small" style="float: right; margin-left: 12px" icon="back"
-        @click="handleVerify(4)">
-        驳回</el-button>
-      <el-button v-show="showVerify()" type="primary" size="small" icon="check" style="float: right; margin-left: 12px"
-        @click="handleVerify(3)">审核通过</el-button>
-      <el-button v-show="verifiable() && form.status === 3" type="warning" size="small" icon="back"
-        style="float: right; margin-left: 12px" @click="returnStatus()">退回</el-button>
+      <el-button
+        v-show="showVerify()"
+        type="danger"
+        size="small"
+        style="float: right; margin-left: 12px"
+        icon="back"
+        @click="handleVerify(4)"
+      >
+        驳回</el-button
+      >
+      <el-button
+        v-show="showVerify()"
+        type="primary"
+        size="small"
+        icon="check"
+        style="float: right; margin-left: 12px"
+        @click="handleVerify(3)"
+        >审核通过</el-button
+      >
+      <el-button
+        v-show="verifiable() && form.status === 3"
+        type="warning"
+        size="small"
+        icon="back"
+        style="float: right; margin-left: 12px"
+        @click="returnStatus()"
+        >退回</el-button
+      >
     </div>
     </div>
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
-    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
+    <el-image-viewer
+      v-if="showViewer"
+      :url-list="currentFileList"
+      @close="closeImages"
+      :initial-index="showIndex"
+    />
 
 
     <!-- <print-dialog ref="printDialog" /> -->
     <!-- <print-dialog ref="printDialog" /> -->
   </el-dialog>
   </el-dialog>
@@ -211,6 +314,7 @@ import {
 } from "@/api/business/production/housingFundConfirm";
 } from "@/api/business/production/housingFundConfirm";
 import feedbackDialog from "../feedbackDialog.vue";
 import feedbackDialog from "../feedbackDialog.vue";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
+import { rowNum } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
@@ -244,7 +348,7 @@ const confirmChoices = ref([
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   },
 });
 });
 
 

+ 2 - 1
src/views/business/housingFund/declare/form.vue

@@ -93,7 +93,7 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="合计:">
             <el-form-item label="合计:">
-              <div v-if="form.amount != 0">{{ form.amount }}</div>
+              <div v-if="form.amount != 0">{{ rowNum(form.amount) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -200,6 +200,7 @@ import {
   saveDetail,
   saveDetail,
 } from "@/api/business/production/housingFundDeclare";
 } from "@/api/business/production/housingFundDeclare";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
+import { rowNum } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);

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

@@ -62,12 +62,12 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位缴纳:">
             <el-form-item label="单位缴纳:">
-              <div>{{ form.unitAmount }}</div>
+              <div>{{ rowNum(form.unitAmount) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人缴纳:">
             <el-form-item label="个人缴纳:">
-              <div>{{ form.individualAmount }}</div>
+              <div>{{ rowNum(form.individualAmount) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -129,6 +129,7 @@ import {
 } from "@/api/business/production/housingFundDeclare";
 } from "@/api/business/production/housingFundDeclare";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
 import { ref } from "vue";
 import { ref } from "vue";
+import { rowNum } from "@/utils/index";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
 const width = ref(800);
 const width = ref(800);

+ 2 - 1
src/views/business/housingFund/memberDialog.vue

@@ -109,7 +109,7 @@
         <el-table-column label="基数" width="100" align="center">
         <el-table-column label="基数" width="100" align="center">
           <template #default="scope">
           <template #default="scope">
             <div>
             <div>
-              {{ scope.row.cardinalNumber }}
+              {{ rowNum(scope.row.cardinalNumber) }}
             </div>
             </div>
             <span
             <span
               style="
               style="
@@ -158,6 +158,7 @@
 <script setup>
 <script setup>
 import { toRef } from "vue";
 import { toRef } from "vue";
 import { getMembers } from "@/api/business/production/housingFundDeclare";
 import { getMembers } from "@/api/business/production/housingFundDeclare";
+import { rowNum } from "@/utils/index";
 const props = defineProps({
 const props = defineProps({
   width: {
   width: {
     type: String,
     type: String,

+ 2 - 1
src/views/business/production/IndividualIncomeTaxIs/FormDialog.vue

@@ -36,7 +36,7 @@
                   "
                   "
                   :controls="false"
                   :controls="false"
                 />
                 />
-                <div v-else>{{ emptyForm.amount }}</div>
+                <div v-else>{{ rowNum(emptyForm.amount) }}</div>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
@@ -179,6 +179,7 @@
 
 
 <script setup>
 <script setup>
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
+import { rowNum } from "@/utils/index";
 /** 父组件传参 */
 /** 父组件传参 */
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {

+ 65 - 22
src/views/business/production/IndividualIncomeTaxIs/MemberDialog.vue

@@ -33,112 +33,124 @@
                   <span>{{ scope.row.idCode }}</span>
                   <span>{{ scope.row.idCode }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
-              <el-table-column label="发放日期" width="80" align="center">
+              <!-- <el-table-column label="发放日期" width="80" align="center">
                 <template>
                 <template>
                   <span>{{}}</span>
                   <span>{{}}</span>
                 </template>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column
               <el-table-column
                 label="应发工资"
                 label="应发工资"
                 width="80"
                 width="80"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="planSalary"
                 prop="planSalary"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.planSalary }}</span>
+                  <span>{{ rowNum(scope.row.planSalary) }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
                 label="实发工资"
                 label="实发工资"
                 width="80"
                 width="80"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="actuallySalary"
                 prop="actuallySalary"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.actuallySalary }}</span>
+                  <span>{{ rowNum(scope.row.actuallySalary) }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
 
 
               <el-table-column
               <el-table-column
                 label="奖金及其他"
                 label="奖金及其他"
                 width="100"
                 width="100"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="bonusAmount"
                 prop="bonusAmount"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.bonusAmount }}</span>
+                  <span>{{ rowNum(scope.row.bonusAmount) }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column label="社保" align="center">
               <el-table-column label="社保" align="center">
                 <el-table-column
                 <el-table-column
                   label="养老保险"
                   label="养老保险"
                   width="80"
                   width="80"
-                  align="center"
+                  header-align="center"
+                  align="right"
                   prop="endowmentInsurance"
                   prop="endowmentInsurance"
                 >
                 >
                   <template #default="scope">
                   <template #default="scope">
-                    <span>{{ scope.row.endowmentInsurance }}</span>
+                    <span>{{ rowNum(scope.row.endowmentInsurance) }}</span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
                   label="医疗保险"
                   label="医疗保险"
                   width="80"
                   width="80"
-                  align="center"
+                  header-align="center"
+                  align="right"
                   prop="medicalInsurance"
                   prop="medicalInsurance"
                 >
                 >
                   <template #default="scope">
                   <template #default="scope">
-                    <span>{{ scope.row.medicalInsurance }}</span>
+                    <span>{{ rowNum(scope.row.medicalInsurance) }}</span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
                   label="失业险"
                   label="失业险"
                   width="80"
                   width="80"
-                  align="center"
+                  header-align="center"
+                  align="right"
                   prop="unemploymentBenefit"
                   prop="unemploymentBenefit"
                 >
                 >
                   <template #default="scope">
                   <template #default="scope">
-                    <span>{{ scope.row.unemploymentBenefit }}</span>
+                    <span>{{ rowNum(scope.row.unemploymentBenefit) }}</span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
                   label="大病险"
                   label="大病险"
                   width="80"
                   width="80"
-                  align="center"
+                  header-align="center"
+                  align="right"
                   prop="seriousIllnessInsurance"
                   prop="seriousIllnessInsurance"
                 >
                 >
                   <template #default="scope">
                   <template #default="scope">
-                    <span>{{ scope.row.seriousIllnessInsurance }}</span>
+                    <span>{{ rowNum(scope.row.seriousIllnessInsurance) }}</span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
                 label="公积金"
                 label="公积金"
                 width="80"
                 width="80"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="housingFund"
                 prop="housingFund"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.housingFund }}</span>
+                  <span>{{ rowNum(scope.row.housingFund) }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
                 label="个税"
                 label="个税"
                 width="60"
                 width="60"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="currentIndividualIncomeTax"
                 prop="currentIndividualIncomeTax"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.currentIndividualIncomeTax }}</span>
+                  <span>{{
+                    rowNum(scope.row.currentIndividualIncomeTax)
+                  }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
                 label="其它扣款"
                 label="其它扣款"
                 width="80"
                 width="80"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="otherCut"
                 prop="otherCut"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.otherCut }}</span>
+                  <span>{{ rowNum(scope.row.otherCut) }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
@@ -166,6 +178,7 @@
 <script setup>
 <script setup>
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 import { getSalaryDetail } from "@/api/business/production/detail";
 import { getSalaryDetail } from "@/api/business/production/detail";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 
 
 /** 父组件传参 */
 /** 父组件传参 */
 const props = defineProps({
 const props = defineProps({
@@ -226,6 +239,36 @@ function open(data) {
   });
   });
 }
 }
 
 
+function getSummaries(param) {
+  const { columns, data } = param;
+  const sums = [];
+  columns.forEach((column, index) => {
+    if (index === 0) {
+      sums[index] = "合计";
+      return;
+    } else if (index === 1) {
+      sums[index] = "";
+      return;
+    }
+    const values = data.map((item) => Number(item[column.property]));
+
+    if (!values.every((value) => isNaN(value))) {
+      sums[index] = values.reduce((prev, curr) => {
+        const value = Number(curr);
+        if (!isNaN(value)) {
+          return (Number(prev) + Number(curr)).toFixed(2);
+        } else {
+          return Number(prev).toFixed(2);
+        }
+      }, 0);
+      sums[index] = numberToCurrencyNo(sums[index]);
+    } else {
+      sums[index] = "";
+    }
+  });
+  return sums;
+}
+
 function init() {}
 function init() {}
 
 
 // 暴露给父组件的方法
 // 暴露给父组件的方法

+ 71 - 29
src/views/business/production/IndividualIncomeTaxIsZero/MemberDialog.vue

@@ -20,6 +20,7 @@
               header-row-class-name="list-header-row"
               header-row-class-name="list-header-row"
               row-class-name="list-row"
               row-class-name="list-row"
               show-summary
               show-summary
+              :summary-method="getSummaries"
             >
             >
               <el-table-column label="员工姓名" width="80" align="center">
               <el-table-column label="员工姓名" width="80" align="center">
                 <template #default="scope">
                 <template #default="scope">
@@ -32,128 +33,140 @@
                   <span>{{ scope.row.idCode }}</span>
                   <span>{{ scope.row.idCode }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
-              <el-table-column label="发放日期" width="80" align="center">
+              <!-- <el-table-column label="发放日期" width="80" align="center">
                 <template>
                 <template>
                   <span>{{}}</span>
                   <span>{{}}</span>
                 </template>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column
               <el-table-column
                 label="应发工资"
                 label="应发工资"
                 width="80"
                 width="80"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="planSalary"
                 prop="planSalary"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.planSalary }}</span>
+                  <span>{{ rowNum(scope.row.planSalary) }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
                 label="实发工资"
                 label="实发工资"
                 width="80"
                 width="80"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="actuallySalary"
                 prop="actuallySalary"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.actuallySalary }}</span>
+                  <span>{{ rowNum(scope.row.actuallySalary) }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
 
 
               <el-table-column
               <el-table-column
                 label="奖金及其他"
                 label="奖金及其他"
                 width="100"
                 width="100"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="bonusAmount"
                 prop="bonusAmount"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.bonusAmount }}</span>
+                  <span>{{ rowNum(scope.row.bonusAmount) }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column label="社保" align="center">
               <el-table-column label="社保" align="center">
                 <el-table-column
                 <el-table-column
                   label="养老保险"
                   label="养老保险"
                   width="80"
                   width="80"
-                  align="center"
+                  header-align="center"
+                  align="right"
                   prop="endowmentInsurance"
                   prop="endowmentInsurance"
                 >
                 >
                   <template #default="scope">
                   <template #default="scope">
-                    <span>{{ scope.row.endowmentInsurance }}</span>
+                    <span>{{ rowNum(scope.row.endowmentInsurance) }}</span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
                   label="医疗保险"
                   label="医疗保险"
                   width="80"
                   width="80"
-                  align="center"
+                  header-align="center"
+                  align="right"
                   prop="medicalInsurance"
                   prop="medicalInsurance"
                 >
                 >
                   <template #default="scope">
                   <template #default="scope">
-                    <span>{{ scope.row.medicalInsurance }}</span>
+                    <span>{{ rowNum(scope.row.medicalInsurance) }}</span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
                   label="失业险"
                   label="失业险"
                   width="80"
                   width="80"
-                  align="center"
+                  header-align="center"
+                  align="right"
                   prop="unemploymentBenefit"
                   prop="unemploymentBenefit"
                 >
                 >
                   <template #default="scope">
                   <template #default="scope">
-                    <span>{{ scope.row.unemploymentBenefit }}</span>
+                    <span>{{ rowNum(scope.row.unemploymentBenefit) }}</span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
                   label="大病险"
                   label="大病险"
                   width="80"
                   width="80"
-                  align="center"
+                  header-align="center"
+                  align="right"
                   prop="seriousIllnessInsurance"
                   prop="seriousIllnessInsurance"
                 >
                 >
                   <template #default="scope">
                   <template #default="scope">
-                    <span>{{ scope.row.seriousIllnessInsurance }}</span>
+                    <span>{{ rowNum(scope.row.seriousIllnessInsurance) }}</span>
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
                 label="公积金"
                 label="公积金"
                 width="80"
                 width="80"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="housingFund"
                 prop="housingFund"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.housingFund }}</span>
+                  <span>{{ rowNum(scope.row.housingFund) }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
                 label="个税"
                 label="个税"
                 width="60"
                 width="60"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="currentIndividualIncomeTax"
                 prop="currentIndividualIncomeTax"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.currentIndividualIncomeTax }}</span>
+                  <span>{{
+                    rowNum(scope.row.currentIndividualIncomeTax)
+                  }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
                 label="其它扣款"
                 label="其它扣款"
                 width="80"
                 width="80"
-                align="center"
+                header-align="center"
+                align="right"
                 prop="otherCut"
                 prop="otherCut"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.otherCut }}</span>
+                  <span>{{ rowNum(scope.row.otherCut) }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
                 label="备注"
                 label="备注"
                 width="60"
                 width="60"
                 align="center"
                 align="center"
-                prop="remark"
+                prop="accidentInsurance"
               >
               >
                 <template #default="scope">
                 <template #default="scope">
-                  <span>{{ scope.row.remark }}</span>
+                  <span>{{ scope.row.accidentInsurance }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
-            <el-form-item label="备注:">{{ content }} </el-form-item>
+            <el-form-item label="备注">{{ content }} </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-form>
       </el-form>
@@ -164,7 +177,8 @@
 
 
 <script setup>
 <script setup>
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
-import { getSalaryDetail } from "@/api/business/production/detailIsZero";
+import { getSalaryDetail } from "@/api/business/production/detail";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 
 
 /** 父组件传参 */
 /** 父组件传参 */
 const props = defineProps({
 const props = defineProps({
@@ -182,8 +196,8 @@ const title = ref("");
 const loading = ref(false);
 const loading = ref(false);
 const multiple = ref(true);
 const multiple = ref(true);
 const visible = ref(false);
 const visible = ref(false);
-const content = ref("");
 const editStatus = ref(false);
 const editStatus = ref(false);
+const content = ref("");
 const isFullscreen = ref(false);
 const isFullscreen = ref(false);
 const addDetailNum = ref(1);
 const addDetailNum = ref(1);
 const currentMember = {};
 const currentMember = {};
@@ -217,16 +231,44 @@ const followQuery = ref({});
 function open(data) {
 function open(data) {
   console.log("工资open");
   console.log("工资open");
   getSalaryDetail(data).then((response) => {
   getSalaryDetail(data).then((response) => {
-    console.log("响应", response);
     if (response.data) {
     if (response.data) {
       detailList.value = response.data.details;
       detailList.value = response.data.details;
       content.value = response.data.content;
       content.value = response.data.content;
-      console.log(detailList.value);
     }
     }
     visible.value = true;
     visible.value = true;
   });
   });
 }
 }
 
 
+function getSummaries(param) {
+  const { columns, data } = param;
+  const sums = [];
+  columns.forEach((column, index) => {
+    if (index === 0) {
+      sums[index] = "合计";
+      return;
+    } else if (index === 1) {
+      sums[index] = "";
+      return;
+    }
+    const values = data.map((item) => Number(item[column.property]));
+
+    if (!values.every((value) => isNaN(value))) {
+      sums[index] = values.reduce((prev, curr) => {
+        const value = Number(curr);
+        if (!isNaN(value)) {
+          return (Number(prev) + Number(curr)).toFixed(2);
+        } else {
+          return Number(prev).toFixed(2);
+        }
+      }, 0);
+      sums[index] = numberToCurrencyNo(sums[index]);
+    } else {
+      sums[index] = "";
+    }
+  });
+  return sums;
+}
+
 function init() {}
 function init() {}
 
 
 // 暴露给父组件的方法
 // 暴露给父组件的方法

+ 21 - 11
src/views/business/production/financialReportTax/FormDialog.vue

@@ -28,7 +28,7 @@
             <el-col :span="12">
             <el-col :span="12">
               <el-form-item label="可弥补之前年度亏损">
               <el-form-item label="可弥补之前年度亏损">
                 <el-input-number
                 <el-input-number
-                  v-if="editStatus"
+                  v-if="editStatus && !isView"
                   size="small"
                   size="small"
                   placeholder="可弥补之前年度亏损"
                   placeholder="可弥补之前年度亏损"
                   v-model="emptyForm.previousAnnualLosses"
                   v-model="emptyForm.previousAnnualLosses"
@@ -37,7 +37,7 @@
                   :controls="false"
                   :controls="false"
                 />
                 />
                 <div v-else>
                 <div v-else>
-                  {{ emptyForm.previousAnnualLosses ? null : 0.0 }}
+                  {{ rowNum(emptyForm.previousAnnualLosses ? null : 0.0) }}
                   <el-button
                   <el-button
                     link
                     link
                     type="primary"
                     type="primary"
@@ -48,6 +48,9 @@
                     @click="editStatus = true"
                     @click="editStatus = true"
                   />
                   />
                 </div>
                 </div>
+                <template v-if="isView">
+                  <span>{{ rowNum(emptyForm.previousAnnualLosses) }}</span>
+                </template>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
@@ -69,7 +72,7 @@
                   :controls="false"
                   :controls="false"
                   :precision="2"
                   :precision="2"
                 />
                 />
-                <div v-else>{{ emptyForm.valueAddedTax }}</div>
+                <div v-else>{{ rowNum(emptyForm.valueAddedTax) }}</div>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
@@ -88,7 +91,7 @@
                   :controls="false"
                   :controls="false"
                   :precision="2"
                   :precision="2"
                 />
                 />
-                <div v-else>{{ emptyForm.cityConstructTax }}</div>
+                <div v-else>{{ rowNum(emptyForm.cityConstructTax) }}</div>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
@@ -107,7 +110,9 @@
                   :precision="2"
                   :precision="2"
                   :controls="false"
                   :controls="false"
                 />
                 />
-                <div v-else>{{ emptyForm.additionsTaxOfEducation }}</div>
+                <div v-else>
+                  {{ rowNum(emptyForm.additionsTaxOfEducation) }}
+                </div>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
@@ -126,7 +131,9 @@
                   :precision="2"
                   :precision="2"
                   :controls="false"
                   :controls="false"
                 />
                 />
-                <div v-else>{{ emptyForm.ladditionsTaxOfEducation }}</div>
+                <div v-else>
+                  {{ rowNum(emptyForm.ladditionsTaxOfEducation) }}
+                </div>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
@@ -145,7 +152,7 @@
                   :precision="2"
                   :precision="2"
                   :controls="false"
                   :controls="false"
                 />
                 />
-                <div v-else>{{ emptyForm.businessIncomeTax }}</div>
+                <div v-else>{{ rowNum(emptyForm.businessIncomeTax) }}</div>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
@@ -164,7 +171,7 @@
                   :precision="2"
                   :precision="2"
                   :controls="false"
                   :controls="false"
                 />
                 />
-                <div v-else>{{ emptyForm.stampTax }}</div>
+                <div v-else>{{ rowNum(emptyForm.stampTax) }}</div>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
@@ -183,7 +190,7 @@
                   :precision="2"
                   :precision="2"
                   :controls="false"
                   :controls="false"
                 />
                 />
-                <div v-else>{{ emptyForm.culturalConstructTax }}</div>
+                <div v-else>{{ rowNum(emptyForm.culturalConstructTax) }}</div>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
@@ -202,13 +209,15 @@
                   :precision="2"
                   :precision="2"
                   :controls="false"
                   :controls="false"
                 />
                 />
-                <div v-else>{{ emptyForm.excise }}</div>
+                <div v-else>{{ rowNum(emptyForm.excise) }}</div>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
             <el-col :span="12">
             <el-col :span="12">
               <el-form-item label="合计">
               <el-form-item label="合计">
-                <div v-if="emptyForm.sumTax != 0">{{ emptyForm.sumTax }}</div>
+                <div v-if="emptyForm.sumTax != 0">
+                  {{ rowNum(emptyForm.sumTax) }}
+                </div>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
 
 
@@ -367,6 +376,7 @@
 
 
 
 
 <script setup>
 <script setup>
+import { rowNum } from "@/utils/index";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 /** 父组件传参 */
 /** 父组件传参 */
 const props = defineProps({
 const props = defineProps({

+ 0 - 2
src/views/business/production/financialReportTax/index.vue

@@ -397,13 +397,11 @@ const queryParams = ref({
 
 
 /** 查询报税列表 */
 /** 查询报税列表 */
 function getList() {
 function getList() {
-  console.log("查询", queryParams.value);
   loading.value = true;
   loading.value = true;
   listTax(queryParams.value).then((response) => {
   listTax(queryParams.value).then((response) => {
     taxList.value = response.rows;
     taxList.value = response.rows;
     total.value = response.total;
     total.value = response.total;
     loading.value = false;
     loading.value = false;
-    console.log(response);
   });
   });
 }
 }
 
 

+ 82 - 23
src/views/business/production/keepAccount/form.vue

@@ -1,5 +1,12 @@
 <template>
 <template>
-  <el-dialog title="记账信息" v-model="visible" :width="width" append-to-body draggable @close="close">
+  <el-dialog
+    title="记账信息"
+    v-model="visible"
+    :width="width"
+    append-to-body
+    draggable
+    @close="close"
+  >
     <!-- 功能按钮 -->
     <!-- 功能按钮 -->
     <div style="padding: 8px 24px 16px 24px">
     <div style="padding: 8px 24px 16px 24px">
       <el-form size="small" label-width="140px" v-model="form">
       <el-form size="small" label-width="140px" v-model="form">
@@ -24,64 +31,115 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本期收入">
             <el-form-item label="本期收入">
-              <el-input-number v-model="form.currentIncome" size="small" placeholder="本期收入" :precision="2"
-                :controls="false" style="width: 100%" />
+              <el-input-number
+                v-model="form.currentIncome"
+                size="small"
+                placeholder="本期收入"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+              />
               <!-- <div>{{ currentIncome }}</div> -->
               <!-- <div>{{ currentIncome }}</div> -->
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本年收入">
             <el-form-item label="本年收入">
-              <el-input-number v-model="form.currentYearIncome" size="small" placeholder="本年收入" :precision="2"
-                :controls="false" style="width: 100%" />
+              <el-input-number
+                v-model="form.currentYearIncome"
+                size="small"
+                placeholder="本年收入"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+              />
               <!-- <div>{{ currentYearIncome }}</div> -->
               <!-- <div>{{ currentYearIncome }}</div> -->
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本年累计成本">
             <el-form-item label="本年累计成本">
-              <el-input-number v-model="form.cumulativeCost" size="small" placeholder="本年累计成本" :precision="2"
-                :controls="false" style="width: 100%" />
+              <el-input-number
+                v-model="form.cumulativeCost"
+                size="small"
+                placeholder="本年累计成本"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+              />
               <!-- <div>{{ currentYearCost }}</div> -->
               <!-- <div>{{ currentYearCost }}</div> -->
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本年利润总额">
             <el-form-item label="本年利润总额">
-              <el-input-number v-model="form.currentYearProfit" size="small" placeholder="本年利润总额" :precision="2"
-                :controls="false" style="width: 100%" />
+              <el-input-number
+                v-model="form.currentYearProfit"
+                size="small"
+                placeholder="本年利润总额"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+              />
               <!-- <div>{{ currentYearProfit }}</div> -->
               <!-- <div>{{ currentYearProfit }}</div> -->
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="是否暂估">
             <el-form-item label="是否暂估">
               <!-- <el-input-number v-model="form.is" size="small" placeholder="暂估金额"  :precision="2" :controls="false" style="width: 100%;" /> -->
               <!-- <el-input-number v-model="form.is" size="small" placeholder="暂估金额"  :precision="2" :controls="false" style="width: 100%;" /> -->
-              <el-checkbox v-model="form.isProvisionalEstimate" :true-label="1" :false-label="0" />
+              <el-checkbox
+                v-model="form.isProvisionalEstimate"
+                :true-label="1"
+                :false-label="0"
+              />
               <!-- <div>{{ feedback.provisionalEstimateAmount }}</div> -->
               <!-- <div>{{ feedback.provisionalEstimateAmount }}</div> -->
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col v-if="form.isProvisionalEstimate === 1" :span="12">
           <el-col v-if="form.isProvisionalEstimate === 1" :span="12">
             <el-form-item label="暂估金额">
             <el-form-item label="暂估金额">
-              <el-input-number v-model="form.provisionalEstimateAmount" size="small" placeholder="暂估金额" :precision="2"
-                :controls="false" style="width: 100%" />
+              <el-input-number
+                v-model="form.provisionalEstimateAmount"
+                size="small"
+                placeholder="暂估金额"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+              />
               <!-- <div>{{ feedback.provisionalEstimateAmount }}</div> -->
               <!-- <div>{{ feedback.provisionalEstimateAmount }}</div> -->
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="可弥补以前年度亏损">
             <el-form-item label="可弥补以前年度亏损">
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
-              <div>{{ form.previousAnnualLosses }}</div>
+              <div>{{ rowNum(form.previousAnnualLosses) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="备注">
             <el-form-item label="备注">
-              <el-input v-model.trim="form.content" maxlength="200" show-word-limit type="textarea" rows="2" />
+              <el-input
+                v-model.trim="form.content"
+                maxlength="200"
+                show-word-limit
+                type="textarea"
+                rows="2"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-form>
       </el-form>
     </div>
     </div>
     <div class="form-btns-container" style="height: 40px">
     <div class="form-btns-container" style="height: 40px">
-      <el-button size="small" icon="Close" style="float: right; margin-left: 12px; margin-right: 12px" @click="close">取消
+      <el-button
+        size="small"
+        icon="Close"
+        style="float: right; margin-left: 12px; margin-right: 12px"
+        @click="close"
+        >取消
       </el-button>
       </el-button>
-      <el-button type="primary" size="small" icon="Finished" style="float: right" @click="handleSave">保存
+      <el-button
+        type="primary"
+        size="small"
+        icon="Finished"
+        style="float: right"
+        @click="handleSave"
+        >保存
       </el-button>
       </el-button>
     </div>
     </div>
   </el-dialog>
   </el-dialog>
@@ -94,6 +152,7 @@ import {
 } from "@/api/business/production/keepAccount";
 } from "@/api/business/production/keepAccount";
 import { reactive, ref } from "vue";
 import { reactive, ref } from "vue";
 import { salaryStatusTypes } from "@/utils/default";
 import { salaryStatusTypes } from "@/utils/default";
+import { rowNum } from "@/utils/index";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
 const width = ref(800);
 const width = ref(800);
@@ -103,7 +162,7 @@ const currentSource = ref(null);
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   },
 });
 });
 
 
@@ -176,11 +235,11 @@ function open(detail) {
 }
 }
 
 
 function loadData() {
 function loadData() {
-  Promise.all([getDetail(form.value)]).then(res => {
-    form.value = { ...proxy.deepClone(emptyForm), ...res[0].data }
+  Promise.all([getDetail(form.value)]).then((res) => {
+    form.value = { ...proxy.deepClone(emptyForm), ...res[0].data };
     if (form.value.status === 3) {
     if (form.value.status === 3) {
-      proxy.$modal.msgError('该收票信息已提交待审核')
-      close()
+      proxy.$modal.msgError("该收票信息已提交待审核");
+      close();
     }
     }
   });
   });
 }
 }
@@ -194,8 +253,8 @@ function reset() {
   form.value = proxy.deepClone(emptyForm);
   form.value = proxy.deepClone(emptyForm);
 }
 }
 
 
-function printSalary() { }
-function exportSalary() { }
+function printSalary() {}
+function exportSalary() {}
 
 
 function handleCurrentChange(row) {
 function handleCurrentChange(row) {
   currentSource.value = row;
   currentSource.value = row;

+ 33 - 13
src/views/business/production/keepAccount/view.vue

@@ -1,5 +1,12 @@
 <template>
 <template>
-  <el-dialog title="记账信息" v-model="visible" :width="width" append-to-body draggable @close="close">
+  <el-dialog
+    title="记账信息"
+    v-model="visible"
+    :width="width"
+    append-to-body
+    draggable
+    @close="close"
+  >
     <!-- 功能按钮 -->
     <!-- 功能按钮 -->
     <div style="padding: 8px 24px 16px 24px">
     <div style="padding: 8px 24px 16px 24px">
       <el-form size="small" label-width="140px" v-model="form">
       <el-form size="small" label-width="140px" v-model="form">
@@ -20,36 +27,41 @@
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本期收入">
             <el-form-item label="本期收入">
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
-              <div>{{ form.currentIncome }}</div>
+              <div>{{ rowNum(form.currentIncome) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本年收入">
             <el-form-item label="本年收入">
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
-              <div>{{ form.currentYearIncome }}</div>
+              <div>{{ rowNum(form.currentYearIncome) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col v-if="form.isProvisionalEstimate === 1" :span="12">
           <el-col v-if="form.isProvisionalEstimate === 1" :span="12">
             <el-form-item label="暂估金额">
             <el-form-item label="暂估金额">
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
-              <div>{{ form.provisionalEstimateAmount }}</div>
+              <div>{{ rowNum(form.provisionalEstimateAmount) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本年利润总额">
             <el-form-item label="本年利润总额">
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
-              <div>{{ form.currentYearProfit }}</div>
+              <div>{{ rowNum(form.currentYearProfit) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="可弥补以前年度亏损">
             <el-form-item label="可弥补以前年度亏损">
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
               <!-- <el-input-number v-model="form.inputInvoice" size="small" placeholder="进项发票联" :step="1" step-strictly :controls="false" style="width: 100%;" /> -->
-              <div>{{ previousAnnualLosses }}</div>
+              <div>{{ rowNum(previousAnnualLosses) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="备注">
             <el-form-item label="备注">
-              <el-input v-if="form.status === 2" v-model.trim="form.verifyContent" type="textarea" rows="2" />
+              <el-input
+                v-if="form.status === 2"
+                v-model.trim="form.verifyContent"
+                type="textarea"
+                rows="2"
+              />
               <div v-else>{{ form.verifyContent }}</div>
               <div v-else>{{ form.verifyContent }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -57,9 +69,16 @@
       </el-form>
       </el-form>
     </div>
     </div>
     <div class="form-btns-container" style="height: 40px">
     <div class="form-btns-container" style="height: 40px">
-      <el-button v-if="verifiable() && form.status === 3" type="warning" icon="back" size="small"
-        style="float: right; margin-left: 12px" @click="returnStatus()">
-        退回</el-button>
+      <el-button
+        v-if="verifiable() && form.status === 3"
+        type="warning"
+        icon="back"
+        size="small"
+        style="float: right; margin-left: 12px"
+        @click="returnStatus()"
+      >
+        退回</el-button
+      >
     </div>
     </div>
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
     <!-- <print-dialog ref="printDialog" /> -->
     <!-- <print-dialog ref="printDialog" /> -->
@@ -72,6 +91,7 @@ import {
   turnBackDetail,
   turnBackDetail,
 } from "@/api/business/production/keepAccount";
 } from "@/api/business/production/keepAccount";
 import feedbackDialog from "../feedbackDialog.vue";
 import feedbackDialog from "../feedbackDialog.vue";
+import { rowNum } from "@/utils/index";
 import { salaryStatusTypes } from "@/utils/default";
 import { salaryStatusTypes } from "@/utils/default";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
 import { ref } from "vue";
 import { ref } from "vue";
@@ -89,7 +109,7 @@ const feedbackDialogView = ref(null);
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   },
 });
 });
 
 
@@ -209,8 +229,8 @@ function reset() {
   total.value = 0;
   total.value = 0;
 }
 }
 
 
-function printSalary() { }
-function exportSalary() { }
+function printSalary() {}
+function exportSalary() {}
 
 
 function showVerify() {
 function showVerify() {
   if (salaryDetail.value == null || salaryDetail.value.status !== 3) {
   if (salaryDetail.value == null || salaryDetail.value.status !== 3) {

+ 26 - 12
src/views/business/production/salary/form.vue

@@ -62,6 +62,8 @@
                   size="small"
                   size="small"
                   max-height="490px"
                   max-height="490px"
                   border
                   border
+                  header-align="center"
+                  align="right"
                   show-summary
                   show-summary
                   :summary-method="getSummaries"
                   :summary-method="getSummaries"
                   highlight-current-row
                   highlight-current-row
@@ -125,7 +127,8 @@
                   <el-table-column
                   <el-table-column
                     label="应发工资"
                     label="应发工资"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="planSalary"
                     prop="planSalary"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
@@ -145,7 +148,8 @@
                   <el-table-column
                   <el-table-column
                     label="实发工资"
                     label="实发工资"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="actuallySalary"
                     prop="actuallySalary"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
@@ -158,14 +162,15 @@
                           :controls="false"
                           :controls="false"
                           style="width: 100%"
                           style="width: 100%"
                         /> -->
                         /> -->
-                        {{ scope.row.actuallySalary }}
+                        {{ rowNum(scope.row.actuallySalary) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
                     label="奖金及其他"
                     label="奖金及其他"
                     width="85"
                     width="85"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="bonusAmount"
                     prop="bonusAmount"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
@@ -186,7 +191,8 @@
                     <el-table-column
                     <el-table-column
                       label="养老保险"
                       label="养老保险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="endowmentInsurance"
                       prop="endowmentInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
@@ -206,7 +212,8 @@
                     <el-table-column
                     <el-table-column
                       label="医疗保险"
                       label="医疗保险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="medicalInsurance"
                       prop="medicalInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
@@ -226,7 +233,8 @@
                     <el-table-column
                     <el-table-column
                       label="失业险"
                       label="失业险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="unemploymentBenefit"
                       prop="unemploymentBenefit"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
@@ -246,7 +254,8 @@
                     <el-table-column
                     <el-table-column
                       label="大病险"
                       label="大病险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="seriousIllnessInsurance"
                       prop="seriousIllnessInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
@@ -267,7 +276,8 @@
                   <el-table-column
                   <el-table-column
                     label="公积金"
                     label="公积金"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="housingFund"
                     prop="housingFund"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
@@ -286,7 +296,8 @@
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
                     label="个税"
                     label="个税"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     width="70"
                     width="70"
                     prop="currentIndividualIncomeTax"
                     prop="currentIndividualIncomeTax"
                   >
                   >
@@ -306,7 +317,8 @@
                   <el-table-column
                   <el-table-column
                     label="其他扣款"
                     label="其他扣款"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="otherCut"
                     prop="otherCut"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
@@ -393,6 +405,7 @@ import {
   saveDetail,
   saveDetail,
   updateDetail,
   updateDetail,
 } from "@/api/business/production/salary";
 } from "@/api/business/production/salary";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
@@ -534,7 +547,7 @@ function computeTotal() {
   form.value.details.forEach((l) => {
   form.value.details.forEach((l) => {
     totalSalay += l.actuallySalary == null ? 0 : l.actuallySalary;
     totalSalay += l.actuallySalary == null ? 0 : l.actuallySalary;
   });
   });
-  form.value.amount = totalSalay.toFixed(2);
+  form.value.amount = totalSalay;
 }
 }
 
 
 function getSummaries(param) {
 function getSummaries(param) {
@@ -559,6 +572,7 @@ function getSummaries(param) {
           return Number(prev).toFixed(2);
           return Number(prev).toFixed(2);
         }
         }
       }, 0);
       }, 0);
+      sums[index] = numberToCurrencyNo(sums[index]);
     } else {
     } else {
       sums[index] = "";
       sums[index] = "";
     }
     }

+ 37 - 24
src/views/business/production/salary/view.vue

@@ -104,36 +104,39 @@
                   <el-table-column
                   <el-table-column
                     label="应发工资"
                     label="应发工资"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="planSalary"
                     prop="planSalary"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.planSalary }}
+                        {{ rowNum(scope.row.planSalary) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
                     label="实发工资"
                     label="实发工资"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="actuallySalary"
                     prop="actuallySalary"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.actuallySalary }}
+                        {{ rowNum(scope.row.actuallySalary) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
                     label="奖金及其他"
                     label="奖金及其他"
                     width="95"
                     width="95"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="bonusAmount"
                     prop="bonusAmount"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.bonusAmount }}
+                        {{ rowNum(scope.row.bonusAmount) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
@@ -141,48 +144,52 @@
                     <el-table-column
                     <el-table-column
                       label="养老保险"
                       label="养老保险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="endowmentInsurance"
                       prop="endowmentInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.endowmentInsurance }}
+                          {{ rowNum(scope.row.endowmentInsurance) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
                       label="医疗保险"
                       label="医疗保险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="medicalInsurance"
                       prop="medicalInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.medicalInsurance }}
+                          {{ rowNum(scope.row.medicalInsurance) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
                       label="失业险"
                       label="失业险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="unemploymentBenefit"
                       prop="unemploymentBenefit"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.unemploymentBenefit }}
+                          {{ rowNum(scope.row.unemploymentBenefit) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
                       label="大病险"
                       label="大病险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="seriousIllnessInsurance"
                       prop="seriousIllnessInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.seriousIllnessInsurance }}
+                          {{ rowNum(scope.row.seriousIllnessInsurance) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
@@ -190,18 +197,20 @@
                   <el-table-column
                   <el-table-column
                     label="公积金"
                     label="公积金"
                     width="80"
                     width="80"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="housingFund"
                     prop="housingFund"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.housingFund }}
+                        {{ rowNum(scope.row.housingFund) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
                     label="个税"
                     label="个税"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     :prop="
                     :prop="
                       form.status === 3 && form.hasIndividualIncomeTax
                       form.status === 3 && form.hasIndividualIncomeTax
                         ? 'individualIncomeTaxConfirm'
                         ? 'individualIncomeTaxConfirm'
@@ -211,9 +220,11 @@
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
                         {{
                         {{
-                          form.status === 3 && form.hasIndividualIncomeTax
-                            ? scope.row.individualIncomeTaxConfirm
-                            : scope.row.currentIndividualIncomeTax
+                          rowNum(
+                            form.status === 3 && form.hasIndividualIncomeTax
+                              ? scope.row.individualIncomeTaxConfirm
+                              : scope.row.currentIndividualIncomeTax
+                          )
                         }}
                         }}
                       </div>
                       </div>
                     </template></el-table-column
                     </template></el-table-column
@@ -221,12 +232,13 @@
                   <el-table-column
                   <el-table-column
                     label="其他扣款"
                     label="其他扣款"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="otherCut"
                     prop="otherCut"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.otherCut }}
+                        {{ rowNum(scope.row.otherCut) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
@@ -257,7 +269,7 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="合计工资">
             <el-form-item label="合计工资">
-              {{ form.amount }}
+              {{ rowNum(form.amount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col v-if="showVerify()" :span="24">
           <el-col v-if="showVerify()" :span="24">
@@ -412,6 +424,7 @@ import {
   exportSalaryPdf,
   exportSalaryPdf,
 } from "@/api/business/production/salary";
 } from "@/api/business/production/salary";
 import feedbackDialog from "../feedbackDialog.vue";
 import feedbackDialog from "../feedbackDialog.vue";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
@@ -646,7 +659,7 @@ function computeTotal() {
   form.value.details.forEach((l) => {
   form.value.details.forEach((l) => {
     totalSalay += l.actuallySalary == null ? 0 : l.actuallySalary;
     totalSalay += l.actuallySalary == null ? 0 : l.actuallySalary;
   });
   });
-  form.value.amount = totalSalay.toFixed(2);
+  form.value.amount = totalSalay;
 }
 }
 
 
 function returnStatus(status) {
 function returnStatus(status) {

+ 25 - 13
src/views/business/production/salaryZero/form.vue

@@ -124,7 +124,8 @@
                   <el-table-column
                   <el-table-column
                     label="应发工资"
                     label="应发工资"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="planSalary"
                     prop="planSalary"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
@@ -144,7 +145,8 @@
                   <el-table-column
                   <el-table-column
                     label="实发工资"
                     label="实发工资"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="actuallySalary"
                     prop="actuallySalary"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
@@ -157,14 +159,15 @@
                           :controls="false"
                           :controls="false"
                           style="width: 100%"
                           style="width: 100%"
                         /> -->
                         /> -->
-                        {{ scope.row.actuallySalary }}
+                        {{ rowNum(scope.row.actuallySalary) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
                     label="奖金及其他"
                     label="奖金及其他"
                     width="85"
                     width="85"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="bonusAmount"
                     prop="bonusAmount"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
@@ -185,7 +188,8 @@
                     <el-table-column
                     <el-table-column
                       label="养老保险"
                       label="养老保险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="endowmentInsurance"
                       prop="endowmentInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
@@ -205,7 +209,8 @@
                     <el-table-column
                     <el-table-column
                       label="医疗保险"
                       label="医疗保险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="medicalInsurance"
                       prop="medicalInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
@@ -225,7 +230,8 @@
                     <el-table-column
                     <el-table-column
                       label="失业险"
                       label="失业险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="unemploymentBenefit"
                       prop="unemploymentBenefit"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
@@ -245,7 +251,8 @@
                     <el-table-column
                     <el-table-column
                       label="大病险"
                       label="大病险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="seriousIllnessInsurance"
                       prop="seriousIllnessInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
@@ -266,7 +273,8 @@
                   <el-table-column
                   <el-table-column
                     label="公积金"
                     label="公积金"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="housingFund"
                     prop="housingFund"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
@@ -285,7 +293,8 @@
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
                     label="个税"
                     label="个税"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     width="70"
                     width="70"
                     prop="currentIndividualIncomeTax"
                     prop="currentIndividualIncomeTax"
                   >
                   >
@@ -305,7 +314,8 @@
                   <el-table-column
                   <el-table-column
                     label="其他扣款"
                     label="其他扣款"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="otherCut"
                     prop="otherCut"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
@@ -346,7 +356,7 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="合计工资">
             <el-form-item label="合计工资">
-              {{ form.amount }}
+              {{ rowNum(form.amount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -392,6 +402,7 @@ import {
   saveDetail,
   saveDetail,
   updateDetail,
   updateDetail,
 } from "@/api/business/production/salaryZero";
 } from "@/api/business/production/salaryZero";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
@@ -533,7 +544,7 @@ function computeTotal() {
   form.value.details.forEach((l) => {
   form.value.details.forEach((l) => {
     totalSalay += l.actuallySalary == null ? 0 : l.actuallySalary;
     totalSalay += l.actuallySalary == null ? 0 : l.actuallySalary;
   });
   });
-  form.value.amount = totalSalay.toFixed(2);
+  form.value.amount = totalSalay;
 }
 }
 
 
 function getSummaries(param) {
 function getSummaries(param) {
@@ -558,6 +569,7 @@ function getSummaries(param) {
           return Number(prev).toFixed(2);
           return Number(prev).toFixed(2);
         }
         }
       }, 0);
       }, 0);
+      sums[index] = numberToCurrencyNo(sums[index]);
     } else {
     } else {
       sums[index] = "";
       sums[index] = "";
     }
     }

+ 230 - 61
src/views/business/production/salaryZero/index.vue

@@ -8,49 +8,117 @@
         </el-button>
         </el-button>
         <template #dropdown>
         <template #dropdown>
           <el-dropdown-menu>
           <el-dropdown-menu>
-            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:workOrder:export']">
-              导出</el-dropdown-item>
+            <el-dropdown-item
+              icon="Download"
+              @click="handleExport"
+              v-hasPermi="['business:workOrder:export']"
+            >
+              导出</el-dropdown-item
+            >
           </el-dropdown-menu>
           </el-dropdown-menu>
         </template>
         </template>
       </el-dropdown>
       </el-dropdown>
     </div>
     </div>
     <!-- 搜索区 -->
     <!-- 搜索区 -->
-    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
-      label-width="78px">
+    <el-form
+      class="list-search-container"
+      size="small"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      label-width="78px"
+    >
       <el-form-item label="客户名称:" prop="companyName">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" clearable style="width: 150px"
-          @keyup.enter="handleQuery" />
+        <el-input
+          v-model="queryParams.companyName"
+          placeholder="请输入客户名称"
+          clearable
+          style="width: 150px"
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       </el-form-item>
       <el-form-item label="月份:">
       <el-form-item label="月份:">
-        <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" style="width: 130px"
-          @change="handleQuery" :clearable="false">
-          <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
+        <el-select
+          v-model.trim="queryParams.month"
+          size="small"
+          placeholder="月份"
+          style="width: 130px"
+          @change="handleQuery"
+          :clearable="false"
+        >
+          <el-option
+            v-for="item in selectMonths"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="状态:">
       <el-form-item label="状态:">
-        <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
-          :clearable="true" style="width: 130px" @clear="clearStatus">
-          <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
+        <el-select
+          v-model.trim="queryParams.status"
+          prop="status"
+          size="small"
+          type="text"
+          placeholder="状态"
+          :clearable="true"
+          style="width: 130px"
+          @clear="clearStatus"
+        >
+          <el-option
+            v-for="item in selectStatus"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:">
       <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:">
         <el-switch v-model="oneself" @change="handleOneself" />
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="operation" @click="moreSearch = true">更多</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
 
 
     <!-- 列表区 -->
     <!-- 列表区 -->
-    <el-table v-loading="loading" :data="list" size="small" border height="100%"
-      @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="list"
+      size="small"
+      border
+      height="100%"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
-      <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="100" />
-      <el-table-column label="纳税性质" align="center" min-width="130" prop="taxType" />
-      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="200" />
+      <el-table-column
+        label="客户名称"
+        align="center"
+        prop="companyName"
+        min-width="250"
+      />
+      <el-table-column
+        label="来源"
+        align="center"
+        prop="fromCompanyName"
+        min-width="100"
+      />
+      <el-table-column
+        label="纳税性质"
+        align="center"
+        min-width="130"
+        prop="taxType"
+      />
+      <el-table-column
+        label="税号"
+        align="center"
+        prop="socialCreditCode"
+        min-width="200"
+      />
       <el-table-column label="当前期间" min-width="90" align="center">
       <el-table-column label="当前期间" min-width="90" align="center">
         <template>
         <template>
           {{ moment().subtract(1, "month").format("YYYY年MM月") }}
           {{ moment().subtract(1, "month").format("YYYY年MM月") }}
@@ -58,86 +126,181 @@
       </el-table-column>
       </el-table-column>
       <el-table-column align="center">
       <el-table-column align="center">
         <template #header>
         <template #header>
-          <div style="
+          <div
+            style="
               display: flex;
               display: flex;
               flex-direction: row;
               flex-direction: row;
               justify-content: space-between;
               justify-content: space-between;
-            ">
+            "
+          >
             <div style="display: flex; flex-direction: row">
             <div style="display: flex; flex-direction: row">
-              <el-button link type="primary" size="small" icon="ArrowLeft" @click="prevYear" />
+              <el-button
+                link
+                type="primary"
+                size="small"
+                icon="ArrowLeft"
+                @click="prevYear"
+              />
               <el-link style="margin: 0 40px" :underline="false">{{
               <el-link style="margin: 0 40px" :underline="false">{{
                 queryParams.year
                 queryParams.year
               }}</el-link>
               }}</el-link>
-              <el-button link type="primary" icon="ArrowRight" size="small" @click="nextYear" />
+              <el-button
+                link
+                type="primary"
+                icon="ArrowRight"
+                size="small"
+                @click="nextYear"
+              />
             </div>
             </div>
             <div style="display: flex; flex-direction: row; margin-right: 20px">
             <div style="display: flex; flex-direction: row; margin-right: 20px">
-              <div v-for="item in selectStatus" :key="item.value"
-                style="display: flex; flex-direction: row; margin-right: 10px">
-                <div :style="{
-                  backgroundColor: item.color,
-                  width: '14px',
-                  height: '14px',
-                  margin: 'auto',
-                  borderRadius: '50%',
-                  border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                }" />
-                <div style="
+              <div
+                v-for="item in selectStatus"
+                :key="item.value"
+                style="display: flex; flex-direction: row; margin-right: 10px"
+              >
+                <div
+                  :style="{
+                    backgroundColor: item.color,
+                    width: '14px',
+                    height: '14px',
+                    margin: 'auto',
+                    borderRadius: '50%',
+                    border: item.color === '#fff' ? '1px solid #ddd' : 'none',
+                  }"
+                />
+                <div
+                  style="
                     display: inline-block;
                     display: inline-block;
                     margin-left: 10px;
                     margin-left: 10px;
                     line-height: 36px;
                     line-height: 36px;
-                  ">
+                  "
+                >
                   {{ item.label }}
                   {{ item.label }}
                 </div>
                 </div>
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>
         </template>
         </template>
-        <el-table-column v-for="item in selectMonths" :key="item.value" min-width="50" :label="item.label" align="center">
+        <el-table-column
+          v-for="item in selectMonths"
+          :key="item.value"
+          min-width="50"
+          :label="item.label"
+          align="center"
+        >
           <template #default="scope">
           <template #default="scope">
-            <el-button size="small" :style="monthStatusStyle(scope.row, item.value)" circle
-              @click="openDetail(scope.row, item)" style="width: 12px; height: 12px" />
+            <el-button
+              size="small"
+              :style="monthStatusStyle(scope.row, item.value)"
+              circle
+              @click="openDetail(scope.row, item)"
+              style="width: 12px; height: 12px"
+            />
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="执行人" align="center" prop="serviceName" min-width="100">
+      <el-table-column
+        label="执行人"
+        align="center"
+        prop="serviceName"
+        min-width="100"
+      >
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
     <!-- 分页 -->
     <!-- 分页 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
     <form-dialog ref="formDialogRef" :get-list="getList" />
     <form-dialog ref="formDialogRef" :get-list="getList" />
     <view-dialog ref="viewDialogRef" :get-list="getList" />
     <view-dialog ref="viewDialogRef" :get-list="getList" />
     <!-- 更多搜索弹窗 -->
     <!-- 更多搜索弹窗 -->
-    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body draggable>
-      <el-form :model="queryParams" ref="queryRef" size="small" label-width="100">
+    <el-dialog
+      title="更多搜索"
+      v-model="moreSearch"
+      width="620px"
+      append-to-body
+      draggable
+    >
+      <el-form
+        :model="queryParams"
+        ref="queryRef"
+        size="small"
+        label-width="100"
+      >
         <el-row :gutter="20">
         <el-row :gutter="20">
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="客户名称:" prop="companyName">
             <el-form-item label="客户名称:" prop="companyName">
-              <el-input v-model="queryParams.companyName" size="small" placeholder="请输入客户名称" clearable
-                @keyup.enter="handleQuery" />
+              <el-input
+                v-model="queryParams.companyName"
+                size="small"
+                placeholder="请输入客户名称"
+                clearable
+                @keyup.enter="handleQuery"
+              />
             </el-form-item>
             </el-form-item>
             <el-form-item v-if="tenant.versionId === '4'" label="来源:">
             <el-form-item v-if="tenant.versionId === '4'" label="来源:">
-              <el-input size="small" v-model="queryParams.fromCompanyName" type="text" placeholder="客户来源"
-                :clearable="true" />
+              <el-input
+                size="small"
+                v-model="queryParams.fromCompanyName"
+                type="text"
+                placeholder="客户来源"
+                :clearable="true"
+              />
             </el-form-item>
             </el-form-item>
             <el-form-item label="状态:">
             <el-form-item label="状态:">
-              <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
-                :clearable="true" @clear="clearStatus">
-                <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select
+                v-model.trim="queryParams.status"
+                prop="status"
+                size="small"
+                type="text"
+                placeholder="状态"
+                :clearable="true"
+                @clear="clearStatus"
+              >
+                <el-option
+                  v-for="item in selectStatus"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="月份:">
             <el-form-item label="月份:">
-              <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" @change="handleQuery"
-                :clearable="false">
-                <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select
+                v-model.trim="queryParams.month"
+                size="small"
+                placeholder="月份"
+                @change="handleQuery"
+                :clearable="false"
+              >
+                <el-option
+                  v-for="item in selectMonths"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
             <el-form-item label="纳税性质:">
             <el-form-item label="纳税性质:">
-              <el-select size="small" v-model="queryParams.taxType" placeholder="请选择纳税性质" :clearable="true"
-                @change="taxTypeChange">
-                <el-option v-for="item in taxTypes" :key="item.label" :label="item.label" :value="item.value" />
+              <el-select
+                size="small"
+                v-model="queryParams.taxType"
+                placeholder="请选择纳税性质"
+                :clearable="true"
+                @change="taxTypeChange"
+              >
+                <el-option
+                  v-for="item in taxTypes"
+                  :key="item.label"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -145,8 +308,16 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <div class="dialog-footer">
         <div class="dialog-footer">
-          <el-button type="primary" icon="Finished" size="small" @click="handleQuery">确 定</el-button>
-          <el-button icon="close" size="small" @click="moreSearch = false">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="handleQuery"
+            >确 定</el-button
+          >
+          <el-button icon="close" size="small" @click="moreSearch = false"
+            >取 消</el-button
+          >
         </div>
         </div>
       </template>
       </template>
     </el-dialog>
     </el-dialog>
@@ -165,7 +336,7 @@ import viewDialog from "./view";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 /** 字典数组区 */
 /** 字典数组区 */
 /** 查询 对象 */
 /** 查询 对象 */
-const tenant = useUserStore().tenant
+const tenant = useUserStore().tenant;
 const list = ref([]);
 const list = ref([]);
 const oneself = ref(false);
 const oneself = ref(false);
 const loading = ref(true);
 const loading = ref(true);
@@ -297,7 +468,6 @@ function getList() {
     list.value = response.rows;
     list.value = response.rows;
     total.value = response.total;
     total.value = response.total;
     loading.value = false;
     loading.value = false;
-    console.log(response.rows);
   });
   });
 }
 }
 
 
@@ -406,7 +576,6 @@ function editable() {
 }
 }
 
 
 function verifiable() {
 function verifiable() {
-  // console.log(permissions)
   return (
   return (
     permissions.includes(all_permission) ||
     permissions.includes(all_permission) ||
     permissions.includes("business:salaryZero:verify")
     permissions.includes("business:salaryZero:verify")

+ 38 - 24
src/views/business/production/salaryZero/view.vue

@@ -101,36 +101,39 @@
                   <el-table-column
                   <el-table-column
                     label="应发工资"
                     label="应发工资"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="planSalary"
                     prop="planSalary"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.planSalary }}
+                        {{ rowNum(scope.row.planSalary) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
                     label="实发工资"
                     label="实发工资"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="actuallySalary"
                     prop="actuallySalary"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.actuallySalary }}
+                        {{ rowNum(scope.row.actuallySalary) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
                     label="奖金及其他"
                     label="奖金及其他"
                     width="95"
                     width="95"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="bonusAmount"
                     prop="bonusAmount"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.bonusAmount }}
+                        {{ rowNum(scope.row.bonusAmount) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
@@ -138,48 +141,52 @@
                     <el-table-column
                     <el-table-column
                       label="养老保险"
                       label="养老保险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="endowmentInsurance"
                       prop="endowmentInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.endowmentInsurance }}
+                          {{ rowNum(scope.row.endowmentInsurance) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
                       label="医疗保险"
                       label="医疗保险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="medicalInsurance"
                       prop="medicalInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.medicalInsurance }}
+                          {{ rowNum(scope.row.medicalInsurance) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
                       label="失业险"
                       label="失业险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="unemploymentBenefit"
                       prop="unemploymentBenefit"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.unemploymentBenefit }}
+                          {{ rowNum(scope.row.unemploymentBenefit) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
                     <el-table-column
                     <el-table-column
                       label="大病险"
                       label="大病险"
                       width="70"
                       width="70"
-                      align="center"
+                      header-align="center"
+                      align="right"
                       prop="seriousIllnessInsurance"
                       prop="seriousIllnessInsurance"
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.seriousIllnessInsurance }}
+                          {{ rowNum(scope.row.seriousIllnessInsurance) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
@@ -187,18 +194,20 @@
                   <el-table-column
                   <el-table-column
                     label="公积金"
                     label="公积金"
                     width="80"
                     width="80"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="housingFund"
                     prop="housingFund"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.housingFund }}
+                        {{ rowNum(scope.row.housingFund) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column
                   <el-table-column
                     label="个税"
                     label="个税"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     :prop="
                     :prop="
                       form.status === 3 && form.hasIndividualIncomeTax
                       form.status === 3 && form.hasIndividualIncomeTax
                         ? 'individualIncomeTaxConfirm'
                         ? 'individualIncomeTaxConfirm'
@@ -208,9 +217,11 @@
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
                         {{
                         {{
-                          form.status === 3 && form.hasIndividualIncomeTax
-                            ? scope.row.individualIncomeTaxConfirm
-                            : scope.row.currentIndividualIncomeTax
+                          rowNum(
+                            form.status === 3 && form.hasIndividualIncomeTax
+                              ? scope.row.individualIncomeTaxConfirm
+                              : scope.row.currentIndividualIncomeTax
+                          )
                         }}
                         }}
                       </div>
                       </div>
                     </template></el-table-column
                     </template></el-table-column
@@ -218,12 +229,13 @@
                   <el-table-column
                   <el-table-column
                     label="其他扣款"
                     label="其他扣款"
                     width="70"
                     width="70"
-                    align="center"
+                    header-align="center"
+                    align="right"
                     prop="otherCut"
                     prop="otherCut"
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.otherCut }}
+                        {{ rowNum(scope.row.otherCut) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
@@ -254,7 +266,7 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="合计工资">
             <el-form-item label="合计工资">
-              {{ form.amount }}
+              {{ rowNum(form.amount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col v-if="showVerify()" :span="24">
           <el-col v-if="showVerify()" :span="24">
@@ -410,6 +422,7 @@ import {
   exportSalaryEmployee,
   exportSalaryEmployee,
   exportSalaryPdf,
   exportSalaryPdf,
 } from "@/api/business/production/salaryZero";
 } from "@/api/business/production/salaryZero";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 import feedbackDialog from "../feedbackDialog.vue";
 import feedbackDialog from "../feedbackDialog.vue";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
 import { ref } from "vue";
 import { ref } from "vue";
@@ -578,6 +591,7 @@ function getSummaries(param) {
           return Number(prev).toFixed(2);
           return Number(prev).toFixed(2);
         }
         }
       }, 0);
       }, 0);
+      sums[index] = numberToCurrencyNo(sums[index]);
     } else {
     } else {
       sums[index] = "";
       sums[index] = "";
     }
     }
@@ -644,7 +658,7 @@ function computeTotal() {
   form.value.details.forEach((l) => {
   form.value.details.forEach((l) => {
     totalSalay += l.actuallySalary == null ? 0 : l.actuallySalary;
     totalSalay += l.actuallySalary == null ? 0 : l.actuallySalary;
   });
   });
-  form.value.amount = totalSalay.toFixed(2);
+  form.value.amount = totalSalay;
 }
 }
 
 
 function returnStatus(status) {
 function returnStatus(status) {

+ 5 - 2
src/views/business/service/loop/housingFundForm.vue

@@ -213,8 +213,10 @@
                   <el-table-column label="基数" width="100" align="center">
                   <el-table-column label="基数" width="100" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        <el-input
+                        <el-input-number
                           v-model="scope.row.cardinalNumber"
                           v-model="scope.row.cardinalNumber"
+                          :precision="2"
+                          :controls="false"
                           size="small"
                           size="small"
                           placeholder="基数"
                           placeholder="基数"
                           @blur="onblur(scope.row, 'cardinalNumber')"
                           @blur="onblur(scope.row, 'cardinalNumber')"
@@ -322,7 +324,7 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="合计:">
             <el-form-item label="合计:">
-              <div>{{ form.housingFundDeclare.amount }}</div>
+              <div>{{ rowNum(form.housingFundDeclare.amount) }}</div>
               <!-- <el-input-number
               <!-- <el-input-number
                 v-model="form.housingFundDeclare.amount"
                 v-model="form.housingFundDeclare.amount"
                 size="small"
                 size="small"
@@ -438,6 +440,7 @@ import {
   saveDetail,
   saveDetail,
   updateDetail,
   updateDetail,
 } from "@/api/business/crm/serviceWorkOrder";
 } from "@/api/business/crm/serviceWorkOrder";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();

+ 137 - 44
src/views/business/service/loop/housingFundView.vue

@@ -1,5 +1,13 @@
 <template>
 <template>
-  <el-dialog title="公积金信息" v-model="visible" :width="width" append-to-body draggable @close="close" class="dialog-form">
+  <el-dialog
+    title="公积金信息"
+    v-model="visible"
+    :width="width"
+    append-to-body
+    draggable
+    @close="close"
+    class="dialog-form"
+  >
     <!-- <div slot="title" class="dialog-title-container">
     <!-- <div slot="title" class="dialog-title-container">
       <span class="title-label"><i class="el-icon-document" /> 工资信息</span>
       <span class="title-label"><i class="el-icon-document" /> 工资信息</span>
       <i class="el-icon-close" @click="close" />
       <i class="el-icon-close" @click="close" />
@@ -21,7 +29,12 @@
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="服务状态">
             <el-form-item label="服务状态">
               <el-select v-model="form.status" placeholder="请选择">
               <el-select v-model="form.status" placeholder="请选择">
-                <el-option v-for="item in selectStatus" :key="item.value" :value="item.value" :label="item.label" />
+                <el-option
+                  v-for="item in selectStatus"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                />
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -31,24 +44,43 @@
             <div class="details-head"></div>
             <div class="details-head"></div>
             <div class="details-body">
             <div class="details-body">
               <div>
               <div>
-                <el-table ref="sourceTable" :data="form.housingFundConfirm.details" size="small" max-height="490px" border
-                  show-summary :summary-method="getSummaries" highlight-current-row
-                  header-row-class-name="list-header-row" row-class-name="list-row" class="salary-table"
-                  @selection-change="handleCheckChange" @current-change="handleCurrentChange">
+                <el-table
+                  ref="sourceTable"
+                  :data="form.housingFundConfirm.details"
+                  size="small"
+                  max-height="490px"
+                  border
+                  show-summary
+                  :summary-method="getSummaries"
+                  highlight-current-row
+                  header-row-class-name="list-header-row"
+                  row-class-name="list-row"
+                  class="salary-table"
+                  @selection-change="handleCheckChange"
+                  @current-change="handleCurrentChange"
+                >
                   <el-table-column type="selection" width="50" align="center" />
                   <el-table-column type="selection" width="50" align="center" />
-                  <el-table-column type="index" label="序号" width="50" align="center" />
+                  <el-table-column
+                    type="index"
+                    label="序号"
+                    width="50"
+                    align="center"
+                  />
                   <el-table-column label="姓名" width="80" align="center">
                   <el-table-column label="姓名" width="80" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
                         {{ scope.row.employeeName }}
                         {{ scope.row.employeeName }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="电话号" width="130" align="center">
                   <el-table-column label="电话号" width="130" align="center">
@@ -56,69 +88,106 @@
                       <div>
                       <div>
                         {{ scope.row.phone }}
                         {{ scope.row.phone }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="身份证正面" width="120" align="center">
+                  <el-table-column
+                    label="身份证正面"
+                    width="120"
+                    align="center"
+                  >
                     <template #default="scope">
                     <template #default="scope">
-                      <div class="show-image" style="display: flex; justify-content: center">
-                        <img class="img" :src="baseUrl + '/' + scope.row.idCardImage" alt=""
-                          @click="handleImageView(scope.row.idCardImage)" />
+                      <div
+                        class="show-image"
+                        style="display: flex; justify-content: center"
+                      >
+                        <img
+                          class="img"
+                          :src="baseUrl + '/' + scope.row.idCardImage"
+                          alt=""
+                          @click="handleImageView(scope.row.idCardImage)"
+                        />
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="身份证反面" width="120" align="center">
+                  <el-table-column
+                    label="身份证反面"
+                    width="120"
+                    align="center"
+                  >
                     <template #default="scope">
                     <template #default="scope">
-                      <div class="show-image" style="display: flex; justify-content: center">
-                        <img class="img" :src="baseUrl + '/' + scope.row.idCardImageBack" alt=""
-                          @click="handleImageView(scope.row.idCardImageBack)" />
+                      <div
+                        class="show-image"
+                        style="display: flex; justify-content: center"
+                      >
+                        <img
+                          class="img"
+                          :src="baseUrl + '/' + scope.row.idCardImageBack"
+                          alt=""
+                          @click="handleImageView(scope.row.idCardImageBack)"
+                        />
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="基数" width="100" align="center">
                   <el-table-column label="基数" width="100" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.cardinalNumber }}
+                        {{ rowNum(scope.row.cardinalNumber) }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="比例" width="100" align="center">
                   <el-table-column label="比例" width="100" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>{{ scope.row.ratio }}%</div>
                       <div>{{ scope.row.ratio }}%</div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="备注" header-align="center">
                   <el-table-column label="备注" header-align="center">
@@ -140,17 +209,17 @@
           <el-divider content-position="left">社保申报信息</el-divider>
           <el-divider content-position="left">社保申报信息</el-divider>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位缴纳:">
             <el-form-item label="单位缴纳:">
-              {{ form.housingFundDeclare.unitAmount }}
+              {{ rowNum(form.housingFundDeclare.unitAmount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人缴纳:">
             <el-form-item label="个人缴纳:">
-              {{ form.housingFundDeclare.individualAmount }}
+              {{ rowNum(form.housingFundDeclare.individualAmount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="合计:">
             <el-form-item label="合计:">
-              {{ form.housingFundDeclare.amount }}
+              {{ rowNum(form.housingFundDeclare.amount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -164,15 +233,31 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="凭证" required>
             <el-form-item label="凭证" required>
-              <el-table ref="dbTable" :data="form.housingFundDeclare.evidenceFiles" size="small" border
-                header-row-class-name="list-header-row" row-class-name="list-row">
-                <el-table-column label="文件名" prop="originalFileName" align="center" show-overflow-tooltip>
+              <el-table
+                ref="dbTable"
+                :data="form.housingFundDeclare.evidenceFiles"
+                size="small"
+                border
+                header-row-class-name="list-header-row"
+                row-class-name="list-row"
+              >
+                <el-table-column
+                  label="文件名"
+                  prop="originalFileName"
+                  align="center"
+                  show-overflow-tooltip
+                >
                   <template #default="scope">
                   <template #default="scope">
-                    <el-button size="small" type="text" @click="openFile(scope.row)">{{
-                      scope.row.originalFileName == ""
-                      ? "打开文件"
-                      : scope.row.originalFileName
-                    }}</el-button>
+                    <el-button
+                      size="small"
+                      type="text"
+                      @click="openFile(scope.row)"
+                      >{{
+                        scope.row.originalFileName == ""
+                          ? "打开文件"
+                          : scope.row.originalFileName
+                      }}</el-button
+                    >
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <!-- <el-table-column
                 <!-- <el-table-column
@@ -188,9 +273,16 @@
       </el-form>
       </el-form>
     </div>
     </div>
     <div class="form-btns-container" style="height: 40px">
     <div class="form-btns-container" style="height: 40px">
-      <el-button size="small" style="float: right" @click="close" icon="close">取消</el-button>
+      <el-button size="small" style="float: right" @click="close" icon="close"
+        >取消</el-button
+      >
     </div>
     </div>
-    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
+    <el-image-viewer
+      v-if="showViewer"
+      :url-list="currentFileList"
+      @close="closeImages"
+      :initial-index="showIndex"
+    />
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
     <print-dialog ref="printDialog" :parent="this" /> -->
   </el-dialog>
   </el-dialog>
@@ -201,6 +293,7 @@ import {
   saveDetail,
   saveDetail,
   updateDetail,
   updateDetail,
 } from "@/api/business/crm/serviceWorkOrder";
 } from "@/api/business/crm/serviceWorkOrder";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
@@ -212,7 +305,7 @@ const showViewer = ref(false);
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   },
 });
 });
 const selectStatus = ref([
 const selectStatus = ref([
@@ -278,8 +371,8 @@ function reset() {
   form.value = proxy.deepClone(emptyForm);
   form.value = proxy.deepClone(emptyForm);
 }
 }
 
 
-function printSalary() { }
-function exportSalary() { }
+function printSalary() {}
+function exportSalary() {}
 
 
 function handleCurrentChange(row) {
 function handleCurrentChange(row) {
   currentSource.value = row;
   currentSource.value = row;

+ 496 - 111
src/views/business/service/loop/keepAccountForm.vue

@@ -1,5 +1,13 @@
 <template>
 <template>
-  <el-dialog title="记账信息" v-model="visible" :width="width" append-to-body draggable @close="close" class="dialog-form">
+  <el-dialog
+    title="记账信息"
+    v-model="visible"
+    :width="width"
+    append-to-body
+    draggable
+    @close="close"
+    class="dialog-form"
+  >
     <!-- <div slot="title" class="dialog-title-container">
     <!-- <div slot="title" class="dialog-title-container">
       <span class="title-label"><i class="el-icon-document" /> 工资信息</span>
       <span class="title-label"><i class="el-icon-document" /> 工资信息</span>
       <i class="el-icon-close" @click="close" />
       <i class="el-icon-close" @click="close" />
@@ -21,7 +29,12 @@
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="服务状态">
             <el-form-item label="服务状态">
               <el-select v-model="form.status" placeholder="请选择">
               <el-select v-model="form.status" placeholder="请选择">
-                <el-option v-for="item in selectStatus" :key="item.value" :value="item.value" :label="item.label" />
+                <el-option
+                  v-for="item in selectStatus"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                />
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -32,56 +45,117 @@
               <div class="title">
               <div class="title">
                 <i class="fa fa-th-list" aria-hidden="true" /> 工资人员信息
                 <i class="fa fa-th-list" aria-hidden="true" /> 工资人员信息
               </div>
               </div>
-              <el-button type="primary" size="small" icon="plus" @click="handleEmployeeCreate">新增</el-button>
-              <el-button v-if="selections.length > 0" type="danger" size="small" icon="delete"
-                @click="handleEmployeeBatchDelete">
-                删除</el-button>
+              <el-button
+                type="primary"
+                size="small"
+                icon="plus"
+                @click="handleEmployeeCreate"
+                >新增</el-button
+              >
+              <el-button
+                v-if="selections.length > 0"
+                type="danger"
+                size="small"
+                icon="delete"
+                @click="handleEmployeeBatchDelete"
+              >
+                删除</el-button
+              >
             </div>
             </div>
             <div class="details-body">
             <div class="details-body">
               <div>
               <div>
-                <el-table ref="sourceTable" :data="form.salary.details" size="small" max-height="490px" border
-                  show-summary :summary-method="getSummaries" highlight-current-row
-                  header-row-class-name="list-header-row" row-class-name="list-row" class="salary-table"
-                  @selection-change="handleCheckChange" @current-change="handleCurrentChange">
+                <el-table
+                  ref="sourceTable"
+                  :data="form.salary.details"
+                  size="small"
+                  max-height="490px"
+                  border
+                  show-summary
+                  :summary-method="getSummaries"
+                  highlight-current-row
+                  header-row-class-name="list-header-row"
+                  row-class-name="list-row"
+                  class="salary-table"
+                  @selection-change="handleCheckChange"
+                  @current-change="handleCurrentChange"
+                >
                   <el-table-column type="selection" width="50" align="center" />
                   <el-table-column type="selection" width="50" align="center" />
-                  <el-table-column type="index" label="序号" width="50" align="center" />
+                  <el-table-column
+                    type="index"
+                    label="序号"
+                    width="50"
+                    align="center"
+                  />
                   <el-table-column label="员工姓名" width="80" align="center">
                   <el-table-column label="员工姓名" width="80" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        <el-input v-model="scope.row.employeeName" size="small" placeholder="员工姓名" style="width: 100%" />
+                        <el-input
+                          v-model="scope.row.employeeName"
+                          size="small"
+                          placeholder="员工姓名"
+                          style="width: 100%"
+                        />
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="身份证号" width="150" align="center">
                   <el-table-column label="身份证号" width="150" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        <el-input v-model="scope.row.idCode" size="small" placeholder="身份证号" style="width: 100%" />
+                        <el-input
+                          v-model="scope.row.idCode"
+                          size="small"
+                          placeholder="身份证号"
+                          style="width: 100%"
+                        />
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="应发工资" width="70" align="center" prop="planSalary">
+                  <el-table-column
+                    label="应发工资"
+                    width="70"
+                    align="center"
+                    prop="planSalary"
+                  >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        <el-input-number v-model="scope.row.planSalary" size="small" placeholder="应发工资" :precision="2"
-                          :controls="false" style="width: 100%" @change="rowChangeSum(scope.row)" />
+                        <el-input-number
+                          v-model="scope.row.planSalary"
+                          size="small"
+                          placeholder="应发工资"
+                          :precision="2"
+                          :controls="false"
+                          style="width: 100%"
+                          @change="rowChangeSum(scope.row)"
+                        />
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="实发工资" width="70" align="center" prop="actuallySalary">
+                  <el-table-column
+                    label="实发工资"
+                    width="70"
+                    align="center"
+                    prop="actuallySalary"
+                  >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
                         <!-- <el-input-number
                         <!-- <el-input-number
@@ -92,79 +166,183 @@
                           :controls="false"
                           :controls="false"
                           style="width: 100%"
                           style="width: 100%"
                         /> -->
                         /> -->
-                        {{ scope.row.actuallySalary }}
+                        {{ rowNum(scope.row.actuallySalary) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="奖金及其他" width="85" align="center" prop="bonusAmount">
+                  <el-table-column
+                    label="奖金及其他"
+                    width="85"
+                    align="center"
+                    prop="bonusAmount"
+                  >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        <el-input-number v-model="scope.row.bonusAmount" size="small" placeholder="奖金及其他" :precision="2"
-                          :controls="false" style="width: 100%" @change="rowChangeSum(scope.row)" />
+                        <el-input-number
+                          v-model="scope.row.bonusAmount"
+                          size="small"
+                          placeholder="奖金及其他"
+                          :precision="2"
+                          :controls="false"
+                          style="width: 100%"
+                          @change="rowChangeSum(scope.row)"
+                        />
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="社保" align="center">
                   <el-table-column label="社保" align="center">
-                    <el-table-column label="养老保险" width="70" align="center" prop="endowmentInsurance">
+                    <el-table-column
+                      label="养老保险"
+                      width="70"
+                      align="center"
+                      prop="endowmentInsurance"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          <el-input-number v-model="scope.row.endowmentInsurance" size="small" placeholder="养老保险"
-                            :precision="2" :controls="false" style="width: 100%" @change="rowChangeSum(scope.row)" />
+                          <el-input-number
+                            v-model="scope.row.endowmentInsurance"
+                            size="small"
+                            placeholder="养老保险"
+                            :precision="2"
+                            :controls="false"
+                            style="width: 100%"
+                            @change="rowChangeSum(scope.row)"
+                          />
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="医疗保险" width="70" align="center" prop="medicalInsurance">
+                    <el-table-column
+                      label="医疗保险"
+                      width="70"
+                      align="center"
+                      prop="medicalInsurance"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          <el-input-number v-model="scope.row.medicalInsurance" size="small" placeholder="医疗保险"
-                            :precision="2" :controls="false" style="width: 100%" @change="rowChangeSum(scope.row)" />
+                          <el-input-number
+                            v-model="scope.row.medicalInsurance"
+                            size="small"
+                            placeholder="医疗保险"
+                            :precision="2"
+                            :controls="false"
+                            style="width: 100%"
+                            @change="rowChangeSum(scope.row)"
+                          />
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="失业险" width="70" align="center" prop="unemploymentBenefit">
+                    <el-table-column
+                      label="失业险"
+                      width="70"
+                      align="center"
+                      prop="unemploymentBenefit"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          <el-input-number v-model="scope.row.unemploymentBenefit" size="small" placeholder="失业险"
-                            :precision="2" :controls="false" style="width: 100%" @change="rowChangeSum(scope.row)" />
+                          <el-input-number
+                            v-model="scope.row.unemploymentBenefit"
+                            size="small"
+                            placeholder="失业险"
+                            :precision="2"
+                            :controls="false"
+                            style="width: 100%"
+                            @change="rowChangeSum(scope.row)"
+                          />
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
-                    <el-table-column label="大病险" width="70" align="center" prop="seriousIllnessInsurance">
+                    <el-table-column
+                      label="大病险"
+                      width="70"
+                      align="center"
+                      prop="seriousIllnessInsurance"
+                    >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          <el-input-number v-model="scope.row.seriousIllnessInsurance" size="small" placeholder="大病险"
-                            :precision="2" :controls="false" style="width: 100%" @change="rowChangeSum(scope.row)" />
+                          <el-input-number
+                            v-model="scope.row.seriousIllnessInsurance"
+                            size="small"
+                            placeholder="大病险"
+                            :precision="2"
+                            :controls="false"
+                            style="width: 100%"
+                            @change="rowChangeSum(scope.row)"
+                          />
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="公积金" width="70" align="center" prop="housingFund">
+                  <el-table-column
+                    label="公积金"
+                    width="70"
+                    align="center"
+                    prop="housingFund"
+                  >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        <el-input-number v-model="scope.row.housingFund" size="small" placeholder="住房公积金" :precision="2"
-                          :controls="false" style="width: 100%" @change="rowChangeSum(scope.row)" />
+                        <el-input-number
+                          v-model="scope.row.housingFund"
+                          size="small"
+                          placeholder="住房公积金"
+                          :precision="2"
+                          :controls="false"
+                          style="width: 100%"
+                          @change="rowChangeSum(scope.row)"
+                        />
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="个税" align="center" width="70" prop="currentIndividualIncomeTax">
+                  <el-table-column
+                    label="个税"
+                    align="center"
+                    width="70"
+                    prop="currentIndividualIncomeTax"
+                  >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        <el-input-number v-model="scope.row.currentIndividualIncomeTax" size="small" placeholder="个税"
-                          :precision="2" :controls="false" style="width: 100%" @change="rowChangeSum(scope.row)" />
-                      </div>
-                    </template></el-table-column>
-                  <el-table-column label="其他扣款" width="70" align="center" prop="otherCut">
+                        <el-input-number
+                          v-model="scope.row.currentIndividualIncomeTax"
+                          size="small"
+                          placeholder="个税"
+                          :precision="2"
+                          :controls="false"
+                          style="width: 100%"
+                          @change="rowChangeSum(scope.row)"
+                        />
+                      </div> </template
+                  ></el-table-column>
+                  <el-table-column
+                    label="其他扣款"
+                    width="70"
+                    align="center"
+                    prop="otherCut"
+                  >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        <el-input-number v-model="scope.row.otherCut" size="small" placeholder="其他扣款" :precision="2"
-                          :controls="false" style="width: 100%" @change="rowChangeSum(scope.row)" />
+                        <el-input-number
+                          v-model="scope.row.otherCut"
+                          size="small"
+                          placeholder="其他扣款"
+                          :precision="2"
+                          :controls="false"
+                          style="width: 100%"
+                          @change="rowChangeSum(scope.row)"
+                        />
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="备注" width="100" header-align="center">
+                  <el-table-column
+                    label="备注"
+                    width="100"
+                    header-align="center"
+                  >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        <el-input v-model="scope.row.remark" size="small" placeholder="备注" />
+                        <el-input
+                          v-model="scope.row.remark"
+                          size="small"
+                          placeholder="备注"
+                        />
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
@@ -182,56 +360,126 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="工资备注">
             <el-form-item label="工资备注">
-              <el-input v-model.trim="form.salary.content" maxlength="200" show-word-limit type="textarea" rows="2" />
+              <el-input
+                v-model.trim="form.salary.content"
+                maxlength="200"
+                show-word-limit
+                type="textarea"
+                rows="2"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-divider content-position="left">收票</el-divider>
           <el-divider content-position="left">收票</el-divider>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="收入票">
             <el-form-item label="收入票">
-              <el-input-number v-model="form.ticket.incomeTicket" size="small" placeholder="收入票" :step="1" step-strictly
-                :controls="false" style="width: 100%" @change="ticketNumberChange" />
+              <el-input-number
+                v-model="form.ticket.incomeTicket"
+                size="small"
+                placeholder="收入票"
+                :step="1"
+                step-strictly
+                :controls="false"
+                style="width: 100%"
+                @change="ticketNumberChange"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="成本票">
             <el-form-item label="成本票">
-              <el-input-number v-model="form.ticket.costTicket" size="small" placeholder="成本票" :step="1" step-strictly
-                :controls="false" style="width: 100%" @change="ticketNumberChange" />
+              <el-input-number
+                v-model="form.ticket.costTicket"
+                size="small"
+                placeholder="成本票"
+                :step="1"
+                step-strictly
+                :controls="false"
+                style="width: 100%"
+                @change="ticketNumberChange"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="费用票">
             <el-form-item label="费用票">
-              <el-input-number v-model="form.ticket.feeTicketNumber" size="small" placeholder="费用票" :step="1"
-                step-strictly :controls="false" style="width: 100%" @change="ticketNumberChange" />
+              <el-input-number
+                v-model="form.ticket.feeTicketNumber"
+                size="small"
+                placeholder="费用票"
+                :step="1"
+                step-strictly
+                :controls="false"
+                style="width: 100%"
+                @change="ticketNumberChange"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="银行对账">
             <el-form-item label="银行对账">
-              <el-input-number v-model="form.ticket.bankCopyNumber" size="small" placeholder="银行回单" :step="1"
-                step-strictly :controls="false" style="width: 100%" @change="ticketNumberChange" />
+              <el-input-number
+                v-model="form.ticket.bankCopyNumber"
+                size="small"
+                placeholder="银行回单"
+                :step="1"
+                step-strictly
+                :controls="false"
+                style="width: 100%"
+                @change="ticketNumberChange"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="银行回单">
             <el-form-item label="银行回单">
-              <el-input-number v-model="form.ticket.bankSlipsNumber" size="small" placeholder="银行回单" :step="1"
-                step-strictly :controls="false" style="width: 100%" @change="ticketNumberChange" />
+              <el-input-number
+                v-model="form.ticket.bankSlipsNumber"
+                size="small"
+                placeholder="银行回单"
+                :step="1"
+                step-strictly
+                :controls="false"
+                style="width: 100%"
+                @change="ticketNumberChange"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="工资单">
             <el-form-item label="工资单">
-              <el-input-number v-model="form.ticket.salaryTicket" size="small" placeholder="工资单" :step="1" step-strictly
-                :controls="false" style="width: 100%" @change="ticketNumberChange" />
+              <el-input-number
+                v-model="form.ticket.salaryTicket"
+                size="small"
+                placeholder="工资单"
+                :step="1"
+                step-strictly
+                :controls="false"
+                style="width: 100%"
+                @change="ticketNumberChange"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="社保公积金">
             <el-form-item label="社保公积金">
-              <el-input-number v-model="form.ticket.ssafTicket" size="small" placeholder="社保公积金" :step="1" step-strictly
-                :controls="false" style="width: 100%" @change="ticketNumberChange" />
+              <el-input-number
+                v-model="form.ticket.ssafTicket"
+                size="small"
+                placeholder="社保公积金"
+                :step="1"
+                step-strictly
+                :controls="false"
+                style="width: 100%"
+                @change="ticketNumberChange"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="其他票">
             <el-form-item label="其他票">
-              <el-input-number v-model="form.ticket.otherTicket" size="small" placeholder="其他票" :step="1" step-strictly
-                :controls="false" style="width: 100%" @change="ticketNumberChange" />
+              <el-input-number
+                v-model="form.ticket.otherTicket"
+                size="small"
+                placeholder="其他票"
+                :step="1"
+                step-strictly
+                :controls="false"
+                style="width: 100%"
+                @change="ticketNumberChange"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
@@ -250,167 +498,302 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="备注">
             <el-form-item label="备注">
-              <el-input v-model.trim="form.ticket.content" maxlength="200" show-word-limit type="textarea" rows="2" />
+              <el-input
+                v-model.trim="form.ticket.content"
+                maxlength="200"
+                show-word-limit
+                type="textarea"
+                rows="2"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-divider content-position="left">记账</el-divider>
           <el-divider content-position="left">记账</el-divider>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本期收入">
             <el-form-item label="本期收入">
-              <el-input-number v-model="form.keepAccount.currentIncome" size="small" placeholder="本期收入" :precision="2"
-                :controls="false" style="width: 100%" />
+              <el-input-number
+                v-model="form.keepAccount.currentIncome"
+                size="small"
+                placeholder="本期收入"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本年收入">
             <el-form-item label="本年收入">
-              <el-input-number v-model="form.keepAccount.currentYearIncome" size="small" placeholder="本年收入" :precision="2"
-                :controls="false" style="width: 100%" />
+              <el-input-number
+                v-model="form.keepAccount.currentYearIncome"
+                size="small"
+                placeholder="本年收入"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本年累计成本">
             <el-form-item label="本年累计成本">
-              <el-input-number v-model="form.keepAccount.cumulativeCost" size="small" placeholder="本年累计成本" :precision="2"
-                :controls="false" style="width: 100%" />
+              <el-input-number
+                v-model="form.keepAccount.cumulativeCost"
+                size="small"
+                placeholder="本年累计成本"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="本年利润总额">
             <el-form-item label="本年利润总额">
-              <el-input-number v-model="form.keepAccount.currentYearProfit" size="small" placeholder="本年利润总额"
-                :precision="2" :controls="false" style="width: 100%" />
+              <el-input-number
+                v-model="form.keepAccount.currentYearProfit"
+                size="small"
+                placeholder="本年利润总额"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="是否暂估">
             <el-form-item label="是否暂估">
-              <el-checkbox v-model="form.keepAccount.isProvisionalEstimate" :true-label="1" :false-label="0" />
+              <el-checkbox
+                v-model="form.keepAccount.isProvisionalEstimate"
+                :true-label="1"
+                :false-label="0"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col v-if="form.keepAccount.isProvisionalEstimate === 1" :span="12">
+          <el-col
+            v-if="form.keepAccount.isProvisionalEstimate === 1"
+            :span="12"
+          >
             <el-form-item label="暂估金额">
             <el-form-item label="暂估金额">
-              <el-input-number v-model="form.keepAccount.provisionalEstimateAmount" size="small" placeholder="暂估金额"
-                :precision="2" :controls="false" style="width: 100%" />
+              <el-input-number
+                v-model="form.keepAccount.provisionalEstimateAmount"
+                size="small"
+                placeholder="暂估金额"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="备注">
             <el-form-item label="备注">
-              <el-input v-model.trim="form.keepAccount.content" maxlength="200" show-word-limit type="textarea"
-                rows="2" />
+              <el-input
+                v-model.trim="form.keepAccount.content"
+                maxlength="200"
+                show-word-limit
+                type="textarea"
+                rows="2"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-divider content-position="left">报税</el-divider>
           <el-divider content-position="left">报税</el-divider>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="可弥补之前年度亏损">
             <el-form-item label="可弥补之前年度亏损">
-              <el-input-number size="small" placeholder="可弥补之前年度亏损" v-model="form.reportTax.previousAnnualLosses"
-                :precision="2" :controls="false" style="align: right; text-align: right; width: 100%" />
+              <el-input-number
+                size="small"
+                placeholder="可弥补之前年度亏损"
+                v-model="form.reportTax.previousAnnualLosses"
+                :precision="2"
+                :controls="false"
+                style="align: right; text-align: right; width: 100%"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="增值税">
             <el-form-item label="增值税">
-              <el-input-number placeholder="增值税" v-model="form.reportTax.valueAddedTax" style="
+              <el-input-number
+                placeholder="增值税"
+                v-model="form.reportTax.valueAddedTax"
+                style="
                   display: flex;
                   display: flex;
                   align-items: center;
                   align-items: center;
                   justify-content: center;
                   justify-content: center;
                   width: 100%;
                   width: 100%;
-                " @change="taxChangeHandler" :controls="false" :precision="2" />
+                "
+                @change="taxChangeHandler"
+                :controls="false"
+                :precision="2"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="城建税">
             <el-form-item label="城建税">
-              <el-input-number placeholder="城建税" v-model="form.reportTax.cityConstructTax" style="
+              <el-input-number
+                placeholder="城建税"
+                v-model="form.reportTax.cityConstructTax"
+                :precision="2"
+                style="
                   display: flex;
                   display: flex;
                   align-items: center;
                   align-items: center;
                   justify-content: center;
                   justify-content: center;
                   width: 100%;
                   width: 100%;
-                " @change="taxChangeHandler" :controls="false" />
+                "
+                @change="taxChangeHandler"
+                :controls="false"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="教育费附加">
             <el-form-item label="教育费附加">
-              <el-input-number placeholder="教育费附加" v-model="form.reportTax.additionsTaxOfEducation" style="
+              <el-input-number
+                placeholder="教育费附加"
+                v-model="form.reportTax.additionsTaxOfEducation"
+                style="
                   display: flex;
                   display: flex;
                   align-items: center;
                   align-items: center;
                   justify-content: center;
                   justify-content: center;
                   width: 100%;
                   width: 100%;
-                " @change="taxChangeHandler" :controls="false" />
+                "
+                @change="taxChangeHandler"
+                :precision="2"
+                :controls="false"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="地方教育费附加">
             <el-form-item label="地方教育费附加">
-              <el-input-number placeholder="地方教育费附加" v-model="form.reportTax.ladditionsTaxOfEducation" style="
+              <el-input-number
+                placeholder="地方教育费附加"
+                v-model="form.reportTax.ladditionsTaxOfEducation"
+                style="
                   display: flex;
                   display: flex;
                   align-items: center;
                   align-items: center;
                   justify-content: center;
                   justify-content: center;
                   width: 100%;
                   width: 100%;
-                " @change="taxChangeHandler" :controls="false" />
+                "
+                @change="taxChangeHandler"
+                :precision="2"
+                :controls="false"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="企业所得税">
             <el-form-item label="企业所得税">
-              <el-input-number placeholder="企业所得税" v-model="form.reportTax.businessIncomeTax" style="
+              <el-input-number
+                placeholder="企业所得税"
+                v-model="form.reportTax.businessIncomeTax"
+                style="
                   display: flex;
                   display: flex;
                   align-items: center;
                   align-items: center;
                   justify-content: center;
                   justify-content: center;
                   width: 100%;
                   width: 100%;
-                " @change="taxChangeHandler" :controls="false" />
+                "
+                @change="taxChangeHandler"
+                :precision="2"
+                :controls="false"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="印花税">
             <el-form-item label="印花税">
-              <el-input-number placeholder="印花税" v-model="form.reportTax.stampTax" style="
+              <el-input-number
+                placeholder="印花税"
+                v-model="form.reportTax.stampTax"
+                style="
                   display: flex;
                   display: flex;
                   align-items: center;
                   align-items: center;
                   width: 100%;
                   width: 100%;
                   justify-content: center;
                   justify-content: center;
-                " @change="taxChangeHandler" :controls="false" />
+                "
+                @change="taxChangeHandler"
+                :precision="2"
+                :controls="false"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="文化事业建设税">
             <el-form-item label="文化事业建设税">
-              <el-input-number placeholder="文化事业建设税" v-model="form.reportTax.culturalConstructTax" style="
+              <el-input-number
+                placeholder="文化事业建设税"
+                v-model="form.reportTax.culturalConstructTax"
+                style="
                   display: flex;
                   display: flex;
                   align-items: center;
                   align-items: center;
                   justify-content: center;
                   justify-content: center;
                   width: 100%;
                   width: 100%;
-                " @change="taxChangeHandler" :controls="false" />
+                "
+                @change="taxChangeHandler"
+                :precision="2"
+                :controls="false"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="消费税">
             <el-form-item label="消费税">
-              <el-input-number placeholder="消费税" v-model="form.reportTax.excise" style="
+              <el-input-number
+                placeholder="消费税"
+                v-model="form.reportTax.excise"
+                style="
                   display: flex;
                   display: flex;
                   align-items: center;
                   align-items: center;
                   justify-content: center;
                   justify-content: center;
                   width: 100%;
                   width: 100%;
-                " @change="taxChangeHandler" :controls="false" />
+                "
+                @change="taxChangeHandler"
+                :precision="2"
+                :controls="false"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="合计">
             <el-form-item label="合计">
-              <span>{{ form.reportTax.sumTax }}</span>
+              <span>{{ rowNum(form.reportTax.sumTax) }}</span>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-divider content-position="left">个税</el-divider>
           <el-divider content-position="left">个税</el-divider>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个税金额">
             <el-form-item label="个税金额">
-              <el-input-number placeholder="个税金额" v-model="form.individual.amount" style="
+              <el-input-number
+                placeholder="个税金额"
+                v-model="form.individual.amount"
+                style="
                   display: flex;
                   display: flex;
                   align-items: center;
                   align-items: center;
                   justify-content: center;
                   justify-content: center;
                   width: 100%;
                   width: 100%;
-                " :controls="false" />
+                "
+                :controls="false"
+                :precision="2"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="备注">
             <el-form-item label="备注">
-              <el-input type="textarea" maxlength="200" show-word-limit rows="2" v-model="form.individual.remark" />
+              <el-input
+                type="textarea"
+                maxlength="200"
+                show-word-limit
+                rows="2"
+                v-model="form.individual.remark"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-form>
       </el-form>
     </div>
     </div>
     <div class="form-btns-container" style="height: 40px">
     <div class="form-btns-container" style="height: 40px">
-      <el-button size="small" icon="close" @click="close" style="float: right; margin-left: 12px; margin-right: 12px">
-        取消</el-button>
-      <el-button type="primary" size="small" icon="Finished" style="float: right" @click="handleSave">
-        保存</el-button>
+      <el-button
+        size="small"
+        icon="close"
+        @click="close"
+        style="float: right; margin-left: 12px; margin-right: 12px"
+      >
+        取消</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        icon="Finished"
+        style="float: right"
+        @click="handleSave"
+      >
+        保存</el-button
+      >
     </div>
     </div>
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
     <print-dialog ref="printDialog" :parent="this" /> -->
@@ -422,6 +805,7 @@ import {
   saveDetail,
   saveDetail,
   updateDetail,
   updateDetail,
 } from "@/api/business/crm/serviceWorkOrder";
 } from "@/api/business/crm/serviceWorkOrder";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
@@ -432,7 +816,7 @@ const currentSource = ref(null);
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   },
 });
 });
 const selectStatus = ref([
 const selectStatus = ref([
@@ -528,8 +912,8 @@ function reset() {
   form.value = proxy.deepClone(emptyForm);
   form.value = proxy.deepClone(emptyForm);
 }
 }
 
 
-function printSalary() { }
-function exportSalary() { }
+function printSalary() {}
+function exportSalary() {}
 
 
 function handleCurrentChange(row) {
 function handleCurrentChange(row) {
   currentSource.value = row;
   currentSource.value = row;
@@ -607,6 +991,7 @@ function getSummaries(param) {
           return Number(prev).toFixed(2);
           return Number(prev).toFixed(2);
         }
         }
       }, 0);
       }, 0);
+      sums[index] = numberToCurrencyNo(sums[index]);
     } else {
     } else {
       sums[index] = "";
       sums[index] = "";
     }
     }

+ 29 - 27
src/views/business/service/loop/keepAccountView.vue

@@ -116,7 +116,7 @@
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.planSalary }}
+                        {{ rowNum(scope.row.planSalary) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
@@ -128,7 +128,7 @@
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.actuallySalary }}
+                        {{ rowNum(scope.row.actuallySalary) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
@@ -140,7 +140,7 @@
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.bonusAmount }}
+                        {{ rowNum(scope.row.bonusAmount) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
@@ -153,7 +153,7 @@
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.endowmentInsurance }}
+                          {{ rowNum(scope.row.endowmentInsurance) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
@@ -165,7 +165,7 @@
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.medicalInsurance }}
+                          {{ rowNum(scope.row.medicalInsurance) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
@@ -177,7 +177,7 @@
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.unemploymentBenefit }}
+                          {{ rowNum(scope.row.unemploymentBenefit) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
@@ -189,7 +189,7 @@
                     >
                     >
                       <template #default="scope">
                       <template #default="scope">
                         <div>
                         <div>
-                          {{ scope.row.seriousIllnessInsurance }}
+                          {{ rowNum(scope.row.seriousIllnessInsurance) }}
                         </div>
                         </div>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
@@ -202,7 +202,7 @@
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.housingFund }}
+                        {{ rowNum(scope.row.housingFund) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
@@ -214,7 +214,7 @@
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.currentIndividualIncomeTax }}
+                        {{ rowNum(scope.row.currentIndividualIncomeTax) }}
                       </div>
                       </div>
                     </template></el-table-column
                     </template></el-table-column
                   >
                   >
@@ -226,7 +226,7 @@
                   >
                   >
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.otherCut }}
+                        {{ rowNum(scope.row.otherCut) }}
                       </div>
                       </div>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
@@ -250,7 +250,7 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="合计工资">
             <el-form-item label="合计工资">
-              {{ form.salary.amount }}
+              {{ rowNum(form.salary.amount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -312,22 +312,22 @@
           <el-divider content-position="left">记账</el-divider>
           <el-divider content-position="left">记账</el-divider>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="本期收入">
             <el-form-item label="本期收入">
-              {{ form.keepAccount.currentIncome }}
+              {{ rowNum(form.keepAccount.currentIncome) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="本年收入">
             <el-form-item label="本年收入">
-              {{ form.keepAccount.currentYearIncome }}
+              {{ rowNum(form.keepAccount.currentYearIncome) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="本年累计成本">
             <el-form-item label="本年累计成本">
-              {{ form.keepAccount.cumulativeCost }}
+              {{ rowNum(form.keepAccount.cumulativeCost) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="本年利润总额">
             <el-form-item label="本年利润总额">
-              {{ form.keepAccount.currentYearProfit }}
+              {{ rowNum(form.keepAccount.currentYearProfit) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
@@ -337,7 +337,7 @@
           </el-col>
           </el-col>
           <el-col v-if="form.keepAccount.isProvisionalEstimate === 1" :span="8">
           <el-col v-if="form.keepAccount.isProvisionalEstimate === 1" :span="8">
             <el-form-item label="暂估金额">
             <el-form-item label="暂估金额">
-              {{ form.keepAccount.provisionalEstimateAmount }}
+              {{ rowNum(form.keepAccount.provisionalEstimateAmount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -348,58 +348,58 @@
           <el-divider content-position="left">报税</el-divider>
           <el-divider content-position="left">报税</el-divider>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="可弥补之前年度亏损">
             <el-form-item label="可弥补之前年度亏损">
-              {{ form.reportTax.previousAnnualLosses }}
+              {{ rowNum(form.reportTax.previousAnnualLosses) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="增值税">
             <el-form-item label="增值税">
-              {{ form.reportTax.valueAddedTax }}
+              {{ rowNum(form.reportTax.valueAddedTax) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="城建税">
             <el-form-item label="城建税">
-              {{ form.reportTax.cityConstructTax }}
+              {{ rowNum(form.reportTax.cityConstructTax) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="教育费附加">
             <el-form-item label="教育费附加">
-              {{ form.reportTax.additionsTaxOfEducation }}
+              {{ rowNum(form.reportTax.additionsTaxOfEducation) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="地方教育费附加">
             <el-form-item label="地方教育费附加">
-              {{ form.reportTax.ladditionsTaxOfEducation }}
+              {{ rowNum(form.reportTax.ladditionsTaxOfEducation) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="企业所得税">
             <el-form-item label="企业所得税">
-              {{ form.reportTax.businessIncomeTax }}
+              {{ rowNum(form.reportTax.businessIncomeTax) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="印花税">
             <el-form-item label="印花税">
-              {{ form.reportTax.stampTax }}
+              {{ rowNum(form.reportTax.stampTax) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="文化事业建设税">
             <el-form-item label="文化事业建设税">
-              {{ form.reportTax.culturalConstructTax }}
+              {{ rowNum(form.reportTax.culturalConstructTax) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="消费税">
             <el-form-item label="消费税">
-              {{ form.reportTax.excise }}
+              {{ rowNum(form.reportTax.excise) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="合计">
             <el-form-item label="合计">
-              {{ form.reportTax.sumTax }}
+              {{ rowNum(form.reportTax.sumTax) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-divider content-position="left">个税</el-divider>
           <el-divider content-position="left">个税</el-divider>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个税金额">
             <el-form-item label="个税金额">
-              {{ form.individual.amount }}
+              {{ rowNum(form.individual.amount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
@@ -425,6 +425,7 @@ import {
   saveDetail,
   saveDetail,
   updateDetail,
   updateDetail,
 } from "@/api/business/crm/serviceWorkOrder";
 } from "@/api/business/crm/serviceWorkOrder";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
@@ -610,6 +611,7 @@ function getSummaries(param) {
           return Number(prev).toFixed(2);
           return Number(prev).toFixed(2);
         }
         }
       }, 0);
       }, 0);
+      sums[index] = numberToCurrencyNo(sums[index]);
     } else {
     } else {
       sums[index] = "";
       sums[index] = "";
     }
     }

+ 2 - 1
src/views/business/service/loop/socialSecurityForm.vue

@@ -436,7 +436,7 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="合计:">
             <el-form-item label="合计:">
-              <div>{{ form.socialSecurityDeclare.amount }}</div>
+              <div>{{ rowNum(form.socialSecurityDeclare.amount) }}</div>
               <!-- <el-input-number
               <!-- <el-input-number
                 v-model="form.socialSecurityDeclare.amount"
                 v-model="form.socialSecurityDeclare.amount"
                 size="small"
                 size="small"
@@ -553,6 +553,7 @@ import {
   updateDetail,
   updateDetail,
 } from "@/api/business/crm/serviceWorkOrder";
 } from "@/api/business/crm/serviceWorkOrder";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);

+ 147 - 54
src/views/business/service/loop/socialSecurityView.vue

@@ -1,5 +1,13 @@
 <template>
 <template>
-  <el-dialog title="社保信息" v-model="visible" :width="width" append-to-body draggable @close="close" class="dialog-form">
+  <el-dialog
+    title="社保信息"
+    v-model="visible"
+    :width="width"
+    append-to-body
+    draggable
+    @close="close"
+    class="dialog-form"
+  >
     <!-- <div slot="title" class="dialog-title-container">
     <!-- <div slot="title" class="dialog-title-container">
       <span class="title-label"><i class="el-icon-document" /> 工资信息</span>
       <span class="title-label"><i class="el-icon-document" /> 工资信息</span>
       <i class="el-icon-close" @click="close" />
       <i class="el-icon-close" @click="close" />
@@ -21,7 +29,12 @@
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="服务状态">
             <el-form-item label="服务状态">
               <el-select v-model="form.status" placeholder="请选择">
               <el-select v-model="form.status" placeholder="请选择">
-                <el-option v-for="item in selectStatus" :key="item.value" :value="item.value" :label="item.label" />
+                <el-option
+                  v-for="item in selectStatus"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                />
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -31,24 +44,43 @@
             <div class="details-head"></div>
             <div class="details-head"></div>
             <div class="details-body">
             <div class="details-body">
               <div>
               <div>
-                <el-table ref="sourceTable" :data="form.socialSecurityConfirm.details" size="small" max-height="490px"
-                  border show-summary :summary-method="getSummaries" highlight-current-row
-                  header-row-class-name="list-header-row" row-class-name="list-row" class="salary-table"
-                  @selection-change="handleCheckChange" @current-change="handleCurrentChange">
+                <el-table
+                  ref="sourceTable"
+                  :data="form.socialSecurityConfirm.details"
+                  size="small"
+                  max-height="490px"
+                  border
+                  show-summary
+                  :summary-method="getSummaries"
+                  highlight-current-row
+                  header-row-class-name="list-header-row"
+                  row-class-name="list-row"
+                  class="salary-table"
+                  @selection-change="handleCheckChange"
+                  @current-change="handleCurrentChange"
+                >
                   <el-table-column type="selection" width="50" align="center" />
                   <el-table-column type="selection" width="50" align="center" />
-                  <el-table-column type="index" label="序号" width="50" align="center" />
+                  <el-table-column
+                    type="index"
+                    label="序号"
+                    width="50"
+                    align="center"
+                  />
                   <el-table-column label="姓名" width="80" align="center">
                   <el-table-column label="姓名" width="80" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
                         {{ scope.row.employeeName }}
                         {{ scope.row.employeeName }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="电话号" width="130" align="center">
                   <el-table-column label="电话号" width="130" align="center">
@@ -56,71 +88,108 @@
                       <div>
                       <div>
                         {{ scope.row.phone }}
                         {{ scope.row.phone }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="身份证正面" width="120" align="center">
+                  <el-table-column
+                    label="身份证正面"
+                    width="120"
+                    align="center"
+                  >
                     <template #default="scope">
                     <template #default="scope">
-                      <div class="show-image" style="display: flex; justify-content: center">
-                        <img class="img" :src="baseUrl + '/' + scope.row.idCardImage" alt=""
-                          @click="handleImageView(scope.row.idCardImage)" />
+                      <div
+                        class="show-image"
+                        style="display: flex; justify-content: center"
+                      >
+                        <img
+                          class="img"
+                          :src="baseUrl + '/' + scope.row.idCardImage"
+                          alt=""
+                          @click="handleImageView(scope.row.idCardImage)"
+                        />
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="身份证反面" width="120" align="center">
+                  <el-table-column
+                    label="身份证反面"
+                    width="120"
+                    align="center"
+                  >
                     <template #default="scope">
                     <template #default="scope">
-                      <div class="show-image" style="display: flex; justify-content: center">
-                        <img class="img" :src="baseUrl + '/' + scope.row.idCardImageBack" alt=""
-                          @click="handleImageView(scope.row.idCardImageBack)" />
+                      <div
+                        class="show-image"
+                        style="display: flex; justify-content: center"
+                      >
+                        <img
+                          class="img"
+                          :src="baseUrl + '/' + scope.row.idCardImageBack"
+                          alt=""
+                          @click="handleImageView(scope.row.idCardImageBack)"
+                        />
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="基数" width="100" align="center">
                   <el-table-column label="基数" width="100" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.cardinalNumber }}
+                        {{ rowNum(scope.row.cardinalNumber) }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="医疗基数" width="100" align="center">
                   <el-table-column label="医疗基数" width="100" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.medicalCardinalNumber }}
+                        {{ rowNum(scope.row.medicalCardinalNumber) }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 12px;
                           right: 12px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <!-- <el-table-column label="签名" width="100" header-align="center" required>
                   <!-- <el-table-column label="签名" width="100" header-align="center" required>
@@ -144,62 +213,62 @@
           <el-divider content-position="left">社保申报信息</el-divider>
           <el-divider content-position="left">社保申报信息</el-divider>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位养老金:">
             <el-form-item label="单位养老金:">
-              {{ form.socialSecurityDeclare.unitPension }}
+              {{ rowNum(form.socialSecurityDeclare.unitPension) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位医疗险:">
             <el-form-item label="单位医疗险:">
-              {{ form.socialSecurityDeclare.unitMedical }}
+              {{ rowNum(form.socialSecurityDeclare.unitMedical) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位工伤险:">
             <el-form-item label="单位工伤险:">
-              {{ form.socialSecurityDeclare.unitInjury }}
+              {{ rowNum(form.socialSecurityDeclare.unitInjury) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位失业金:">
             <el-form-item label="单位失业金:">
-              {{ form.socialSecurityDeclare.unitUnemployment }}
+              {{ rowNum(form.socialSecurityDeclare.unitUnemployment) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位生育险:">
             <el-form-item label="单位生育险:">
-              {{ form.socialSecurityDeclare.unitProcreate }}
+              {{ rowNum(form.socialSecurityDeclare.unitProcreate) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位大病险:">
             <el-form-item label="单位大病险:">
-              {{ form.socialSecurityDeclare.unitSeriousIllness }}
+              {{ rowNum(form.socialSecurityDeclare.unitSeriousIllness) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位采暖费:">
             <el-form-item label="单位采暖费:">
-              {{ form.socialSecurityDeclare.unitHeatingFee }}
+              {{ rowNum(form.socialSecurityDeclare.unitHeatingFee) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人养老金:">
             <el-form-item label="个人养老金:">
-              {{ form.socialSecurityDeclare.individualPension }}
+              {{ rowNum(form.socialSecurityDeclare.individualPension) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人医疗险:">
             <el-form-item label="个人医疗险:">
-              {{ form.socialSecurityDeclare.individualMedical }}
+              {{ rowNum(form.socialSecurityDeclare.individualMedical) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人失业金:">
             <el-form-item label="个人失业金:">
-              {{ form.socialSecurityDeclare.individualUnemployment }}
+              {{ rowNum(form.socialSecurityDeclare.individualUnemployment) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人大病险:">
             <el-form-item label="个人大病险:">
-              {{ form.socialSecurityDeclare.individualSeriousIllness }}
+              {{ rowNum(form.socialSecurityDeclare.individualSeriousIllness) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="合计:">
             <el-form-item label="合计:">
-              {{ form.socialSecurityDeclare.amount }}
+              {{ rowNum(form.socialSecurityDeclare.amount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -213,15 +282,31 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="凭证" required>
             <el-form-item label="凭证" required>
-              <el-table ref="dbTable" :data="form.socialSecurityDeclare.evidenceFiles" size="small" border
-                header-row-class-name="list-header-row" row-class-name="list-row">
-                <el-table-column label="文件名" prop="originalFileName" align="center" show-overflow-tooltip>
+              <el-table
+                ref="dbTable"
+                :data="form.socialSecurityDeclare.evidenceFiles"
+                size="small"
+                border
+                header-row-class-name="list-header-row"
+                row-class-name="list-row"
+              >
+                <el-table-column
+                  label="文件名"
+                  prop="originalFileName"
+                  align="center"
+                  show-overflow-tooltip
+                >
                   <template #default="scope">
                   <template #default="scope">
-                    <el-button size="small" type="text" @click="openFile(scope.row)">{{
-                      scope.row.originalFileName == ""
-                      ? "打开文件"
-                      : scope.row.originalFileName
-                    }}</el-button>
+                    <el-button
+                      size="small"
+                      type="text"
+                      @click="openFile(scope.row)"
+                      >{{
+                        scope.row.originalFileName == ""
+                          ? "打开文件"
+                          : scope.row.originalFileName
+                      }}</el-button
+                    >
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <!-- <el-table-column label="文件类型" width="80" prop="fileType" align="center" /> -->
                 <!-- <el-table-column label="文件类型" width="80" prop="fileType" align="center" /> -->
@@ -232,9 +317,16 @@
       </el-form>
       </el-form>
     </div>
     </div>
     <div class="form-btns-container" style="height: 40px">
     <div class="form-btns-container" style="height: 40px">
-      <el-button size="small" style="float: right" icon="close" @click="close">取消</el-button>
+      <el-button size="small" style="float: right" icon="close" @click="close"
+        >取消</el-button
+      >
     </div>
     </div>
-    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
+    <el-image-viewer
+      v-if="showViewer"
+      :url-list="currentFileList"
+      @close="closeImages"
+      :initial-index="showIndex"
+    />
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
     <print-dialog ref="printDialog" :parent="this" /> -->
   </el-dialog>
   </el-dialog>
@@ -245,6 +337,7 @@ import {
   saveDetail,
   saveDetail,
   updateDetail,
   updateDetail,
 } from "@/api/business/crm/serviceWorkOrder";
 } from "@/api/business/crm/serviceWorkOrder";
+import { rowNum, numberToCurrencyNo } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
@@ -255,7 +348,7 @@ const showViewer = ref(false);
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   },
 });
 });
 const selectStatus = ref([
 const selectStatus = ref([
@@ -321,8 +414,8 @@ function reset() {
   form.value = proxy.deepClone(emptyForm);
   form.value = proxy.deepClone(emptyForm);
 }
 }
 
 
-function printSalary() { }
-function exportSalary() { }
+function printSalary() {}
+function exportSalary() {}
 
 
 function handleCurrentChange(row) {
 function handleCurrentChange(row) {
   currentSource.value = row;
   currentSource.value = row;

+ 1 - 0
src/views/business/socialSecurity/confirm/form.vue

@@ -447,6 +447,7 @@ import {
   checkEmployees,
   checkEmployees,
 } from "@/api/business/production/socialSecurityConfirm";
 } from "@/api/business/production/socialSecurityConfirm";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
+
 import { ref } from "vue";
 import { ref } from "vue";
 import { yesOrNo } from "@/utils/default";
 import { yesOrNo } from "@/utils/default";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();

+ 181 - 54
src/views/business/socialSecurity/confirm/view.vue

@@ -1,5 +1,12 @@
 <template>
 <template>
-  <el-dialog title="社保人员信息" v-model="visible" :width="width" append-to-body draggable @close="close">
+  <el-dialog
+    title="社保人员信息"
+    v-model="visible"
+    :width="width"
+    append-to-body
+    draggable
+    @close="close"
+  >
     <!-- 功能按钮 -->
     <!-- 功能按钮 -->
     <div style="padding: 8px 24px 16px 24px">
     <div style="padding: 8px 24px 16px 24px">
       <el-form size="small" label-width="100px" v-model="form">
       <el-form size="small" label-width="100px" v-model="form">
@@ -24,8 +31,11 @@
               <template #label>
               <template #label>
                 <div>政务网账号</div>
                 <div>政务网账号</div>
               </template>
               </template>
-              <el-input v-if="form.isFirstSocialSecurity === 0 || editStatus" v-model="form.governmentAccountNo"
-                placeholder="请输入政务网账号" />
+              <el-input
+                v-if="form.isFirstSocialSecurity === 0 || editStatus"
+                v-model="form.governmentAccountNo"
+                placeholder="请输入政务网账号"
+              />
               <div v-else>{{ form.governmentAccountNo }}</div>
               <div v-else>{{ form.governmentAccountNo }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -34,9 +44,14 @@
               <template #label>
               <template #label>
                 <div>政务网密码</div>
                 <div>政务网密码</div>
               </template>
               </template>
-              <el-input v-if="form.isFirstSocialSecurity === 0 || editStatus" v-model="form.governmentPassword"
-                placeholder="请输入政务网密码" @blur="(value) => passwordCheckHandler(value, 'governmentPassword')
-                  " />
+              <el-input
+                v-if="form.isFirstSocialSecurity === 0 || editStatus"
+                v-model="form.governmentPassword"
+                placeholder="请输入政务网密码"
+                @blur="
+                  (value) => passwordCheckHandler(value, 'governmentPassword')
+                "
+              />
               <div v-else>{{ form.governmentPassword }}</div>
               <div v-else>{{ form.governmentPassword }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -45,8 +60,11 @@
               <template #label>
               <template #label>
                 <div>社保账号</div>
                 <div>社保账号</div>
               </template>
               </template>
-              <el-input v-if="form.isFirstSocialSecurity === 0 || editStatus" v-model="form.socialSecurityAccountNo"
-                placeholder="请输入社保账号" />
+              <el-input
+                v-if="form.isFirstSocialSecurity === 0 || editStatus"
+                v-model="form.socialSecurityAccountNo"
+                placeholder="请输入社保账号"
+              />
               <div v-else>{{ form.socialSecurityAccountNo }}</div>
               <div v-else>{{ form.socialSecurityAccountNo }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -55,10 +73,15 @@
               <template #label>
               <template #label>
                 <div>社保密码</div>
                 <div>社保密码</div>
               </template>
               </template>
-              <el-input v-if="form.isFirstSocialSecurity === 0 || editStatus" v-model="form.socialSecurityPassword"
-                placeholder="请输入社保密码" @blur="(value) =>
+              <el-input
+                v-if="form.isFirstSocialSecurity === 0 || editStatus"
+                v-model="form.socialSecurityPassword"
+                placeholder="请输入社保密码"
+                @blur="
+                  (value) =>
                     passwordCheckHandler(value, 'socialSecurityPassword')
                     passwordCheckHandler(value, 'socialSecurityPassword')
-                  " />
+                "
+              />
               <div v-else>{{ form.socialSecurityPassword }}</div>
               <div v-else>{{ form.socialSecurityPassword }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -67,9 +90,14 @@
               <template #label>
               <template #label>
                 <div>用工密码</div>
                 <div>用工密码</div>
               </template>
               </template>
-              <el-input v-if="form.isFirstSocialSecurity === 0 || editStatus" v-model="form.employeePassword"
-                placeholder="请输入用工密码" @blur="(value) => passwordCheckHandler(value, 'employeePassword')
-                  " />
+              <el-input
+                v-if="form.isFirstSocialSecurity === 0 || editStatus"
+                v-model="form.employeePassword"
+                placeholder="请输入用工密码"
+                @blur="
+                  (value) => passwordCheckHandler(value, 'employeePassword')
+                "
+              />
               <div v-else>{{ form.employeePassword }}</div>
               <div v-else>{{ form.employeePassword }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -79,30 +107,59 @@
               <div class="title">
               <div class="title">
                 <i class="fa fa-th-list" aria-hidden="true" /> 人员信息
                 <i class="fa fa-th-list" aria-hidden="true" /> 人员信息
 
 
-                <el-button size="small" @click="printSalary" icon="printer" type="primary">打印</el-button>
-
-                <el-button size="small" @click="exportSalary" icon="download" type="info">导出</el-button>
+                <el-button
+                  size="small"
+                  @click="printSalary"
+                  icon="printer"
+                  type="primary"
+                  >打印</el-button
+                >
+
+                <el-button
+                  size="small"
+                  @click="exportSalary"
+                  icon="download"
+                  type="info"
+                  >导出</el-button
+                >
               </div>
               </div>
             </div>
             </div>
             <div class="details-body">
             <div class="details-body">
               <div>
               <div>
-                <el-table ref="sourceTable" :data="form.details" size="small" max-height="260px" border
-                  highlight-current-row header-row-class-name="list-header-row" :row-class-name="tableRowClassName"
-                  @selection-change="handleCheckChange" @current-change="handleCurrentChange">
+                <el-table
+                  ref="sourceTable"
+                  :data="form.details"
+                  size="small"
+                  max-height="260px"
+                  border
+                  highlight-current-row
+                  header-row-class-name="list-header-row"
+                  :row-class-name="tableRowClassName"
+                  @selection-change="handleCheckChange"
+                  @current-change="handleCurrentChange"
+                >
                   <!-- <el-table-column type="selection" width="40" align="center" /> -->
                   <!-- <el-table-column type="selection" width="40" align="center" /> -->
-                  <el-table-column type="index" label="序号" width="55" align="center" />
+                  <el-table-column
+                    type="index"
+                    label="序号"
+                    width="55"
+                    align="center"
+                  />
                   <el-table-column label="姓名" width="80" align="center">
                   <el-table-column label="姓名" width="80" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
                         {{ scope.row.employeeName }}
                         {{ scope.row.employeeName }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="电话号" width="130" align="center">
                   <el-table-column label="电话号" width="130" align="center">
@@ -110,71 +167,108 @@
                       <div>
                       <div>
                         {{ scope.row.phone }}
                         {{ scope.row.phone }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="身份证正面" width="120" align="center">
+                  <el-table-column
+                    label="身份证正面"
+                    width="120"
+                    align="center"
+                  >
                     <template #default="scope">
                     <template #default="scope">
-                      <div class="show-image" style="display: flex; justify-content: center">
-                        <img class="img" :src="baseUrl + '/' + scope.row.idCardImage" alt=""
-                          @click="handleImageView(scope.row.idCardImage)" />
+                      <div
+                        class="show-image"
+                        style="display: flex; justify-content: center"
+                      >
+                        <img
+                          class="img"
+                          :src="baseUrl + '/' + scope.row.idCardImage"
+                          alt=""
+                          @click="handleImageView(scope.row.idCardImage)"
+                        />
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
-                  <el-table-column label="身份证反面" width="120" align="center">
+                  <el-table-column
+                    label="身份证反面"
+                    width="120"
+                    align="center"
+                  >
                     <template #default="scope">
                     <template #default="scope">
-                      <div class="show-image" style="display: flex; justify-content: center">
-                        <img class="img" :src="baseUrl + '/' + scope.row.idCardImageBack" alt=""
-                          @click="handleImageView(scope.row.idCardImageBack)" />
+                      <div
+                        class="show-image"
+                        style="display: flex; justify-content: center"
+                      >
+                        <img
+                          class="img"
+                          :src="baseUrl + '/' + scope.row.idCardImageBack"
+                          alt=""
+                          @click="handleImageView(scope.row.idCardImageBack)"
+                        />
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="基数" width="100" align="center">
                   <el-table-column label="基数" width="100" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.cardinalNumber }}
+                        {{ rowNum(scope.row.cardinalNumber) }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <el-table-column label="医疗基数" width="100" align="center">
                   <el-table-column label="医疗基数" width="100" align="center">
                     <template #default="scope">
                     <template #default="scope">
                       <div>
                       <div>
-                        {{ scope.row.medicalCardinalNumber }}
+                        {{ rowNum(scope.row.medicalCardinalNumber) }}
                       </div>
                       </div>
-                      <span style="
+                      <span
+                        style="
                           color: red;
                           color: red;
                           position: absolute;
                           position: absolute;
                           z-index: 10;
                           z-index: 10;
                           top: 4px;
                           top: 4px;
                           right: 6px;
                           right: 6px;
-                        ">*</span>
+                        "
+                        >*</span
+                      >
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                   <!-- <el-table-column label="签名" width="100" header-align="center" required>
                   <!-- <el-table-column label="签名" width="100" header-align="center" required>
@@ -208,8 +302,14 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="审核备注">
             <el-form-item label="审核备注">
-              <el-input v-if="showVerify()" v-model.trim="form.verifyContent" maxlength="200" show-word-limit
-                type="textarea" rows="2" />
+              <el-input
+                v-if="showVerify()"
+                v-model.trim="form.verifyContent"
+                maxlength="200"
+                show-word-limit
+                type="textarea"
+                rows="2"
+              />
               <div v-else>{{ form.verifyContent }}</div>
               <div v-else>{{ form.verifyContent }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -217,16 +317,42 @@
       </el-form>
       </el-form>
     </div>
     </div>
     <div class="form-btns-container" style="height: 40px">
     <div class="form-btns-container" style="height: 40px">
-      <el-button v-if="showVerify()" type="danger" size="small" icon="back" style="float: right; margin-left: 12px"
-        @click="handleVerify(4)">
-        驳回</el-button>
-      <el-button v-if="showVerify()" type="primary" size="small" icon="check" style="float: right; margin-left: 12px"
-        @click="handleVerify(3)">审核通过</el-button>
-      <el-button v-if="verifiable() && form.status === 3" type="warning" size="small" icon="back"
-        style="float: right; margin-left: 12px" @click="returnStatus()">退回</el-button>
+      <el-button
+        v-if="showVerify()"
+        type="danger"
+        size="small"
+        icon="back"
+        style="float: right; margin-left: 12px"
+        @click="handleVerify(4)"
+      >
+        驳回</el-button
+      >
+      <el-button
+        v-if="showVerify()"
+        type="primary"
+        size="small"
+        icon="check"
+        style="float: right; margin-left: 12px"
+        @click="handleVerify(3)"
+        >审核通过</el-button
+      >
+      <el-button
+        v-if="verifiable() && form.status === 3"
+        type="warning"
+        size="small"
+        icon="back"
+        style="float: right; margin-left: 12px"
+        @click="returnStatus()"
+        >退回</el-button
+      >
     </div>
     </div>
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
-    <el-image-viewer v-if="showViewer" :url-list="currentFileList" @close="closeImages" :initial-index="showIndex" />
+    <el-image-viewer
+      v-if="showViewer"
+      :url-list="currentFileList"
+      @close="closeImages"
+      :initial-index="showIndex"
+    />
     <!-- <print-dialog ref="printDialog" /> -->
     <!-- <print-dialog ref="printDialog" /> -->
   </el-dialog>
   </el-dialog>
 </template>
 </template>
@@ -238,6 +364,7 @@ import {
   exportSocialSecurityEmployee,
   exportSocialSecurityEmployee,
   exportSocialSecurityPdf,
   exportSocialSecurityPdf,
 } from "@/api/business/production/socialSecurityConfirm";
 } from "@/api/business/production/socialSecurityConfirm";
+import { rowNum } from "@/utils/index";
 import feedbackDialog from "../feedbackDialog.vue";
 import feedbackDialog from "../feedbackDialog.vue";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
 import { ref } from "vue";
 import { ref } from "vue";
@@ -273,7 +400,7 @@ const confirmChoices = ref([
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   },
 });
 });
 
 

+ 181 - 42
src/views/business/socialSecurity/declare/form.vue

@@ -1,5 +1,12 @@
 <template>
 <template>
-  <el-dialog title="社保申报信息" v-model="visible" :width="width" append-to-body draggable @close="close">
+  <el-dialog
+    title="社保申报信息"
+    v-model="visible"
+    :width="width"
+    append-to-body
+    draggable
+    @close="close"
+  >
     <!-- <div slot="title" class="dialog-title-container">
     <!-- <div slot="title" class="dialog-title-container">
       <span class="title-label"><i class="el-icon-document" /> 工资信息</span>
       <span class="title-label"><i class="el-icon-document" /> 工资信息</span>
       <i class="el-icon-close" @click="close" />
       <i class="el-icon-close" @click="close" />
@@ -68,68 +75,145 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位养老金:">
             <el-form-item label="单位养老金:">
-              <el-input-number v-model="form.unitPension" size="small" placeholder="单位养老金" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.unitPension"
+                size="small"
+                placeholder="单位养老金"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位医疗险:">
             <el-form-item label="单位医疗险:">
-              <el-input-number v-model="form.unitMedical" size="small" placeholder="单位医疗险" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.unitMedical"
+                size="small"
+                placeholder="单位医疗险"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位工伤险:">
             <el-form-item label="单位工伤险:">
-              <el-input-number v-model="form.unitInjury" size="small" placeholder="单位工伤险" :precision="2" :controls="false"
-                style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.unitInjury"
+                size="small"
+                placeholder="单位工伤险"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位失业金:">
             <el-form-item label="单位失业金:">
-              <el-input-number v-model="form.unitUnemployment" size="small" placeholder="单位失业金" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.unitUnemployment"
+                size="small"
+                placeholder="单位失业金"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位生育险:">
             <el-form-item label="单位生育险:">
-              <el-input-number v-model="form.unitProcreate" size="small" placeholder="单位生育险" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.unitProcreate"
+                size="small"
+                placeholder="单位生育险"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位大病险:">
             <el-form-item label="单位大病险:">
-              <el-input-number v-model="form.unitSeriousIllness" size="small" placeholder="单位大病险" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.unitSeriousIllness"
+                size="small"
+                placeholder="单位大病险"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位采暖费:">
             <el-form-item label="单位采暖费:">
-              <el-input-number v-model="form.unitHeatingFee" size="small" placeholder="单位大病险" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.unitHeatingFee"
+                size="small"
+                placeholder="单位大病险"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人养老金:">
             <el-form-item label="个人养老金:">
-              <el-input-number v-model="form.individualPension" size="small" placeholder="个人养老金" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.individualPension"
+                size="small"
+                placeholder="个人养老金"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人医疗险:">
             <el-form-item label="个人医疗险:">
-              <el-input-number v-model="form.individualMedical" size="small" placeholder="个人医疗险" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.individualMedical"
+                size="small"
+                placeholder="个人医疗险"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人失业金:">
             <el-form-item label="个人失业金:">
-              <el-input-number v-model="form.individualUnemployment" size="small" placeholder="个人失业金" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.individualUnemployment"
+                size="small"
+                placeholder="个人失业金"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人大病险:">
             <el-form-item label="个人大病险:">
-              <el-input-number v-model="form.individualSeriousIllness" size="small" placeholder="个人大病险" :precision="2"
-                :controls="false" style="width: 100%" @change="amountChangeHandler" />
+              <el-input-number
+                v-model="form.individualSeriousIllness"
+                size="small"
+                placeholder="个人大病险"
+                :precision="2"
+                :controls="false"
+                style="width: 100%"
+                @change="amountChangeHandler"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
@@ -142,7 +226,7 @@
                 :controls="false"
                 :controls="false"
                 style="width: 100%"
                 style="width: 100%"
               /> -->
               /> -->
-              {{ form.amount }}
+              {{ rowNum(form.amount) }}
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -150,23 +234,53 @@
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="备注">
             <el-form-item label="备注">
-              <el-input v-model.trim="form.content" maxlength="200" show-word-limit type="textarea" rows="2" />
+              <el-input
+                v-model.trim="form.content"
+                maxlength="200"
+                show-word-limit
+                type="textarea"
+                rows="2"
+              />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="凭证" required>
             <el-form-item label="凭证" required>
-              <el-upload action="#" :http-request="upload" :with-credentials="true" :show-file-list="false" multiple>
-                <el-button size="small" type="primary" icon="Upload">点击上传</el-button>
+              <el-upload
+                action="#"
+                :http-request="upload"
+                :with-credentials="true"
+                :show-file-list="false"
+                multiple
+              >
+                <el-button size="small" type="primary" icon="Upload"
+                  >点击上传</el-button
+                >
               </el-upload>
               </el-upload>
-              <el-table ref="dbTable" :data="form.evidenceFiles" size="small" border
-                header-row-class-name="list-header-row" row-class-name="list-row">
-                <el-table-column label="文件名" prop="originalFileName" align="center" show-overflow-tooltip>
+              <el-table
+                ref="dbTable"
+                :data="form.evidenceFiles"
+                size="small"
+                border
+                header-row-class-name="list-header-row"
+                row-class-name="list-row"
+              >
+                <el-table-column
+                  label="文件名"
+                  prop="originalFileName"
+                  align="center"
+                  show-overflow-tooltip
+                >
                   <template #default="scope">
                   <template #default="scope">
-                    <el-button size="small" type="text" @click="openFile(scope.row)">{{
-                      scope.row.originalFileName == ""
-                      ? "打开文件"
-                      : scope.row.originalFileName
-                    }}</el-button>
+                    <el-button
+                      size="small"
+                      type="text"
+                      @click="openFile(scope.row)"
+                      >{{
+                        scope.row.originalFileName == ""
+                          ? "打开文件"
+                          : scope.row.originalFileName
+                      }}</el-button
+                    >
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <!-- <el-table-column
                 <!-- <el-table-column
@@ -175,9 +289,20 @@
                   prop="fileType"
                   prop="fileType"
                   align="center"
                   align="center"
                 /> -->
                 /> -->
-                <el-table-column label="操作" width="80" prop="fileType" align="center">
+                <el-table-column
+                  label="操作"
+                  width="80"
+                  prop="fileType"
+                  align="center"
+                >
                   <template #default="scope">
                   <template #default="scope">
-                    <el-button size="small" link type="danger" @click="handleDel(scope.row, scope.$index)">删除</el-button>
+                    <el-button
+                      size="small"
+                      link
+                      type="danger"
+                      @click="handleDel(scope.row, scope.$index)"
+                      >删除</el-button
+                    >
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
               </el-table>
               </el-table>
@@ -187,10 +312,23 @@
       </el-form>
       </el-form>
     </div>
     </div>
     <div class="form-btns-container" style="height: 40px">
     <div class="form-btns-container" style="height: 40px">
-      <el-button size="small" icon="close" style="float: right; margin-left: 12px; margin-right: 12px" @click="close">
-        取消</el-button>
-      <el-button type="primary" size="small" icon="Finished" style="float: right" @click="handleSave">
-        保存</el-button>
+      <el-button
+        size="small"
+        icon="close"
+        style="float: right; margin-left: 12px; margin-right: 12px"
+        @click="close"
+      >
+        取消</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        icon="Finished"
+        style="float: right"
+        @click="handleSave"
+      >
+        保存</el-button
+      >
     </div>
     </div>
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <!-- <feedback-dialog ref="feedbackDialogView" :parent="this" />
     <print-dialog ref="printDialog" :parent="this" /> -->
     <print-dialog ref="printDialog" :parent="this" /> -->
@@ -202,6 +340,7 @@ import {
   saveDetail,
   saveDetail,
 } from "@/api/business/production/socialSecurityDeclare";
 } from "@/api/business/production/socialSecurityDeclare";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
+import { rowNum } from "@/utils/index";
 import { ref } from "vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
@@ -214,7 +353,7 @@ const baseUrl = ref(import.meta.env.VITE_APP_BASE_API);
 const props = defineProps({
 const props = defineProps({
   getList: {
   getList: {
     type: Function,
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   },
 });
 });
 
 

+ 13 - 12
src/views/business/socialSecurity/declare/view.vue

@@ -70,63 +70,63 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位养老金:">
             <el-form-item label="单位养老金:">
-              <div>{{ form.unitPension }}</div>
+              <div>{{ rowNum(form.unitPension) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位医疗险:">
             <el-form-item label="单位医疗险:">
-              <div>{{ form.unitMedical }}</div>
+              <div>{{ rowNum(form.unitMedical) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位工伤险:">
             <el-form-item label="单位工伤险:">
-              <div>{{ form.unitInjury }}</div>
+              <div>{{ rowNum(form.unitInjury) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位失业金:">
             <el-form-item label="单位失业金:">
               <!-- <el-input-number v-model="form.unitUnemployment" size="small" placeholder="单位失业金" :precision="2" :controls="false" style="width: 100%;" /> -->
               <!-- <el-input-number v-model="form.unitUnemployment" size="small" placeholder="单位失业金" :precision="2" :controls="false" style="width: 100%;" /> -->
-              <div>{{ form.unitUnemployment }}</div>
+              <div>{{ rowNum(form.unitUnemployment) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位生育险:">
             <el-form-item label="单位生育险:">
-              <div>{{ form.unitProcreate }}</div>
+              <div>{{ rowNum(form.unitProcreate) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位大病险:">
             <el-form-item label="单位大病险:">
-              <div>{{ form.unitSeriousIllness }}</div>
+              <div>{{ rowNum(form.unitSeriousIllness) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="单位采暖费:">
             <el-form-item label="单位采暖费:">
-              <div>{{ form.unitHeatingFee }}</div>
+              <div>{{ rowNum(form.unitHeatingFee) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人养老金:">
             <el-form-item label="个人养老金:">
-              <div>{{ form.individualPension }}</div>
+              <div>{{ rowNum(form.individualPension) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人医疗险:">
             <el-form-item label="个人医疗险:">
-              <div>{{ form.individualMedical }}</div>
+              <div>{{ rowNum(form.individualMedical) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人失业金:">
             <el-form-item label="个人失业金:">
-              <div>{{ form.individualUnemployment }}</div>
+              <div>{{ rowNum(form.individualUnemployment) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="个人大病险:">
             <el-form-item label="个人大病险:">
-              <div>{{ form.individualSeriousIllness }}</div>
+              <div>{{ rowNum(form.individualSeriousIllness) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="合计:">
             <el-form-item label="合计:">
-              <div>{{ form.amount }}</div>
+              <div>{{ rowNum(form.amount) }}</div>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="24">
           <el-col :span="24">
@@ -188,6 +188,7 @@ import {
 } from "@/api/business/production/socialSecurityDeclare";
 } from "@/api/business/production/socialSecurityDeclare";
 import { uploadFile } from "@/api/tool/file";
 import { uploadFile } from "@/api/tool/file";
 import { ref } from "vue";
 import { ref } from "vue";
+import { rowNum } from "@/utils/index";
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const visible = ref(false);
 const visible = ref(false);
 const width = ref(800);
 const width = ref(800);

+ 3 - 2
src/views/business/socialSecurity/memberDialog.vue

@@ -109,7 +109,7 @@
         <el-table-column label="基数" width="100" align="center">
         <el-table-column label="基数" width="100" align="center">
           <template #default="scope">
           <template #default="scope">
             <div>
             <div>
-              {{ scope.row.cardinalNumber }}
+              {{ rowNum(scope.row.cardinalNumber) }}
             </div>
             </div>
             <span
             <span
               style="
               style="
@@ -126,7 +126,7 @@
         <el-table-column label="医疗基数" width="100" align="center">
         <el-table-column label="医疗基数" width="100" align="center">
           <template #default="scope">
           <template #default="scope">
             <div>
             <div>
-              {{ scope.row.medicalCardinalNumber }}
+              {{ rowNum(scope.row.medicalCardinalNumber) }}
             </div>
             </div>
             <span
             <span
               style="
               style="
@@ -162,6 +162,7 @@
 <script setup>
 <script setup>
 import { toRef } from "vue";
 import { toRef } from "vue";
 import { getMembers } from "@/api/business/production/socialSecurityDeclare";
 import { getMembers } from "@/api/business/production/socialSecurityDeclare";
+import { rowNum } from "@/utils/index";
 const props = defineProps({
 const props = defineProps({
   width: {
   width: {
     type: String,
     type: String,