ly il y a 1 an
Parent
commit
47242c5bb1

+ 44 - 25
src/views/business/crm/order/form.vue

@@ -894,31 +894,48 @@
   const webHost = import.meta.env.VITE_APP_BASE_API;
   const data = reactive({
     form: {},
-    rules: {
-      contractNo: [
-        { required: true, message: "合同编号不能为空", trigger: "blur" },
-      ],
-      companyId: [{ required: true, message: "请选择有效客户", trigger: "blur" }],
-      formDate: [
-        { required: true, message: "签约日期不能为空", trigger: "blur" },
-      ],
-      amount: [{ required: true, message: "签约金额不能为空", trigger: "blur" }],
-      // signerName: [
-      //   { required: true, message: "签单人不能为空", trigger: "change" },
-      // ],
-      contractType: [
-        { required: true, message: "合同类型不能为空", trigger: "change" },
-      ],
-      serviceType: [
-        { required: true, message: "任务类型不能为空", trigger: "change" },
-      ],
-      // sourceCategoryName: [
-      //   { validator: sourceValidator, trigger: "change" },
-      //   { required: true, message: "客户来源不能为空", trigger: "change" },
-      // ],
-    },
+    // rules: {
+    //   contractNo: [
+    //     { required: true, message: "合同编号不能为空", trigger: "blur" },
+    //   ],
+    //   companyId: [{ required: true, message: "请选择有效客户", trigger: "blur" }],
+    //   formDate: [
+    //      { required: editStatus.value ? false : true, message: "签约日期不能为空", trigger: "blur" },
+    //   ],
+    //   amount: [{ required: true, message: "签约金额不能为空", trigger: "blur" }],
+    //   // signerName: [
+    //   //   { required: true, message: "签单人不能为空", trigger: "change" },
+    //   // ],
+    //   contractType: [
+    //     { required: true, message: "合同类型不能为空", trigger: "change" },
+    //   ],
+    //   serviceType: [
+    //     { required: true, message: "任务类型不能为空", trigger: "change" },
+    //   ],
+    // },
   });
-  const { form, rules } = toRefs(data);
+
+  const rules = computed(() => ({
+    contractNo: [
+      { required: true, message: "合同编号不能为空", trigger: "blur" },
+    ],
+    companyId: [
+      { required: type.value == "alterOrder" ? false : true, message: "请选择有效客户", trigger: "blur" },
+    ],
+    formDate: [
+      { required: type.value == "alterOrder" ? false : true, message: "签约日期不能为空", trigger: "blur" },
+    ],
+    amount: [
+      { required: true, message: "签约金额不能为空", trigger: "blur" },
+    ],
+    contractType: [
+      { required: true, message: "合同类型不能为空", trigger: "change" },
+    ],
+    serviceType: [
+      { required: true, message: "任务类型不能为空", trigger: "change" },
+    ],
+  }));
+  const { form, } = toRefs(data);
   /***********************  方法区  ****************************/
   /** 打开抽屉 */
   function open(id) {
@@ -1006,7 +1023,9 @@
       title.value = "添加订单信息";
     }
   }
-
+  watch(editStatus, (newValue) => {
+    console.log('editStatus changed:', newValue);
+  });
   /** 取消按钮 */
   function cancel() {
     visible.value = false;

+ 16 - 6
src/views/business/financial/collection/form.vue

@@ -10,8 +10,8 @@
             付款信息</span>
 
           <el-button v-if="editStatus" type="primary" size="small" icon="Finished" @click="submitForm">保存</el-button>
-          <el-button v-show="form.status == 1 " type="warning" size="small" icon="Finished"
-            @click="returnZero"  v-hasPermi="['business:collection:return']">退回</el-button> 
+          <el-button v-show="form.status == 1 " type="warning" size="small" icon="Finished" @click="returnZero"
+            v-hasPermi="['business:collection:return']">退回</el-button>
           <el-button v-show="!editStatus && form.verifyDate == null " type="warning" size="small" icon="Edit"
             v-hasPermi="['business:collection:edit']" @click="editStatus = true">修改</el-button>
           <el-button v-if="form.id && editStatus" type="info" size="small" icon="Close"
@@ -179,11 +179,12 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="是否为项目:" prop="isProject">
-                <el-radio-group v-model="form.isProject"  v-if="editStatus">
+                <el-radio-group v-model="form.isProject" v-if="editStatus">
                   <el-radio :label="0">项目</el-radio>
                   <el-radio :label="1">非项目</el-radio>
                 </el-radio-group>
-               <span v-else>{{ form.isProject !== undefined && form.isProject !== null ? (form.isProject === 0 ? '项目' : '非项目') : '' }}</span> 
+                <span v-else>{{ form.isProject !== undefined && form.isProject !== null ? (form.isProject === 0 ? '项目' :
+                  '非项目') : '' }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -247,6 +248,11 @@
                       <span>{{ rowNum(scope.row.amount) }}</span>
                     </template>
                   </el-table-column>
+                  <el-table-column label="已收款金额" prop="arrived" width="150" align="right" header-align="center">
+                    <template #default="scope">
+                      <span>{{ rowNum(scope.row.arrived) }}</span>
+                    </template>
+                  </el-table-column>
                   <el-table-column label="本次收款金额" prop="arriveAmount" width="150" header-align="center" align="right">
                     <template #default="scope">
                       <template v-if="editStatus">
@@ -265,11 +271,15 @@
                         }}</template>
                     </template>
                   </el-table-column>
