提交

src/views/business/crm/order/form.vue

@@ -1439,12 +1439,14 @@ function submitForm() {
         form.value.signerId == users.value[0].userId &&
         form.value.signerName == users.value[0].nickName
       ) {
-        console.log("正确");
+        // console.log("正确");
       } else {
         proxy.$modal.msgError("请选择有效签单人");
+        return
       }
     } else {
       proxy.$modal.msgError("请选择有效签单人");
+      return
     }
   });
 

src/views/business/housingFund/confirm/view.vue

@@ -1,12 +1,5 @@
 <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">
       <el-form size="small" label-width="120px" v-model="form">
@@ -62,40 +55,23 @@
             </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 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="index"
-                    label="序号"
-                    width="55"
-                    align="center"
-                  />
+                  <el-table-column type="index" label="序号" width="55" 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="130" align="center">
@@ -103,74 +79,43 @@
                       <div>
                         {{ scope.row.phone }}
                       </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="120"
-                    align="center"
-                  >
+                  <el-table-column label="身份证正面" width="120" align="center">
                     <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>
-                      <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="120"
-                    align="center"
-                  >
+                  <el-table-column label="身份证反面" width="120" align="center">
                     <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>
-                      <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" align="center">
@@ -178,31 +123,25 @@
                       <div>
                         {{ scope.row.cardinalNumber }}
                       </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" align="center">
                     <template #default="scope">
                       <div>{{ scope.row.ratio }}%</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="备注" header-align="center">
@@ -234,53 +173,23 @@
           </el-col>
           <el-col v-if="showVerify()" :span="24">
             <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-col>
         </el-row>
       </el-form>
     </div>
     <div class="form-btns-container" style="height: 40px">
-      <el-button
-        v-if="showVerify()"
-        type="danger"
-        size="small"
-        style="float: right; margin-left: 12px"
-        icon="back"
-        @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" style="float: right; margin-left: 12px" icon="back"
+        @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>
     <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" /> -->
   </el-dialog>
 </template>
