提交

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

@@ -1,5 +1,12 @@
 <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">
@@ -55,23 +62,40 @@
             </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">
@@ -79,43 +103,74 @@
                       <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">
@@ -123,25 +178,31 @@
                       <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">
@@ -173,23 +234,54 @@
           </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-show="showVerify()"
+        type="danger"
+        size="small"
+        style="float: right; margin-left: 12px"
+        icon="back"
+        @click="handleVerify(4)"
+      >
+        驳回</el-button
+      >
+      <el-button
+        v-show="showVerify()"
+        type="primary"
+        size="small"
+        icon="check"
+        style="float: right; margin-left: 12px"
+        @click="handleVerify(3)"
+        >审核通过</el-button
+      >
+      <el-button
+        v-show="verifiable() && form.status === 3"
+        type="warning"
+        size="small"
+        icon="back"
+        style="float: right; margin-left: 12px"
+        @click="returnStatus()"
+        >退回</el-button
+      >
     </div>
     <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>
@@ -234,7 +326,7 @@ const confirmChoices = ref([
 const props = defineProps({
   getList: {
     type: Function,
-    default: () => { },
+    default: () => {},
   },
 });
 
@@ -312,8 +404,8 @@ function reset() {
   total.value = 0;
 }
 
-function printSalary() { }
-function exportSalary() { }
+function printSalary() {}
+function exportSalary() {}
 
 function showVerify() {
   if (
@@ -335,7 +427,7 @@ function verifiable() {
   // console.log(permissions)
   return (
     permissions.includes(all_permission) ||
-    permissions.includes("business:salary:verify")
+    permissions.includes("business:housingFundConfirm:verify")
   );
 }
 

src/views/business/housingFund/declare/index.vue

@@ -8,8 +8,13 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item icon="Download" @click="handleExport" v-hasPermi="['business:deposit:export']">
-              导出</el-dropdown-item>
+            <el-dropdown-item
+              icon="Download"
+              @click="handleExport"
+              v-hasPermi="['business:deposit:export']"
+            >
+              导出</el-dropdown-item
+            >
             <!-- <el-dropdown-item type="warning" size="small" icon="Download" @click="handleArea"
               v-hasPermi="['business:deposit:export']"> area</el-dropdown-item> -->
           </el-dropdown-menu>
@@ -17,59 +22,132 @@
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
-      label-width="78px">
+    <el-form
+      class="list-search-container"
+      size="small"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      label-width="78px"
+    >
       <el-form-item label="客户名称：" prop="companyName">
-        <el-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-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" :clearable="false" value-format="YYYY-MM-01"
-          @change="currentMonthChange" :disabled-date="disabledDateHandler" />
+        <el-date-picker
+          v-model="currentMonth"
+          type="month"
+          format="YYYY年MM月"
+          :clearable="false"
+          value-format="YYYY-MM-01"
+          @change="currentMonthChange"
+          :disabled-date="disabledDateHandler"
+        />
       </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>
       <el-form-item label="是否自己负责:">
         <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="orderList" size="small" border height="100%"
-      @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="orderList"
+      size="small"
+      border
+      height="100%"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="客户名称" min-width="250" align="center" prop="companyName" />
-      <el-table-column label="来源" min-width="100" align="center" prop="fromCompanyName" />
-      <el-table-column label="纳税性质" width="100" align="center" prop="taxType" />
+      <el-table-column
+        label="客户名称"
+        min-width="250"
+        align="center"
+        prop="companyName"
+      />
+      <el-table-column
+        label="来源"
+        min-width="100"
+        align="center"
+        prop="fromCompanyName"
+      />
+      <el-table-column
+        label="纳税性质"
+        width="100"
+        align="center"
+        prop="taxType"
+      />
       <el-table-column label="人员信息" width="100" align="center" prop="">
         <template #default="scope">
-          <el-button v-if="scope.row.detail != null" link type="primary" size="small"
-            @click="showMember(scope.row)">查看</el-button>
+          <el-button
+            v-if="scope.row.detail != null"
+            link
+            type="primary"
+            size="small"
+            @click="showMember(scope.row)"
+            >查看</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column label="申报填写" width="100" align="center" prop="">
         <template #default="scope">
-          <el-button link type="primary" size="small" @click="fillIn(scope.row)">{{
-            scope.row.detail == null
-            ? "填写"
-            : scope.row.detail.status === 1
-              ? "进行中"
-              : "已填写"
-          }}</el-button>
+          <el-button
+            link
+            type="primary"
+            size="small"
+            v-hasPermi="['business:housingFundConfirm:verify']"
+            @click="fillIn(scope.row)"
+            >{{
+              scope.row.detail == null
+                ? "填写"
+                : scope.row.detail.status === 1
+                ? "进行中"
+                : "已填写"
+            }}</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column label="申报附件" width="100" align="center" prop="">
         <template #default="scope">
-          <el-button size="small" type="primary" link :disabled="scope.row.detail == null || scope.row.detail.status <= 1"
-            @click="showFiles(scope.row)">查看文件</el-button>
+          <el-button
+            size="small"
+            type="primary"
+            link
+            :disabled="scope.row.detail == null || scope.row.detail.status <= 1"
+            @click="showFiles(scope.row)"
+            >查看文件</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column label="状态" width="110" align="center" prop="">
@@ -78,28 +156,36 @@
             {{ getStatusLabel(scope.row) }}
             <el-popover placement="top-start" width="250" trigger="hover">
               <div style="display: flex; flex-direction: row">
-                <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;
                       font-size: 10px;
-                    ">
+                    "
+                  >
                     {{ item.label }}
                   </div>
                 </div>
               </div>
               <template #reference>
-                <span style="
+                <span
+                  style="
                     color: #fff;
                     font-size: 12px;
                     text-align: center;
@@ -109,7 +195,9 @@
                     height: 14px;
                     background-color: #ccc;
                     border-radius: 50%;
-                  ">?</span>
+                  "
+                  >?</span
+                >
               </template>
             </el-popover>
           </div>
@@ -118,55 +206,129 @@
       <el-table-column label="执行人" width="80" align="center" prop="" />
       <el-table-column label="操作" width="80" align="center" prop="">
         <template #default="scope">
-          <el-button size="small" type="primary" link :disabled="scope.row.detail == null || scope.row.detail.status !== 3
-            " @click="turnBack(scope.row.detail)">退回</el-button>
+          <el-button
+            size="small"
+            type="primary"
+            link
+            :disabled="
+              scope.row.detail == null || scope.row.detail.status !== 3
+            "
+            v-hasPermi="['business:housingFundConfirm:verify']"
+            @click="turnBack(scope.row.detail)"
+            >退回</el-button
+          >
         </template>
       </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" />
     <member-dialog ref="memeberDialogRef" :get-list="getList" />
     <FileListDialog ref="fileListDialogRef" :get-list="getList" />
     <!-- 更多搜索弹窗 -->
-    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body size="small" draggable>
-      <el-form :model="queryParams" ref="queryRef" size="small" :rules="rules" label-width="100">
+    <el-dialog
+      title="更多搜索"
+      v-model="moreSearch"
+      width="620px"
+      append-to-body
+      size="small"
+      draggable
+    >
+      <el-form
+        :model="queryParams"
+        ref="queryRef"
+        size="small"
+        :rules="rules"
+        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-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" :clearable="false"
-                value-format="YYYY-MM-01" @change="currentMonthChange" :disabled-date="disabledDateHandler" />
+              <el-date-picker
+                v-model="currentMonth"
+                type="month"
+                format="YYYY年MM月"
+                :clearable="false"
+                value-format="YYYY-MM-01"
+                @change="currentMonthChange"
+                :disabled-date="disabledDateHandler"
+              />
             </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/keepAccount/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="140px" v-model="form">
@@ -56,12 +49,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input
-                v-if="form.status === 2"
-                v-model.trim="form.verifyContent"
-                type="textarea"
-                rows="2"
-              />
+              <el-input v-if="form.status === 2" v-model.trim="form.verifyContent" type="textarea" rows="2" />
               <div v-else>{{ form.verifyContent }}</div>
             </el-form-item>
           </el-col>
@@ -69,16 +57,9 @@
       </el-form>
     </div>
     <div class="form-btns-container" style="height: 40px">
-      <el-button
-        v-if="verifiable() && form.status === 3"
-        type="warning"
-        icon="back"
-        size="small"
-        style="float: right; margin-left: 12px"
-        @click="returnStatus()"
-      >
-        退回</el-button
-      >
+      <el-button v-if="verifiable() && form.status === 3" type="warning" icon="back" size="small"
+        style="float: right; margin-left: 12px" @click="returnStatus()">
+        退回</el-button>
     </div>
     <feedback-dialog ref="feedbackDialogView" :verify="verify" />
     <!-- <print-dialog ref="printDialog" /> -->
@@ -108,7 +89,7 @@ const feedbackDialogView = ref(null);
 const props = defineProps({
   getList: {
     type: Function,
-    default: () => {},
+    default: () => { },
   },
 });
 
@@ -228,8 +209,8 @@ function reset() {
   total.value = 0;
 }
 
-function printSalary() {}
-function exportSalary() {}
+function printSalary() { }
+function exportSalary() { }
 
 function showVerify() {
   if (salaryDetail.value == null || salaryDetail.value.status !== 3) {
@@ -255,7 +236,7 @@ function verifiable() {
   // console.log(permissions)
   return (
     permissions.includes(all_permission) ||
-    permissions.includes("business:salary:verify")
+    permissions.includes("business:keepAccount:edit")
   );
 }
 

src/views/business/socialSecurity/declare/index.vue

@@ -50,8 +50,8 @@
       <el-table-column label="纳税性质" min-width="100" align="center" prop="taxType" />
       <el-table-column label="人员信息" min-width="60" align="center" prop="">
         <template #default="scope">
-          <el-button v-if="scope.row.detail != null" link type="primary" size="small"
-            @click="showMember(scope.row)">查看</el-button>
+          <el-button v-hasPermi="['business:socialSecurityDeclare:query']" v-if="scope.row.detail != null" link
+            type="primary" size="small" @click="showMember(scope.row)">查看</el-button>
         </template>
       </el-table-column>
       <el-table-column label="申报填写" width="100" align="center" prop="">
@@ -67,7 +67,9 @@
       </el-table-column>
       <el-table-column label="申报附件" width="100" align="center" prop="">
         <template #default="scope">
-          <el-button size="small" type="primary" link :disabled="scope.row.detail == null || scope.row.detail.status <= 1"
+          <el-button
+            v-hasPermi="['business:socialSecurityDeclare:edit', 'business:socialSecurityDeclare:view', 'business:socialSecurityDeclare:verify']"
+            size="small" type="primary" link :disabled="scope.row.detail == null || scope.row.detail.status <= 1"
             @click="showFiles(scope.row)">查看文件</el-button>
         </template>
       </el-table-column>
@@ -117,7 +119,7 @@
       <el-table-column label="执行人" width="80" align="center" prop="serviceName" />
       <el-table-column label="操作" width="80" align="center" prop="">
         <template #default="scope">
-          <el-button size="small" type="primary" link :disabled="scope.row.detail == null || scope.row.detail.status !== 3
+          <el-button v-hasPermi="['business:socialSecurityDeclare:edit']" size="small" type="primary" link :disabled="scope.row.detail == null || scope.row.detail.status !== 3
             " @click="turnBack(scope.row.detail)">退回</el-button>
         </template>
       </el-table-column>

src/views/business/tenant/init.vue

@@ -128,13 +128,11 @@
                           初始化默认部门
                           <span
                             :style="{
-                              color: checkDept ? 'green' : 'red',
+                              color: initDept ? 'green' : 'red',
                               paddingLeft: '10px',
                             }"
                             >{{
-                              checkDept
-                                ? "已初始化默认部门"
-                                : "未初始化默认部门"
+                              initDept ? "已初始化默认部门" : "未初始化默认部门"
                             }}
                           </span>
                         </template>
@@ -291,6 +289,7 @@ function open(id) {
   visible.value = true;
   if (id) {
     checkTenantInit(id).then((res) => {
+      console.log("res.data", res.data);
       checkAdminRole.value = res.data.checkAdminRole;
       checkAdmin.value = res.data.checkAdmin;
       admin.value = res.data.admin
@@ -310,6 +309,7 @@ function open(id) {
       initRoles.value = res.data.initRoles ? res.data.initRoles : [];
       roleList.value = res.data.initRoleData;
       tenant.value = res.data.tenant;
+      checkRole.value = res.data.checkRole;
       setRoleSelection(res.data.initRoles);
       // console.log(adminRole.value)
     });

src/views/system/inItRole/index.vue

@@ -94,6 +94,13 @@
         align="center"
         prop="roleName"
         :show-overflow-tooltip="true"
+        width="250"
+      />
+      <el-table-column
+        label="权限字符"
+        align="center"
+        prop="roleKey"
+        :show-overflow-tooltip="true"
         width="150"
       />
 
@@ -102,7 +109,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="200"
+        width="150"
       >
         <template #default="scope">
           <el-button
@@ -151,7 +158,7 @@
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
         </el-form-item>
-        <!-- <el-form-item prop="roleKey">
+        <el-form-item prop="roleKey">
           <template #label>
             <span>
               <el-tooltip
@@ -165,7 +172,7 @@
           </template>
           <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
         </el-form-item>
-        <el-form-item label="角色顺序" prop="roleSort">
+        <!-- <el-form-item label="角色顺序" prop="roleSort">
           <el-input-number
             v-model="form.roleSort"
             controls-position="right"
@@ -383,7 +390,8 @@ function resetQuery() {
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const roleIds = row.roleId || ids.value;
+  const roleIds = row.id || ids.value;
+
   proxy.$modal
     .confirm("是否确认删除?")
     .then(function () {
@@ -408,7 +416,7 @@ function handleExport() {
 }
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map((item) => item.roleId);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
@@ -572,12 +580,12 @@ function submitForm() {
   proxy.$refs["roleRef"].validate((valid) => {
     if (valid) {
       if (form.value.id != undefined) {
-        // form.value.menuIds = getMenuAllCheckedKeys();
-        // updateRole(form.value).then((response) => {
-        //   proxy.$modal.msgSuccess("修改成功");
-        //   open.value = false;
-        //   getList();
-        // });
+        form.value.menuIds = getMenuAllCheckedKeys();
+        updateRole(form.value).then((response) => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
       } else {
         form.value.menuIds = getMenuAllCheckedKeys();
         console.log("菜单", form.value.menuIds);

src/views/system/reconciliation/oncePrice/formDialog.vue

@@ -153,7 +153,6 @@
           @click="submitForm"
           icon="Finished"
           size="small"
-          v-hasPermi="['priceList:oncePrice:save']"
           >确 定</el-button
         >
         <el-button icon="close" size="small" @click="cancel">取 消</el-button>