-                  <el-table-column label="已收款金额" prop="arrived" width="150" align="right" header-align="center">
+                  <el-table-column label="待收款金额" width="150" align="center">
                     <template #default="scope">
-                      <span>{{ rowNum(scope.row.arrived) }}</span>
+                      {{
+                      rowNum((Number(scope.row.amount) || 0) - (Number(scope.row.arrived) || 0))
+                      }}
+
                     </template>
                   </el-table-column>
+
                   <el-table-column label="备注" prop="remark" width="250" align="center">
                     <template #default="scope">
                       <template v-if="editStatus">

+ 23 - 14
src/views/business/financial/contract/form.vue

@@ -121,12 +121,12 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="客户名称:" prop="companyName">
-                <el-link :underline="false" type="primary" @click="handleInfo(form)" >{{ form.companyName }}</el-link>
+                <el-link :underline="false" type="primary" @click="handleInfo(form)">{{ form.companyName }}</el-link>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="合同编号:" prop="remark">
-                <el-link  :underline="false" type="primary" @click="handleContract(form)" >{{ form.contractNo }}</el-link>
+                <el-link :underline="false" type="primary" @click="handleContract(form)">{{ form.contractNo }}</el-link>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -208,15 +208,20 @@
                   </el-table-column>
                   <el-table-column label="说明" prop="explain" align="center" show-overflow-tooltip>
                   </el-table-column>
-                  <el-table-column label="务金额" prop="amount" width="150" align="center">
+                  <el-table-column label="务金额" prop="amount" width="150" align="center">
                     <template #default="scope">
                       <span>{{ rowNum(scope.row.amount) }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="本次付款金额" prop="arriveAmount" width="150" align="center">
+                  <el-table-column label="已收款金额" prop="arrived" width="150" align="center">
+                    <template #default="scope">
+                      <span>{{ rowNum(scope.row.arrived) }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="本次收款金额" prop="arriveAmount" width="150" align="center">
                     <template #default="scope">
                       <template v-if="editStatus">
-                        <el-input-number v-model="scope.row.arriveAmount" size="small" :min="0.0" placeholder="本次付款金额"
+                        <el-input-number v-model="scope.row.arriveAmount" size="small" :min="0.0" placeholder="本次款金额"
                           :precision="2" :controls="false" style="width: 100%" @change="
                             (arg) =>
                               amountChangeHandler(
@@ -229,11 +234,15 @@
                       <template v-else>{{ scope.row.arriveAmount }}</template>
                     </template>
                   </el-table-column>
-                  <el-table-column label="已付款金额" prop="arrived" width="150" align="center">
+                  <el-table-column label="待收款金额"  width="150" align="center">
                     <template #default="scope">
-                      <span>{{ rowNum(scope.row.arrived) }}</span>
+                      {{
+                        rowNum((Number(scope.row.amount) || 0) - (Number(scope.row.arrived) || 0))
+                      }}
+                      
                     </template>
                   </el-table-column>
+
                   <el-table-column label="备注" prop="remark" width="250" align="center">
                     <template #default="scope">
                       <template v-if="editStatus">
@@ -283,7 +292,7 @@
         </div>
       </div>
     </el-drawer>
-    <el-dialog title="驳回详情" v-model="rejectOpen" width="500px" append-to-body draggable :close-on-click-modal = "false">
+    <el-dialog title="驳回详情" v-model="rejectOpen" width="500px" append-to-body draggable :close-on-click-modal="false">
       <el-form ref="dictRef" :model="form" label-width="100">
         <el-form-item label="驳回原因" :prop="verifyRemark">
           <el-input v-model.trim="form.verifyRemark" type="textarea" :rows="3" placeholder="请输入驳回原因" />
@@ -460,10 +469,10 @@
       }
       for (let i = 0; i < form.value.details.length; i++) {
         let item = form.value.details[i];
-         if (item.arriveAmount != null && item.amount < item.arriveAmount) {
-        proxy.$modal.msgError("当前的" + item.taskTypeName + "收款申请总金额超过当前服务金额,不可提交,请联系财务人员。");
-        return false;
-      }
+        if (item.arriveAmount != null && item.amount < item.arriveAmount) {
+          proxy.$modal.msgError("当前的" + item.taskTypeName + "收款申请总金额超过当前服务金额,不可提交,请联系财务人员。");
+          return false;
+        }
       }
     } else {
       const countAmount = res.data.map((item) => item.arriveAmount).reduce((total, number) => {
@@ -556,8 +565,8 @@
       proxy.$modal.msgError("请填写驳回原因");
       return;
     }
-  } 
-  function handleContract(){
+  }
+  function handleContract() {
     proxy.$refs.contractRef.open(form.value.contractId);
   }
 

+ 12 - 6
src/views/business/financial/payment/form.vue

@@ -195,7 +195,6 @@
                   </el-table-column>
                   <el-table-column label="说明" prop="explain" align="center" show-overflow-tooltip>
                   </el-table-column>
-
                   <el-table-column label="任务金额" prop="amount" width="100" align="center">
                     <template #default="scope">
                       <span>{{ rowNum(scope.row.amount) }}</span>
@@ -206,6 +205,17 @@
                       <span>{{ rowNum(scope.row.reallyAmount) }}</span>
                     </template>
                   </el-table-column>
+                  <el-table-column label="已支付金额" prop="payment" width="100" align="center">
+                    <template #default="scope">
+                      <span>{{ rowNum(scope.row.payment) }}</span>
+                    </template>
+                  </el-table-column>
+                  
+                  <el-table-column label="可支出金额" align="center" >
+                    <template #default="scope">
+                      {{rowNum((Number(scope.row.reallyAmount) || 0) - (Number(scope.row.payment) || 0))}}
+                    </template>
+                  </el-table-column>
                   <el-table-column label="本次支出金额" prop="paymentAmount" width="100" align="center">
                     <template #default="scope">
                       <template v-if="editStatus">
@@ -224,11 +234,7 @@
                         }}</template>
                     </template>
                   </el-table-column>