@@ -325,7 +234,7 @@ const confirmChoices = ref([
 const props = defineProps({
   getList: {
     type: Function,
-    default: () => {},
+    default: () => { },
   },
 });
 
@@ -403,14 +312,15 @@ function reset() {
   total.value = 0;
 }
 
-function printSalary() {}
-function exportSalary() {}
+function printSalary() { }
+function exportSalary() { }
 
 function showVerify() {
   if (
     form.value.id == null ||
     form.value.status === 0 ||
-    form.value.status === 3
+    form.value.status === 3 ||
+    form.value.status === 4
   ) {
     return false;
   } else if (verifiable()) {

src/views/business/production/feedbackDialog.vue

@@ -1,32 +1,13 @@
 <template>
-  <el-dialog
-    title="反馈信息"
-    v-model="formOpen"
-    width="500px"
-    append-to-body
-    draggable
-    @close="cancel"
-  >
+  <el-dialog title="反馈信息" v-model="formOpen" width="500px" append-to-body draggable @close="cancel">
     <el-form ref="dictRef" :model="form" label-width="100">
       <el-form-item :label="`${form.status === 4 ? '驳回原因' : '反馈信息'}：`">
-        <el-input
-          v-model="form.feedbackContent"
-          type="textarea"
-          maxlength="200"
-          show-word-limit
-          style="width: 100%"
-        />
+        <el-input v-model="form.feedbackContent" type="textarea" maxlength="200" show-word-limit style="width: 100%" />
       </el-form-item>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button
-          type="primary"
-          size="small"
-          icon="Finished"
-          @click="submitForm"
-          >确 定</el-button
-        >
+        <el-button type="primary" size="small" icon="Finished" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" icon="close" size="small">取 消</el-button>
       </div>
     </template>
@@ -40,7 +21,7 @@ const { proxy } = getCurrentInstance();
 const props = defineProps({
   verify: {
     type: Function,
-    default: () => {},
+    default: () => { },
   },
 });
 
@@ -74,9 +55,9 @@ function cancel() {
 }
 
 function open(options) {
+  form.value.feedbackContent = "";
   formOpen.value = true;
   form.value = options;
-  form.value.feedbackContent = "";
 }
 
 function reset() {

src/views/business/production/keepAccount/index.vue

@@ -8,29 +8,69 @@
         </el-button>
         <template #dropdown>
           <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>
         </template>
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
-      label-width="68px">
+    <el-form
+      class="list-search-container"
+      size="small"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      label-width="78px"
+    >
       <el-form-item label="客户名称：" prop="companyName">
-        <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" style="width: 150px" clearable
-          @keyup.enter="handleQuery" />
+        <el-input
+          v-model="queryParams.companyName"
+          placeholder="请输入客户名称"
+          style="width: 150px"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="月份：">
-        <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" :clearable="true" style="width: 130px"
-          @change="handleQuery">
-          <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="月份"
+          :clearable="true"
+          style="width: 130px"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in selectMonths"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
       </el-form-item>
       <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-form-item>
 
@@ -38,20 +78,48 @@
         <el-switch v-model="oneself" @change="handleOneself" />
       </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="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </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 label="客户名称" align="center" prop="companyName" min-width="250" />
-      <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="100" />
-      <el-table-column label="纳税性质" min-width="100" align="center" 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="纳税性质"
+        min-width="100"
+        align="center"
+        prop="taxType"
+      />
+      <el-table-column
+        label="税号"
+        align="center"
+        prop="socialCreditCode"
+        min-width="200"
+      />
       <el-table-column label="当前期间" width="90" align="center">
         <template #default="scope">
           <!-- {{ scope.row.currentDate != null && scope.row.currentDate > scope.row.checkoutDate ? scope.row.currentDate :
@@ -61,94 +129,198 @@
       </el-table-column>
       <el-table-column align="center">
         <template #header>
-          <div style="
+          <div
+            style="
               display: flex;
               flex-direction: row;
               justify-content: space-between;
-            ">
+            "
+          >
             <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">{{
                 queryParams.year
               }}</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 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;
                     margin-left: 10px;
                     line-height: 36px;
-                  ">
+                  "
+                >
                   {{ item.label }}
                 </div>
               </div>
             </div>
           </div>
         </template>
-        <el-table-column v-for="item in selectMonths" :key="item.value" width="50" :label="item.label" align="center">
+        <el-table-column
+          v-for="item in selectMonths"
+          :key="item.value"
+          width="50"
+          :label="item.label"
+          align="center"
+        >
           <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>
         </el-table-column>
       </el-table-column>
-      <el-table-column label="执行人" align="center" prop="serviceName" width="100">
+      <el-table-column
+        label="执行人"
+        align="center"
+        prop="serviceName"
+        width="100"
+      >
       </el-table-column>
     </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" />
     <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" :rules="rules" size="small" label-width="100">
+    <el-dialog
+      title="更多搜索"
+      v-model="moreSearch"
+      width="620px"
+      append-to-body
+      draggable
+    >
+      <el-form
+        :model="queryParams"
+        ref="queryRef"
+        :rules="rules"
+        size="small"
+        label-width="100"
+      >
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="客户名称：" prop="companyName">
-              <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" clearable @keyup.enter="handleQuery" />
+              <el-input
+                v-model="queryParams.companyName"
+                placeholder="请输入客户名称"
+                clearable
+                @keyup.enter="handleQuery"
+              />
             </el-form-item>
             <el-form-item label="月份：">
-              <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" :clearable="true"
-                @change="handleQuery">
-                <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="月份"
+                :clearable="true"
+                @change="handleQuery"
+              >
+                <el-option
+                  v-for="item in selectMonths"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
             </el-form-item>
             <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-form-item>
           </el-col>
           <el-col :span="12">
             <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-form-item>
             <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-col>
         </el-row>
       </el-form>
       <template #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>
       </template>
     </el-dialog>

src/views/business/production/salary/view.vue

@@ -359,7 +359,8 @@ function showVerify() {
   if (
     form.value.id == null ||
     form.value.status === 0 ||
-    form.value.status === 3
+    form.value.status === 3 ||
+    form.value.status === 4
   ) {
     return false;
   } else if (verifiable()) {

src/views/business/production/salaryZero/view.vue

@@ -1,12 +1,5 @@
 <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">
       <el-form size="small" label-width="100px" v-model="form">
@@ -31,41 +24,22 @@
             </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">
@@ -73,48 +47,30 @@
                       <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="70"
-                    align="center"
-                    prop="planSalary"
-                  >
+                  <el-table-column label="应发工资" width="70" align="center" prop="planSalary">
                     <template #default="scope">
                       <div>
                         {{ scope.row.planSalary }}
                       </div>
                     </template>
                   </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">
                       <div>
                         {{ scope.row.actuallySalary }}
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    label="奖金及其他"
-                    width="95"
-                    align="center"
-                    prop="bonusAmount"
-                  >
+                  <el-table-column label="奖金及其他" width="95" align="center" prop="bonusAmount">
                     <template #default="scope">
                       <div>
                         {{ scope.row.bonusAmount }}
@@ -122,48 +78,28 @@
                     </template>
                   </el-table-column>
                   <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">
                         <div>
                           {{ scope.row.endowmentInsurance }}
                         </div>
                       </template>
                     </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">
                         <div>
                           {{ scope.row.medicalInsurance }}
                         </div>
                       </template>
                     </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">
                         <div>
                           {{ scope.row.unemploymentBenefit }}
                         </div>
                       </template>
                     </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">
                         <div>
                           {{ scope.row.seriousIllnessInsurance }}
@@ -171,54 +107,34 @@
                       </template>
                     </el-table-column>
                   </el-table-column>
-                  <el-table-column
-                    label="公积金"
-                    width="80"
-                    align="center"
-                    prop="housingFund"
-                  >
+                  <el-table-column label="公积金" width="80" align="center" prop="housingFund">
                     <template #default="scope">
                       <div>
                         {{ scope.row.housingFund }}
                       </div>
                     </template>
                   </el-table-column>
-                  <el-table-column
-                    label="个税"
-                    align="center"
-                    :prop="
-                      form.status === 3 && form.hasIndividualIncomeTax
-                        ? 'individualIncomeTaxConfirm'
-                        : 'currentIndividualIncomeTax'
-                    "
-                  >
+                  <el-table-column label="个税" align="center" :prop="form.status === 3 && form.hasIndividualIncomeTax
+                      ? 'individualIncomeTaxConfirm'
+                      : 'currentIndividualIncomeTax'
+                    ">
                     <template #default="scope">
                       <div>
                         {{
                           form.status === 3 && form.hasIndividualIncomeTax
-                            ? scope.row.individualIncomeTaxConfirm
-                            : scope.row.currentIndividualIncomeTax
+                          ? scope.row.individualIncomeTaxConfirm
+                          : scope.row.currentIndividualIncomeTax
                         }}
                       </div>
-                    </template></el-table-column
-                  >
-                  <el-table-column
-                    label="其他扣款"
-                    width="70"
-                    align="center"
-                    prop="otherCut"
-                  >
+                    </template></el-table-column>
+                  <el-table-column label="其他扣款" width="70" align="center" prop="otherCut">
                     <template #default="scope">
                       <div>
                         {{ 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 }}
@@ -249,27 +165,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" /> 人员信息
@@ -277,58 +179,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>
@@ -339,14 +212,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>
@@ -354,36 +221,15 @@
       </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="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" style="float: right; margin-left: 12px" icon="check"
+        @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>
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
     <!-- <print-dialog ref="printDialog" /> -->
@@ -423,7 +269,7 @@ const confirmChoices = ref([
 const props = defineProps({
   getList: {
     type: Function,
-    default: () => {},
+    default: () => { },
   },
 });
 
@@ -501,14 +347,15 @@ function reset() {
   total.value = 0;
 }
 
-function printSalary() {}
-function exportSalary() {}
+function printSalary() { }
+function exportSalary() { }
 
 function showVerify() {
   if (
     form.value.id == null ||
     form.value.status === 0 ||
-    form.value.status === 3
+    form.value.status === 3 ||
+    form.value.status === 4
   ) {
     return false;
   } else if (verifiable()) {

src/views/business/socialSecurity/confirm/view.vue

@@ -1,12 +1,5 @@
 <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">
       <el-form size="small" label-width="100px" v-model="form">
@@ -26,11 +19,8 @@
               <template #label>
                 <div>政务网账号</div>
               </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>
             </el-form-item>
           </el-col>
@@ -39,14 +29,9 @@
               <template #label>
                 <div>政务网密码</div>
               </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>
             </el-form-item>
           </el-col>
@@ -55,11 +40,8 @@
               <template #label>
                 <div>社保账号</div>
               </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>
             </el-form-item>
           </el-col>
@@ -68,15 +50,10 @@
               <template #label>
                 <div>社保密码</div>
               </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')
-                "
-              />
+                  " />
               <div v-else>{{ form.socialSecurityPassword }}</div>
             </el-form-item>
           </el-col>
@@ -85,14 +62,9 @@
               <template #label>
                 <div>用工密码</div>
               </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>
             </el-form-item>
           </el-col>
@@ -105,40 +77,23 @@
             </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="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="index"
-                    label="序号"
-                    width="55"
-                    align="center"
-                  />
+                  <el-table-column type="index" label="序号" width="55" 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="130" align="center">
@@ -146,74 +101,43 @@
                       <div>
                         {{ scope.row.phone }}
                       </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="120"
-                    align="center"
-                  >
+                  <el-table-column label="身份证正面" width="120" align="center">
                     <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>
-                      <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="120"
-                    align="center"
-                  >
+                  <el-table-column label="身份证反面" width="120" align="center">
                     <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>
-                      <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" align="center">
@@ -221,16 +145,13 @@
                       <div>
                         {{ scope.row.cardinalNumber }}
                       </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" align="center">
@@ -238,16 +159,13 @@
                       <div>
                         {{ scope.row.medicalCardinalNumber }}
                       </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" required>
@@ -281,14 +199,8 @@
           </el-col>
           <el-col :span="24">
             <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>
             </el-form-item>
           </el-col>
@@ -296,42 +208,16 @@
       </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"
-        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>
     <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" /> -->
   </el-dialog>
 </template>
@@ -376,7 +262,7 @@ const confirmChoices = ref([
 const props = defineProps({
   getList: {
     type: Function,
-    default: () => {},
+    default: () => { },
   },
 });
 
@@ -454,14 +340,15 @@ function reset() {
   total.value = 0;
 }
 
-function printSalary() {}
-function exportSalary() {}
+function printSalary() { }
+function exportSalary() { }
 
 function showVerify() {
   if (
     form.value.id == null ||
     form.value.status === 0 ||
-    form.value.status === 3
+    form.value.status === 3 ||
+    form.value.status === 4
   ) {
     return false;
   } else if (verifiable()) {

src/views/system/inItRole/index.vue

@@ -581,11 +581,11 @@ function submitForm() {
       } else {
         form.value.menuIds = getMenuAllCheckedKeys();
         console.log("菜单", form.value.menuIds);
-        // addRole(form.value).then((response) => {
-        proxy.$modal.msgSuccess("新增成功");
-        //   open.value = false;
-        //   getList();
-        // });
+        addRole(form.value).then((response) => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
       }
     }
   });