-                  <el-table-column label="已支付金额" prop="payment" width="100" align="center">
-                    <template #default="scope">
-                      <span>{{ rowNum(scope.row.payment) }}</span>
-                    </template>
-                  </el-table-column>
+   
                 </el-table>
               </div>
             </el-col>

+ 10 - 0
src/views/business/production/salary/form.vue

@@ -108,6 +108,11 @@
                         </div>
                       </template>
                     </el-table-column>
+                    <el-table-column label="社保申报" prop="socialSecurityStatus" align="center">
+                      <template #default="scope">
+                        {{ scope.row.socialSecurityStatus == 1 ? '已申报' : '未申报' }}
+                      </template>
+                    </el-table-column>
                     <el-table-column label="社保" align="center">
                       <el-table-column label="养老保险" width="85" header-align="center" align="right"
                         prop="endowmentInsurance">
@@ -146,6 +151,11 @@
                         </template>
                       </el-table-column>
                     </el-table-column>
+                    <el-table-column label="公积金申报" prop="housingFundStatus" align="center">
+                      <template #default="scope">
+                        {{ scope.row.housingFundStatus == 1 ? '已申报' : '未申报' }}
+                      </template>
+                    </el-table-column>
                     <el-table-column label="公积金" width="85" header-align="center" align="right" prop="housingFund">
                       <template #default="scope">
                         <div>

+ 10 - 0
src/views/business/production/salary/view.vue

@@ -85,6 +85,11 @@
                         </div>
                       </template>
                     </el-table-column>
+                    <el-table-column label="社保申报" prop="socialSecurityStatus" align="center">
+                      <template #default="scope">
+                        {{ scope.row.socialSecurityStatus == 1 ? '已申报' : '未申报' }}
+                      </template>
+                    </el-table-column>
                     <el-table-column label="社保" align="center">
                       <el-table-column label="养老保险" width="70" header-align="center" align="right"
                         prop="endowmentInsurance">
@@ -119,6 +124,11 @@
                         </template>
                       </el-table-column>
                     </el-table-column>
+                    <el-table-column label="公积金申报" prop="housingFundStatus" align="center">
+                      <template #default="scope">
+                        {{ scope.row.housingFundStatus == 1 ? '已申报' : '未申报' }}
+                      </template>
+                    </el-table-column>
                     <el-table-column label="公积金" width="80" header-align="center" align="right" prop="housingFund">
                       <template #default="scope">
                         <div>

+ 10 - 0
src/views/business/production/salaryZero/form.vue

@@ -201,6 +201,11 @@
                       </div>
                     </template>
                   </el-table-column>
+                  <el-table-column label="社保申报" prop="socialSecurityStatus" align="center">
+                    <template #default="scope">
+                      {{ scope.row.socialSecurityStatus == 1 ? '已申报' : '未申报' }}
+                    </template>
+                  </el-table-column>
                   <el-table-column label="社保" align="center">
                     <el-table-column
                       label="养老保险"
@@ -287,6 +292,11 @@
                       </template>
                     </el-table-column>
                   </el-table-column>
+                  <el-table-column label="公积金申报" prop="housingFundStatus" align="center">
+                    <template #default="scope">
+                      {{ scope.row.housingFundStatus == 1 ? '已申报' : '未申报' }}
+                    </template>
+                  </el-table-column>
                   <el-table-column
                     label="公积金"
                     width="85"

+ 323 - 484
src/views/business/production/salaryZero/view.vue

@@ -1,13 +1,6 @@
 <template>
-  <el-dialog
-    title="工资信息"
-    v-model="visible"
-    :width="width"
-    append-to-body
-    draggable
-    @close="close"
-    :close-on-click-modal = "false"
-  >
+  <el-dialog title="工资信息" v-model="visible" :width="width" append-to-body draggable @close="close"
+    :close-on-click-modal="false">
     <!-- 功能按钮 -->
     <div style="padding: 8px 24px 16px 24px">
       <el-form size="small" label-width="100px" v-model="form">
@@ -27,59 +20,28 @@
               <div class="title">
                 <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 class="details-body">
               <div>
-                <el-table
-                  ref="sourceTable"
-                  :data="form.details"
-                  size="small"
-                  max-height="260px"
-                  border
-                  show-summary
-                  :summary-method="getSummaries"
-                  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="index"
-                    label="序号"
-                    width="50"
-                    align="center"
-                  />
+                <el-table ref="sourceTable" :data="form.details" size="small" max-height="260px" border show-summary
+                  :summary-method="getSummaries" 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="index" label="序号" width="50" align="center" />
                   <el-table-column label="员工姓名" width="80" align="center">
                     <template #default="scope">
                       <div>
                         {{ scope.row.employeeName }}
                       </div>
-                      <span
-                        style="
+                      <span style="
                           color: red;
                           position: absolute;
                           z-index: 10;
                           top: 4px;
                           right: 6px;
-                        "
-                        >*</span
-                      >
+                        ">*</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="身份证号" width="150" align="center">
@@ -87,104 +49,68 @@
                       <div>
                         {{ scope.row.idCode }}
                       </div>
-                      <span
-                        style="
+                      <span style="
                           color: red;
                           position: absolute;
                           z-index: 10;
                           top: 4px;
                           right: 6px;
-                        "
-                        >*</span
-                      >
+                        ">*</span>
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    label="应发工资"
-                    width="100"
-                    header-align="center"
-                    align="right"
-                    prop="planSalary"
-                  >
+                  <el-table-column label="应发工资" width="100" header-align="center" align="right" prop="planSalary">
                     <template #default="scope">
                       <div>
                         {{ rowNum(scope.row.planSalary) }}
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    label="实发工资"
-                    width="100"
-                    header-align="center"
-                    align="right"
-                    prop="actuallySalary"
-                  >
+                  <el-table-column label="实发工资" width="100" header-align="center" align="right" prop="actuallySalary">
                     <template #default="scope">
                       <div>
                         {{ rowNum(scope.row.actuallySalary) }}
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    label="奖金及其他"
-                    width="100"
-                    header-align="center"
-                    align="right"
-                    prop="bonusAmount"
-                  >
+                  <el-table-column label="奖金及其他" width="100" header-align="center" align="right" prop="bonusAmount">
                     <template #default="scope">
                       <div>
                         {{ rowNum(scope.row.bonusAmount) }}
                       </div>
                     </template>
                   </el-table-column>
+                  <el-table-column label="社保申报" prop="socialSecurityStatus" align="center">
+                    <template #default="scope">
+                      {{ scope.row.socialSecurityStatus == 1 ? '已申报' : '未申报' }}
+                    </template>
+                  </el-table-column>
                   <el-table-column label="社保" align="center">
-                    <el-table-column
-                      label="养老保险"
-                      width="85"
-                      header-align="center"
-                      align="right"
-                      prop="endowmentInsurance"
-                    >
+                    <el-table-column label="养老保险" width="85" header-align="center" align="right"
+                      prop="endowmentInsurance">
                       <template #default="scope">
                         <div>
                           {{ rowNum(scope.row.endowmentInsurance) }}
                         </div>
                       </template>
                     </el-table-column>
-                    <el-table-column
-                      label="医疗保险"
-                      width="85"
-                      header-align="center"
-                      align="right"
-                      prop="medicalInsurance"
-                    >
+                    <el-table-column label="医疗保险" width="85" header-align="center" align="right"
+                      prop="medicalInsurance">
                       <template #default="scope">
                         <div>
                           {{ rowNum(scope.row.medicalInsurance) }}
                         </div>
                       </template>
                     </el-table-column>
-                    <el-table-column
-                      label="失业险"
-                      width="85"
-                      header-align="center"
-                      align="right"
-                      prop="unemploymentBenefit"
-                    >
+                    <el-table-column label="失业险" width="85" header-align="center" align="right"
+                      prop="unemploymentBenefit">
                       <template #default="scope">
                         <div>
                           {{ rowNum(scope.row.unemploymentBenefit) }}
                         </div>
                       </template>
                     </el-table-column>
-                    <el-table-column
-                      label="大病险"
-                      width="85"
-                      header-align="center"
-                      align="right"
-                      prop="seriousIllnessInsurance"
-                    >
+                    <el-table-column label="大病险" width="85" header-align="center" align="right"
+                      prop="seriousIllnessInsurance">
                       <template #default="scope">
                         <div>
                           {{ rowNum(scope.row.seriousIllnessInsurance) }}
@@ -192,59 +118,42 @@
                       </template>
                     </el-table-column>
                   </el-table-column>
-                  <el-table-column
-                    label="公积金"
-                    width="85"
-                    header-align="center"
-                    align="right"
-                    prop="housingFund"
-                  >
+                  <el-table-column label="公积金申报" prop="housingFundStatus" align="center">
+                    <template #default="scope">
+                      {{ scope.row.housingFundStatus == 1 ? '已申报' : '未申报' }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="公积金" width="85" header-align="center" align="right" prop="housingFund">
                     <template #default="scope">
                       <div>
                         {{ rowNum(scope.row.housingFund) }}
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    label="个税"
-                    header-align="center"
-                    align="right"
-                    :prop="
+                  <el-table-column label="个税" header-align="center" align="right" :prop="
                       form.status === 3 && form.hasIndividualIncomeTax
                         ? 'individualIncomeTaxConfirm'
                         : 'currentIndividualIncomeTax'
-                    "
-                  >
+                    ">
                     <template #default="scope">
                       <div>
                         {{
-                          rowNum(
-                            form.status === 3 && form.hasIndividualIncomeTax
-                              ? scope.row.individualIncomeTaxConfirm
-                              : scope.row.currentIndividualIncomeTax
-                          )
+                        rowNum(
+                        form.status === 3 && form.hasIndividualIncomeTax
+                        ? scope.row.individualIncomeTaxConfirm
+                        : scope.row.currentIndividualIncomeTax
+                        )
                         }}
                       </div>
-                    </template></el-table-column
-                  >
-                  <el-table-column
-                    label="其他扣款"
-                    width="85"
-                    header-align="center"
-                    align="right"
-                    prop="otherCut"
-                  >
+                    </template></el-table-column>
+                  <el-table-column label="其他扣款" width="85" header-align="center" align="right" prop="otherCut">
                     <template #default="scope">
                       <div>
                         {{ rowNum(scope.row.otherCut) }}
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    label="备注"
-                    width="100"
-                    header-align="center"
-                  >
+                  <el-table-column label="备注" width="100" header-align="center">
                     <template #default="scope">
                       <div>
                         {{ scope.row.remark }}
@@ -275,27 +184,13 @@
           </el-col>
           <el-col v-if="showVerify()" :span="24">
             <el-form-item label="是否有个税">
-              <el-select
-                v-model.trim="form.hasIndividualIncomeTax"
-                placeholder="请选择"
-                size="small"
-                style="width: 100%"
-                @change="changeIndividual"
-              >
-                <el-option
-                  v-for="item in confirmChoices"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model.trim="form.hasIndividualIncomeTax" placeholder="请选择" size="small" style="width: 100%"
+                @change="changeIndividual">
+                <el-option v-for="item in confirmChoices" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col
-            v-if="showVerify() && form.hasIndividualIncomeTax === 1"
-            :span="24"
-            class="details-container"
-          >
+          <el-col v-if="showVerify() && form.hasIndividualIncomeTax === 1" :span="24" class="details-container">
             <div class="details-head">
               <div class="title">
                 <i class="fa fa-th-list" aria-hidden="true" /> 人员信息
@@ -303,58 +198,29 @@
             </div>
             <div class="details-body">
               <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-column
-                    type="index"
-                    label="序号"
-                    width="50"
-                    align="center"
-                  />
+                <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="index" label="序号" width="50" align="center" />
                   <el-table-column label="员工姓名" width="120" align="center">
                     <template #default="scope">
                       <div>
                         {{ scope.row.employeeName }}
                       </div>
-                      <span
-                        style="
+                      <span style="
                           color: red;
                           position: absolute;
                           z-index: 10;
                           top: 4px;
                           right: 6px;
-                        "
-                        >*</span
-                      >
+                        ">*</span>
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    label="实际个税"
-                    align="center"
-                    width="120"
-                    prop="individualIncomeTaxConfirm"
-                  >
+                  <el-table-column label="实际个税" align="center" width="120" prop="individualIncomeTaxConfirm">
                     <template #default="scope">
                       <div>
-                        <el-input-number
-                          v-model="scope.row.individualIncomeTaxConfirm"
-                          size="small"
-                          placeholder="个税"
-                          :precision="2"
-                          :controls="false"
-                          style="width: 100%"
-                          @change="rowChangeSum(scope.row)"
-                        />
+                        <el-input-number v-model="scope.row.individualIncomeTaxConfirm" size="small" placeholder="个税"
+                          :precision="2" :controls="false" style="width: 100%" @change="rowChangeSum(scope.row)" />
                       </div>
                     </template>
                   </el-table-column>
@@ -365,14 +231,8 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="审核备注">
-              <el-input
-                v-if="form.status === 2"
-                maxlength="200"
-                show-word-limit
-                v-model.trim="form.verifyContent"
-                type="textarea"
-                rows="2"
-              />
+              <el-input v-if="form.status === 2" maxlength="200" show-word-limit v-model.trim="form.verifyContent"
+                type="textarea" rows="2" />
               <span v-else>{{ form.verifyContent }}</span>
             </el-form-item>
           </el-col>
@@ -380,328 +240,247 @@
       </el-form>
     </div>
     <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"
-        style="float: right; margin-left: 12px"
-        icon="check"
-        @click="handleVerify(3)"
-      >
-        审核通过</el-button
-      >
-      <el-button
-        v-if="blackButton() && 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" style="float: right; margin-left: 12px" icon="check"
+        @click="handleVerify(3)">
+        审核通过</el-button>
+      <el-button v-if="blackButton() && form.status === 3" type="warning" size="small" icon="back"
+        style="float: right; margin-left: 12px" @click="returnStatus()">
+        退回</el-button>
     </div>
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
     <!-- <print-dialog ref="printDialog" /> -->
   </el-dialog>
 </template>
 <script setup>
-import {
-  getDetail,
-  verifyDetail,
-  turnBackDetail,
-  exportSalaryEmployee,
-  exportSalaryPdf,
-} from "@/api/business/production/salaryZero";
-import { rowNum, numberToCurrencyNo } from "@/utils/index";
-import feedbackDialog from "../feedbackDialog.vue";
-import useUserStore from "@/store/modules/user";
-import { ref } from "vue";
-const { proxy } = getCurrentInstance();
-const visible = ref(false);
-const width = ref(1420);
-const selections = ref([]);
-const currentSource = ref(null);
-
-const permissions = useUserStore().permissions;
-const all_permission = "*:*:*";
-
-const feedbackDialogView = ref(null);
-
-const confirmChoices = ref([
-  {
-    label: "是",
-    value: 1,
-  },
-  {
-    label: "否",
-    value: 0,
-  },
-]);
+  import {
+    getDetail,
+    verifyDetail,
+    turnBackDetail,
+    exportSalaryEmployee,
+    exportSalaryPdf,
+  } from "@/api/business/production/salaryZero";
+  import { rowNum, numberToCurrencyNo } from "@/utils/index";
+  import feedbackDialog from "../feedbackDialog.vue";
+  import useUserStore from "@/store/modules/user";
+  import { ref } from "vue";
+  const { proxy } = getCurrentInstance();
+  const visible = ref(false);
+  const width = ref(1420);
+  const selections = ref([]);
+  const currentSource = ref(null);
 
-const props = defineProps({
-  getList: {
-    type: Function,
-    default: () => {},
-  },
-});
+  const permissions = useUserStore().permissions;
+  const all_permission = "*:*:*";
 
-const { getList } = toRefs(props);
-const total = ref(0);
+  const feedbackDialogView = ref(null);
 
-const employeeEmptyData = {
-  id: null,
-  title: "",
-  remark: "",
-  employeeName: "",
-  departmentName: "",
-  idCode: "",
-  salaryAmount: "",
-  bonusAmount: "",
-  allowanceAmount: "",
-  subsidyAmount: "",
-  absenceCut: "",
-  planSalary: 0,
-  actuallySalary: 0,
-  endowmentInsurance: 0,
-  medicalInsurance: 0,
-  unemploymentBenefit: 0,
-  seriousIllnessInsurance: 0,
-  housingFund: 0,
-  otherCut: 0,
-  cumulativeIncome: 0,
-  cumulativeSpecialCut: 0,
-  cumulativeChildEduCut: 0,
-  cumulativeHouseLoanInterestCut: 0,
-  cumulativeHouseRentCut: 0,
-  cumulativeSupportElderCut: 0,
-  cumulativeContinuingEduCut: 0,
-  cumulativeBabyCareCut: 0,
-  sumSpecialCumulativeCut: 0,
-  cumulativeOtherCut: 0,
-  cumulativeIndividualIncomeTax: 0,
-  cumulativeHasPaidIit: 0,
-  currentIndividualIncomeTax: 0,
-  idiograph: "",
-  details: [],
-  editStatus: true,
-};
+  const confirmChoices = ref([
+    {
+      label: "是",
+      value: 1,
+    },
+    {
+      label: "否",
+      value: 0,
+    },
+  ]);
 
-const form = ref({
-  amount: null,
-  details: [],
-});
+  const props = defineProps({
+    getList: {
+      type: Function,
+      default: () => { },
+    },
+  });
 
-const emptyForm = {
-  details: [],
-};
+  const { getList } = toRefs(props);
+  const total = ref(0);
 
-function open(detail) {
-  console.log(detail);
-  visible.value = true;
-  form.value = detail;
-  loadData();
-}
+  const employeeEmptyData = {
+    id: null,
+    title: "",
+    remark: "",
+    employeeName: "",
+    departmentName: "",
+    idCode: "",
+    salaryAmount: "",
+    bonusAmount: "",
+    allowanceAmount: "",
+    subsidyAmount: "",
+    absenceCut: "",
+    planSalary: 0,
+    actuallySalary: 0,
+    endowmentInsurance: 0,
+    medicalInsurance: 0,
+    unemploymentBenefit: 0,
+    seriousIllnessInsurance: 0,
+    housingFund: 0,
+    otherCut: 0,
+    cumulativeIncome: 0,
+    cumulativeSpecialCut: 0,
+    cumulativeChildEduCut: 0,
+    cumulativeHouseLoanInterestCut: 0,
+    cumulativeHouseRentCut: 0,
+    cumulativeSupportElderCut: 0,
+    cumulativeContinuingEduCut: 0,
+    cumulativeBabyCareCut: 0,
+    sumSpecialCumulativeCut: 0,
+    cumulativeOtherCut: 0,
+    cumulativeIndividualIncomeTax: 0,
+    cumulativeHasPaidIit: 0,
+    currentIndividualIncomeTax: 0,
+    idiograph: "",
+    details: [],
+    editStatus: true,
+  };
 
-function loadData() {
-  getDetail(form.value).then((res) => {
-    form.value = { ...proxy.deepClone(emptyForm), ...res.data };
-    computeTotal();
+  const form = ref({
+    amount: null,
+    details: [],
   });
-}
 
-function close() {
-  visible.value = false;
-  reset();
-}
+  const emptyForm = {
+    details: [],
+  };
 
-function reset() {
-  form.value = proxy.deepClone(emptyForm);
-  total.value = 0;
-}
+  function open(detail) {
+    console.log(detail);
+    visible.value = true;
+    form.value = detail;
+    loadData();
+  }
 
-function printSalary() {
-  exportSalaryPdf(form.value.id);
-}
+  function loadData() {
+    getDetail(form.value).then((res) => {
+      form.value = { ...proxy.deepClone(emptyForm), ...res.data };
+      computeTotal();
+    });
+  }
 
-function exportSalary() {
-  exportSalaryEmployee(form.value.id);
-}
+  function close() {
+    visible.value = false;
+    reset();
+  }
 
-function showVerify() {
-  if (
-    form.value.id == null ||
-    form.value.status === 0 ||
-    form.value.status === 3 ||
-    form.value.status === 4
-  ) {
-    return false;
-  } else if (verifiable()) {
-    return true;
-  } 
-  else {
-    return false;
+  function reset() {
+    form.value = proxy.deepClone(emptyForm);
+    total.value = 0;
   }
-}
 
-function verifiable() {
+  function printSalary() {
+    exportSalaryPdf(form.value.id);
+  }
 
-  return (
-    permissions.includes("business:salaryZero:verify")||permissions.includes(all_permission) );
-}
-function blackButton() {
+  function exportSalary() {
+    exportSalaryEmployee(form.value.id);
+  }
 
-  return (
-    permissions.includes("business:salaryZero:back")|| permissions.includes(all_permission) 
-  );
-}
-function handleCurrentChange(row) {
-  currentSource.value = row;
-}
+  function showVerify() {
+    if (
+      form.value.id == null ||
+      form.value.status === 0 ||
+      form.value.status === 3 ||
+      form.value.status === 4
+    ) {
+      return false;
+    } else if (verifiable()) {
+      return true;
+    }
+    else {
+      return false;
+    }
+  }
 
-function handleCheckChange(selection) {
-  selections.value = selection.map((item) => item);
-}
+  function verifiable() {
 
-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]));
+    return (
+      permissions.includes("business:salaryZero:verify") || permissions.includes(all_permission));
+  }
+  function blackButton() {
 
-    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;
-}
+    return (
+      permissions.includes("business:salaryZero:back") || permissions.includes(all_permission)
+    );
+  }
+  function handleCurrentChange(row) {
+    currentSource.value = row;
+  }
 
-function handleVerify(status) {
-  if (status === 4) {
-    const saveValue = proxy.deepClone(form.value);
-    saveValue.status = status;
-    feedbackDialogView.value.open(saveValue);
-  } else {
-    proxy.$modal
-      .confirm("确认审核么?")
-      .then((_) => {
-        const saveValue = proxy.deepClone(form.value);
-        saveValue.status = status;
-        verify(saveValue);
-      })
-      .catch((_) => {
-        proxy.$modal.msg("已取消审核");
-      });
+  function handleCheckChange(selection) {
+    selections.value = selection.map((item) => item);
   }
-}
 
-function verify(data) {
-  verifyDetail(data).then((res) => {
-    reset();
-    getList.value();
-    close();
-  });
-}
+  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]));
 
-function rowChangeSum(row) {
-  let actuallySalary = 0;
-  actuallySalary += row.planSalary == null ? 0 : row.planSalary;
-  actuallySalary += row.bonusAmount == null ? 0 : row.bonusAmount;
-  actuallySalary -= row.endowmentInsurance == null ? 0 : row.endowmentInsurance;
-  actuallySalary -= row.medicalInsurance == null ? 0 : row.medicalInsurance;
-  actuallySalary -=
-    row.unemploymentBenefit == null ? 0 : row.unemploymentBenefit;
-  actuallySalary -=
-    row.seriousIllnessInsurance == null ? 0 : row.seriousIllnessInsurance;
-  actuallySalary -= row.housingFund == null ? 0 : row.housingFund;
-  if (form.value.hasIndividualIncomeTax === 1) {
-    actuallySalary -=
-      row.individualIncomeTaxConfirm == null
-        ? 0
-        : row.individualIncomeTaxConfirm;
-  } else {
-    actuallySalary -=
-      row.currentIndividualIncomeTax == null
-        ? 0
-        : row.currentIndividualIncomeTax;
+      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;
   }
-  actuallySalary -= row.otherCut == null ? 0 : row.otherCut;
-  row.actuallySalary = actuallySalary;
-  computeTotal();
-}
 
-function computeTotal() {
-  let totalSalay = 0;
-  form.value.details.forEach((l) => {
-    totalSalay += l.actuallySalary == null ? 0 : l.actuallySalary;
-  });
-  form.value.amount = totalSalay;
-}
+  function handleVerify(status) {
+    if (status === 4) {
+      const saveValue = proxy.deepClone(form.value);
+      saveValue.status = status;
+      feedbackDialogView.value.open(saveValue);
+    } else {
+      proxy.$modal
+        .confirm("确认审核么?")
+        .then((_) => {
+          const saveValue = proxy.deepClone(form.value);
+          saveValue.status = status;
+          verify(saveValue);
+        })
+        .catch((_) => {
+          proxy.$modal.msg("已取消审核");
+        });
+    }
+  }
 
-function returnStatus(status) {
-  proxy.$modal
-    .confirm("确认退回么?")
-    .then((_) => {
-      turnBackDetail(form.value).then((res) => {
-        // if (res.data.successStatus = true) {
-        //   reset()
-        //   getList.value()
-        //   close()
-        // } else {
-        //   proxy.$modal.msg(res.data.message)
-        // }
-        reset();
-        getList.value();
-        close();
-      });
-    })
-    .catch((_) => {
-      proxy.$modal.msg("已取消退回");
+  function verify(data) {
+    verifyDetail(data).then((res) => {
+      reset();
+      getList.value();
+      close();
     });
-}
+  }
 
-function changeIndividual(arg) {
-  // if (arg === 1) {
-  form.value.details.forEach((row) => {
+  function rowChangeSum(row) {
     let actuallySalary = 0;
     actuallySalary += row.planSalary == null ? 0 : row.planSalary;
     actuallySalary += row.bonusAmount == null ? 0 : row.bonusAmount;
-    actuallySalary -=
-      row.endowmentInsurance == null ? 0 : row.endowmentInsurance;
+    actuallySalary -= row.endowmentInsurance == null ? 0 : row.endowmentInsurance;
     actuallySalary -= row.medicalInsurance == null ? 0 : row.medicalInsurance;
     actuallySalary -=
       row.unemploymentBenefit == null ? 0 : row.unemploymentBenefit;
     actuallySalary -=
       row.seriousIllnessInsurance == null ? 0 : row.seriousIllnessInsurance;
     actuallySalary -= row.housingFund == null ? 0 : row.housingFund;
-    if (arg === 1) {
+    if (form.value.hasIndividualIncomeTax === 1) {
       actuallySalary -=
         row.individualIncomeTaxConfirm == null
           ? 0
@@ -714,12 +493,72 @@ function changeIndividual(arg) {
     }
     actuallySalary -= row.otherCut == null ? 0 : row.otherCut;
     row.actuallySalary = actuallySalary;
-  });
-  computeTotal();
-}
+    computeTotal();
+  }
 
-// 暴露给父组件的方法
-defineExpose({
-  open,
-});
+  function computeTotal() {
+    let totalSalay = 0;
+    form.value.details.forEach((l) => {
+      totalSalay += l.actuallySalary == null ? 0 : l.actuallySalary;
+    });
+    form.value.amount = totalSalay;
+  }
+
+  function returnStatus(status) {
+    proxy.$modal
+      .confirm("确认退回么?")
+      .then((_) => {
+        turnBackDetail(form.value).then((res) => {
+          // if (res.data.successStatus = true) {
+          //   reset()
+          //   getList.value()
+          //   close()
+          // } else {
+          //   proxy.$modal.msg(res.data.message)
+          // }
+          reset();
+          getList.value();
+          close();
+        });
+      })
+      .catch((_) => {
+        proxy.$modal.msg("已取消退回");
+      });
+  }
+
+  function changeIndividual(arg) {
+    // if (arg === 1) {
+    form.value.details.forEach((row) => {
+      let actuallySalary = 0;
+      actuallySalary += row.planSalary == null ? 0 : row.planSalary;
+      actuallySalary += row.bonusAmount == null ? 0 : row.bonusAmount;
+      actuallySalary -=
+        row.endowmentInsurance == null ? 0 : row.endowmentInsurance;
+      actuallySalary -= row.medicalInsurance == null ? 0 : row.medicalInsurance;
+      actuallySalary -=
+        row.unemploymentBenefit == null ? 0 : row.unemploymentBenefit;
+      actuallySalary -=
+        row.seriousIllnessInsurance == null ? 0 : row.seriousIllnessInsurance;
+      actuallySalary -= row.housingFund == null ? 0 : row.housingFund;
+      if (arg === 1) {
+        actuallySalary -=
+          row.individualIncomeTaxConfirm == null
+            ? 0
+            : row.individualIncomeTaxConfirm;
+      } else {
+        actuallySalary -=
+          row.currentIndividualIncomeTax == null
+            ? 0
+            : row.currentIndividualIncomeTax;
+      }
+      actuallySalary -= row.otherCut == null ? 0 : row.otherCut;
+      row.actuallySalary = actuallySalary;
+    });
+    computeTotal();
+  }
+
+  // 暴露给父组件的方法
+  defineExpose({
+    open,
+  });
 </script>