前端-后台

ruoyi-ui/src/assets/styles/public.scss

@@ -1,332 +1,397 @@
 // public
-/* flex */
-.public-flex {
-    display: flex;
-    align-items: center;
-  }
-  
-  .public-flex-around {
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-  }
-  
-  .public-flex-center {
+// 搜索区域
+.searchCollapse {
+  border-top: none !important;
+  border-bottom: none !important;
+
+  .el-collapse-item__header {
+    line-height: 30px !important;
+    border-bottom: none !important;
+  }
+
+  .el-collapse-item__wrap {
+    border-bottom: none !important;
+  }
+
+  .is-active>.el-collapse-item__wrap {
+    overflow: visible !important;
+    transition: overflow 0.3s;
+  }
+
+  .el-icon-arrow-right:before {
+    content: "\e6df";
+  }
+
+  .el-collapse-item__arrow {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    width: 30px;
+    height: 30px;
+    background: #42b983;
+    border-radius: 50%;
+    overflow: hidden;
     display: flex;
     align-items: center;
     justify-content: center;
+    color: #fff;
+    font-size: 14px;
+    font-weight: 900;
   }
-  
-  .public-flex-between {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  
-  .public-flex-end {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-  }
-  
-  .public-flex-column {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-  }
-  
-  .public-flex-around-column {
-    display: flex;
-    justify-content: space-around;
-    flex-direction: column;
-  }
-  
-  .public-flex-between-column {
-    display: flex;
-    justify-content: space-between;
-    flex-direction: column;
-  }
-  
-  .public-flex-center-column {
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
-    align-items: center;
-  }
-  
-  .flex {
-    flex: 1;
-  }
-  
-  .public-color {
-    color: #e85298;
-  }
-  
-  .white {
-    color: #fff !important;
-  }
-  
-  .public-font-size-12 {
-    font-size: 12px !important;
-  }
-  
-  .public-font-size-14 {
-    font-size: 14px !important;
-  }
-  
-  .public-font-size-15 {
-    font-size: 15px !important;
-  }
-  
-  .public-font-size-16 {
-    font-size: 16px !important;
-  }
-  
-  .public-font-size-17 {
-    font-size: 17px !important;
-  }
-  
-  .public-font-size-18 {
-    font-size: 18px !important;
-  }
-  
-  .public-font-size-20 {
-    font-size: 20px !important;
-  }
-  
-  .public-font-size-22 {
-    font-size: 22px !important;
-  }
-  
-  .public-font-size-24 {
-    font-size: 24px !important;
-  }
-  
-  /* 边距 */
-  /*内外边距类*/
-  .public-padded-0 {
-    padding: 0 !important;
-  }
-  
-  .public-padded-5 {
-    padding: 5px !important;
-  }
-  
-  .public-padded-10 {
-    padding: 10px !important;
-  }
-  
-  .public-padded-15 {
-    padding: 15px !important;
-  } 
-  .public-padded-20 {
-    padding: 20px !important;
-  }
-  .public-padded-30 {
-    padding: 30px !important;
-  }
-  
-  .public-padded-t-0 {
-    padding-top: 0 !important;
-  }
-  
-  .public-padded-t-5 {
-    padding-top: 5px !important;
-  }
-  
-  .public-padded-t-10 {
-    padding-top: 10px !important;
-  }
-  
-  .public-padded-t-15 {
-    padding-top: 15px !important;
-  }
-  .public-padded-t-20 {
-    padding-top: 20px !important;
-  }
-  .public-padded-b-0 {
-    padding-bottom: 0 !important;
-  }
-  
-  .public-padded-b-5 {
-    padding-bottom: 5px !important;
-  }
-  
-  .public-padded-b-10 {
-    padding-bottom: 10px !important;
+
+  .el-collapse-item__arrow.is-active {
+    transform: rotate(180deg);
   }
-  
-  .public-padded-b-15 {
-    padding-bottom: 15px !important;
-  }
-  .public-padded-b-20 {
-    padding-bottom: 20px !important;
-  }
-  .public-padded-b-30 {
-    padding-bottom: 30px !important;
-  }
-  
-  .public-padded-l-0 {
-    padding-left: 0 !important;
-  }
-  
-  .public-padded-l-5 {
-    padding-left: 5px !important;
-  }
-  
-  .public-padded-l-10 {
-    padding-left: 10px !important;
-  }
-  
-  .public-padded-l-15 {
-    padding-left: 15px !important;
-  }
-  .public-padded-l-20 {
-    padding-left: 20px !important;
-  }
-  .public-padded-l-30 {
-    padding-left: 30px !important;
-  }
-  
-  .public-padded-r-0 {
-    padding-right: 0 !important;
-  }
-  
-  .public-padded-r-5 {
-    padding-right: 5px !important;
-  }
-  
-  .public-padded-r-10 {
-    padding-right: 10px !important;
-  }
-  
-  .public-padded-r-15 {
-    padding-right: 15px !important;
-  }
-  .public-padded-r-20 {
-    padding-right: 20px !important;
-  }
-  .public-padded-r-30 {
-    padding-right: 30px !important;
-  }
-  
-  .public-margin-0 {
-    margin: 0 !important;
-  }
-  
-  .public-margin-5 {
-    margin: 5px !important;
-  }
-  
-  .public-margin-10 {
-    margin: 10px !important;
-  }
-  
-  .public-margin-15 {
-    margin: 15px !important;
-  }
-  .public-margin-20 {
-    margin: 20px !important;
-  }
-  .public-margin-30 {
-    margin: 30px !important;
-  }
-  
-  
-  .public-margin-t-0 {
-    margin-top: 0px !important;
-  }
-  
-  .public-margin-t-5 {
-    margin-top: 5px !important;
-  }
-  
-  .public-margin-t-10 {
-    margin-top: 10px !important;
-  }
-  
-  .public-margin-t-15 {
-    margin-top: 15px !important;
-  }
-  .public-margin-t-20 {
-    margin-top: 20px !important;
-  }
-  .public-margin-t-30 {
-    margin-top: 30px !important;
-  }
-  
-  .public-margin-b-0 {
-    margin-bottom: 0 !important;
-  }
-  
-  .public-margin-b-5 {
-    margin-bottom: 5px !important;
-  }
-  
-  .public-margin-b-10 {
-    margin-bottom: 10px !important;
-  }
-  
-  .public-margin-b-15 {
-    margin-bottom: 15px !important;
-  }
-  .public-margin-b-20 {
-    margin-bottom: 20px !important;
-  }
-  .public-margin-b-30 {
-    margin-bottom: 30px !important;
-  }
-  .public-margin-l-0 {
-    margin-left: 0 !important;
-  }
-  
-  .public-margin-l-5 {
-    margin-left: 5px !important;
-  }
-  
-  .public-margin-l-10 {
-    margin-left: 10px !important;
-  }
-  
-  .public-margin-l-15 {
-    margin-left: 15px !important;
-  }
-  .public-margin-l-20 {
-    margin-left: 20px !important;
-  }
-  .public-margin-l-30 {
-    margin-left: 30px !important;
-  }
-  
-  .public-margin-r-0 {
-    margin-right: 0 !important;
-  }
-  
-  .public-margin-r-5 {
-    margin-right: 5px !important;
-  }
-  
-  .public-margin-r-10 {
-    margin-right: 10px !important;
-  }
-  
-  .public-margin-r-15 {
-    margin-right: 15px !important;
-  }
-  .public-margin-r-20 {
-    margin-right: 20px !important;
-  }
-  .public-margin-r-30 {
-    margin-right: 30px !important;
-  }
-  
-  .zhezhao {
-    width: 100%;
-    height: 100%;
-    position: fixed;
-    top: 0;
-    left: 0;
-    background: rgba(0, 0, 0, 0.7);
-    z-index: 4;
-  }
-  
+}
+
+/* flex */
+.public-flex {
+  display: flex;
+  align-items: center;
+}
+
+.public-flex-around {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+
+.public-flex-center {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.public-flex-between {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.public-flex-end {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+.public-flex-column {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.public-flex-around-column {
+  display: flex;
+  justify-content: space-around;
+  flex-direction: column;
+}
+
+.public-flex-between-column {
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+}
+
+.public-flex-center-column {
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+}
+
+.flex {
+  flex: 1;
+}
+
+.public-color {
+  color: #e85298;
+}
+
+.white {
+  color: #fff !important;
+}
+
+.public-font-size-12 {
+  font-size: 12px !important;
+}
+
+.public-font-size-14 {
+  font-size: 14px !important;
+}
+
+.public-font-size-15 {
+  font-size: 15px !important;
+}
+
+.public-font-size-16 {
+  font-size: 16px !important;
+}
+
+.public-font-size-17 {
+  font-size: 17px !important;
+}
+
+.public-font-size-18 {
+  font-size: 18px !important;
+}
+
+.public-font-size-20 {
+  font-size: 20px !important;
+}
+
+.public-font-size-22 {
+  font-size: 22px !important;
+}
+
+.public-font-size-24 {
+  font-size: 24px !important;
+}
+
+/* 边距 */
+/*内外边距类*/
+.public-padded-0 {
+  padding: 0 !important;
+}
+
+.public-padded-5 {
+  padding: 5px !important;
+}
+
+.public-padded-10 {
+  padding: 10px !important;
+}
+
+.public-padded-15 {
+  padding: 15px !important;
+}
+
+.public-padded-20 {
+  padding: 20px !important;
+}
+
+.public-padded-30 {
+  padding: 30px !important;
+}
+
+.public-padded-t-0 {
+  padding-top: 0 !important;
+}
+
+.public-padded-t-5 {
+  padding-top: 5px !important;
+}
+
+.public-padded-t-10 {
+  padding-top: 10px !important;
+}
+
+.public-padded-t-15 {
+  padding-top: 15px !important;
+}
+
+.public-padded-t-20 {
+  padding-top: 20px !important;
+}
+
+.public-padded-b-0 {
+  padding-bottom: 0 !important;
+}
+
+.public-padded-b-5 {
+  padding-bottom: 5px !important;
+}
+
+.public-padded-b-10 {
+  padding-bottom: 10px !important;
+}
+
+.public-padded-b-15 {
+  padding-bottom: 15px !important;
+}
+
+.public-padded-b-20 {
+  padding-bottom: 20px !important;
+}
+
+.public-padded-b-30 {
+  padding-bottom: 30px !important;
+}
+
+.public-padded-l-0 {
+  padding-left: 0 !important;
+}
+
+.public-padded-l-5 {
+  padding-left: 5px !important;
+}
+
+.public-padded-l-10 {
+  padding-left: 10px !important;
+}
+
+.public-padded-l-15 {
+  padding-left: 15px !important;
+}
+
+.public-padded-l-20 {
+  padding-left: 20px !important;
+}
+
+.public-padded-l-30 {
+  padding-left: 30px !important;
+}
+
+.public-padded-r-0 {
+  padding-right: 0 !important;
+}
+
+.public-padded-r-5 {
+  padding-right: 5px !important;
+}
+
+.public-padded-r-10 {
+  padding-right: 10px !important;
+}
+
+.public-padded-r-15 {
+  padding-right: 15px !important;
+}
+
+.public-padded-r-20 {
+  padding-right: 20px !important;
+}
+
+.public-padded-r-30 {
+  padding-right: 30px !important;
+}
+
+.public-margin-0 {
+  margin: 0 !important;
+}
+
+.public-margin-5 {
+  margin: 5px !important;
+}
+
+.public-margin-10 {
+  margin: 10px !important;
+}
+
+.public-margin-15 {
+  margin: 15px !important;
+}
+
+.public-margin-20 {
+  margin: 20px !important;
+}
+
+.public-margin-30 {
+  margin: 30px !important;
+}
+
+
+.public-margin-t-0 {
+  margin-top: 0px !important;
+}
+
+.public-margin-t-5 {
+  margin-top: 5px !important;
+}
+
+.public-margin-t-10 {
+  margin-top: 10px !important;
+}
+
+.public-margin-t-15 {
+  margin-top: 15px !important;
+}
+
+.public-margin-t-20 {
+  margin-top: 20px !important;
+}
+
+.public-margin-t-30 {
+  margin-top: 30px !important;
+}
+
+.public-margin-b-0 {
+  margin-bottom: 0 !important;
+}
+
+.public-margin-b-5 {
+  margin-bottom: 5px !important;
+}
+
+.public-margin-b-10 {
+  margin-bottom: 10px !important;
+}
+
+.public-margin-b-15 {
+  margin-bottom: 15px !important;
+}
+
+.public-margin-b-20 {
+  margin-bottom: 20px !important;
+}
+
+.public-margin-b-30 {
+  margin-bottom: 30px !important;
+}
+
+.public-margin-l-0 {
+  margin-left: 0 !important;
+}
+
+.public-margin-l-5 {
+  margin-left: 5px !important;
+}
+
+.public-margin-l-10 {
+  margin-left: 10px !important;
+}
+
+.public-margin-l-15 {
+  margin-left: 15px !important;
+}
+
+.public-margin-l-20 {
+  margin-left: 20px !important;
+}
+
+.public-margin-l-30 {
+  margin-left: 30px !important;
+}
+
+.public-margin-r-0 {
+  margin-right: 0 !important;
+}
+
+.public-margin-r-5 {
+  margin-right: 5px !important;
+}
+
+.public-margin-r-10 {
+  margin-right: 10px !important;
+}
+
+.public-margin-r-15 {
+  margin-right: 15px !important;
+}
+
+.public-margin-r-20 {
+  margin-right: 20px !important;
+}
+
+.public-margin-r-30 {
+  margin-right: 30px !important;
+}
+
+.zhezhao {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.7);
+  z-index: 4;
+}

ruoyi-ui/src/views/crmSystem/approveQuery/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <el-tabs @tab-click="handleClick">
-      <el-tab-pane label="未完成">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="未完成" name="1">
         <el-table
           :header-cell-style="{ background: '#f8f8f9' }"
-          v-loading="loading1"
+          v-loading="loading"
           :data="myList"
         >
           <el-table-column type="selection" width="55" align="center" />
@@ -54,33 +54,46 @@
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:file:edit']"
-                >修改</el-button
+                @click="handleManage(scope.row)"
+                >处理</el-button
               >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleRevocation(scope.row)"
+                >撤回</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleDetail(scope.row)"
+                >详情</el-button
+              >
+
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:file:remove']"
                 >删除</el-button
               >
             </template>
           </el-table-column>
         </el-table>
         <pagination
-          v-show="total1 > 0"
-          :total="total1"
-          :page.sync="queryParams1.pageNum"
-          :limit.sync="queryParams1.pageSize"
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
           @pagination="getList1"
         />
       </el-tab-pane>
-      <el-tab-pane label="正在处理">
+      <el-tab-pane label="正在处理" name="2">
         <el-table
           :header-cell-style="{ background: '#f8f8f9' }"
-          v-loading="loading2"
+          v-loading="loading"
           :data="myList"
         >
           <el-table-column
@@ -125,16 +138,29 @@
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:file:edit']"
-                >修改</el-button
+                @click="handleManage(scope.row)"
+                >处理</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleRevocation(scope.row)"
+                >撤回</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleDetail(scope.row)"
+                >详情</el-button
               >
+
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:file:remove']"
                 >删除</el-button
               >
             </template>
@@ -142,17 +168,17 @@
         </el-table>
 
         <pagination
-          v-show="total2 > 0"
-          :total="total2"
-          :page.sync="queryParams2.pageNum"
-          :limit.sync="queryParams2.pageSize"
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
           @pagination="getList2"
         />
       </el-tab-pane>
-      <el-tab-pane label="已完成">
+      <el-tab-pane label="已完成" name="3">
         <el-table
           :header-cell-style="{ background: '#f8f8f9' }"
-          v-loading="loading3"
+          v-loading="loading"
           :data="myEndList"
         >
           <!-- "客户名称","申请人","部门" ,"员工状态","职位","申请时间",
@@ -179,16 +205,29 @@
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:file:edit']"
-                >修改</el-button
+                @click="handleManage(scope.row)"
+                >处理</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleRevocation(scope.row)"
+                >撤回</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleDetail(scope.row)"
+                >详情</el-button
               >
+
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:file:remove']"
                 >删除</el-button
               >
             </template>
@@ -196,173 +235,122 @@
         </el-table>
 
         <pagination
-          v-show="total3 > 0"
-          :total="total3"
-          :page.sync="queryParams3.pageNum"
-          :limit.sync="queryParams3.pageSize"
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
           @pagination="getList3"
         />
       </el-tab-pane>
     </el-tabs>
-
-    <!-- 添加或修改DGT请假流程审批对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="原文件名" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入原文件名" />
-        </el-form-item>
-        <el-form-item label="文件路径" prop="filePath">
-          <el-input v-model="form.filePath" placeholder="请输入文件路径" />
-        </el-form-item>
-        <el-form-item label="新文件名" prop="newFileName">
-          <el-input v-model="form.newFileName" placeholder="请输入新文件名" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-// import { listFile, getFile, delFile, addFile, updateFile } from "@/api/system/file";
-
+// import { listFile1,listFile2,listFile3, getFile, delFile, addFile, updateFile } from "@/api/system/file";
 export default {
   name: "myTaskIndex",
   data() {
     return {
+      // tab首选项
+      activeName: "1",
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 总条数
+      total: 0,
       // 遮罩层
-      loading1: false,
-      loading2: false,
-      loading3: false,
+      loading: false,
       // 选中数组
       ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total1: 0,
-      total2: 0,
-      total3: 0,
-      // DGT请假流程审批表格数据
+      // tab不同状态的表格数据
       myTaskList: [],
       myList: [],
       myEndList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams1: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      // 查询参数
-      queryParams2: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      // 查询参数
-      queryParams3: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        leaveAuditId: [
-          { required: true, message: "$comment不能为空", trigger: "blur" },
-        ],
-      },
     };
   },
   created() {
     // this.getList();
   },
   methods: {
-    submitForm() {},
-    /** 查询DGT请假流程审批列表 */
+    // tab获取列表
+    getList() {
+      if (this.activeName === "1") {
+        this.getList1();
+      } else if (this.activeName === "2") {
+        this.getList2();
+      } else {
+        this.getList3();
+      }
+    },
+    /** 查询未完成列表 */
     getList1() {
-      this.loading1 = true;
-      listFile(this.queryParams1).then((response) => {
+      this.loading = true;
+      listFile1(this.queryParams).then((response) => {
         this.myTaskList = response.rows;
-        this.total1 = response.total;
-        this.loading1 = false;
+        this.total = response.total;
+        this.loading = false;
       });
     },
+    /** 查询正在处理列表 */
     getList2() {
-      this.loading2 = true;
-      listFile(this.queryParams2).then((response) => {
+      this.loading = true;
+      listFile2(this.queryParams).then((response) => {
         this.myList = response.rows;
-        this.total2 = response.total;
-        this.loading2 = false;
+        this.total = response.total;
+        this.loading = false;
       });
     },
-    getList3() {},
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        leaveAuditId: null,
-        fileName: null,
-        filePath: null,
-        fileType: null,
-        newFileName: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams1.pageNum = 1;
-      this.queryParams2.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+    /** 查询已完成列表 */
+    getList3() {
+      this.loading = true;
+      listFile3(this.queryParams).then((response) => {
+        this.myEndList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
+    // tab
     handleClick(tab, event) {
-      console.log(tab, event);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加DGT请假流程审批";
+      this.queryParams.pageNum = 1;
+      this.activeName = tab.name;
+      this.getList();
     },
+
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getFile(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改DGT请假流程审批";
-      });
+    },
+    // 处理
+    handleManage(row) {
+      const ids = row.id || this.ids;
+    },
+    // 撤回
+    handleRevocation(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认撤回该条数据?")
+        .then(function () {
+          // return delFile(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("撤回成功");
+        })
+        .catch(() => {});
+    },
+    // 详情
+    handleDetail(row) {
+      const ids = row.id || this.ids;
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除DGT请假流程审批编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除该条数据?")
         .then(function () {
           return delFile(ids);
         })

ruoyi-ui/src/views/crmSystem/customerInformation/add.vue

@@ -112,12 +112,11 @@
                 :style="{ width: '100%' }"
               >
                 <el-option
-                  v-for="(item, index) in currencyOptions"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled"
-                ></el-option>
+                  v-for="dict in dict.type.currency_of_registered_capital"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -162,31 +161,22 @@
                 :style="{ width: '100%' }"
               >
                 <el-option
-                  v-for="(item, index) in tradeOptions"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled"
-                ></el-option>
+                  v-for="dict in dict.type.CUSTOMER_TRADE"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="申请部门" prop="responsibleDept">
-              <el-select
+              <el-input
                 v-model="formData.responsibleDept"
-                placeholder="请选择申请部门"
+                placeholder="请输入申请部门"
                 clearable
                 :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in responsibleDeptOptions"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled"
-                ></el-option>
-              </el-select>
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -208,12 +198,11 @@
                 :style="{ width: '100%' }"
               >
                 <el-option
-                  v-for="(item, index) in customerNatureOptions"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled"
-                ></el-option>
+                  v-for="dict in dict.type.CUSTOMER_NATURE"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -226,12 +215,11 @@
                 :style="{ width: '100%' }"
               >
                 <el-option
-                  v-for="(item, index) in customerTypeOptions"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled"
-                ></el-option>
+                  v-for="dict in dict.type.PROJECT_TYPE"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -244,27 +232,49 @@
                 :style="{ width: '100%' }"
               >
                 <el-option
-                  v-for="(item, index) in statusOptions"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled"
-                ></el-option>
+                  v-for="dict in dict.type.CUSTOMER_STATUS"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="其他性质" prop="otherNature">
+              <el-input
+                v-model="formData.otherNature"
+                placeholder="请输入其他性质"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="其他类型" prop="otherCategory">
+              <el-input
+                v-model="formData.otherCategory"
+                placeholder="请输入其他类型"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
-            <el-form-item label="相关资料" prop="field121" required>
+            <el-form-item label="相关资料" prop="fileMap" required>
               <el-upload
-                ref="field121"
-                :file-list="field121fileList"
+                ref="fileMap"
+                :file-list="fileMapfileList"
                 :action="imageFileAction"
-                :before-upload="field121BeforeUpload"
+                :before-upload="fileMapBeforeUpload"
               >
                 <el-button size="small" type="primary" icon="el-icon-upload"
                   >点击上传</el-button
                 >
               </el-upload>
+              <span style="color: red">&nbsp;&nbsp;必须上传营业执照</span>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -278,16 +288,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="注册资本金（万元）" prop="currency">
-              <el-input
-                v-model="formData.currency"
-                placeholder="请输入注册资本金（万元）"
-                clearable
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
         </el-row>
         <!-- 客户联系人 -->
         <el-row :gutter="30" v-show="active === 1">
@@ -646,9 +646,17 @@
 </template>
 <script>
 export default {
-  name:"customerInformationAdd",
+  name: "customerInformationAdd",
   components: {},
-  props: [],
+  dicts: [
+    "CUSTOMER_STATUS", //客户状态
+    "audit_status", //审核状态
+    "start_using_yes_no", //是否启用
+    "CUSTOMER_NATURE", //企业性质
+    "CUSTOMER_TRADE", //客户行业
+    "currency_of_registered_capital", //注册资本金币种
+    "PROJECT_TYPE", //类型
+  ],
   data() {
     return {
       active: 0,
@@ -671,7 +679,7 @@ export default {
         customerNature: undefined,
         customerType: undefined,
         status: undefined,
-        field121: null,
+        fileMap: null,
         mark: undefined,
         currency: undefined,
       },
@@ -818,17 +826,8 @@ export default {
         ],
       },
       imageFileAction: "https://jsonplaceholder.typicode.com/posts/",
-      field121fileList: [],
-      currencyOptions: [
-        {
-          label: "选项一",
-          value: 1,
-        },
-        {
-          label: "选项二",
-          value: 2,
-        },
-      ],
+      fileMapfileList: [],
+
       tradeOptions: [
         {
           label: "选项一",
@@ -975,7 +974,15 @@ export default {
       if (this.active-- <= 0) this.active = 0;
     },
     next() {
-      if (this.active++ >= 2) this.active = 0;
+      this.$refs["elForm"].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+          if (this.active++ >= 2) this.active = 0;
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
     },
     submitForm() {
       this.$refs["elForm"].validate((valid) => {
@@ -986,7 +993,7 @@ export default {
     resetForm() {
       this.$refs["elForm"].resetFields();
     },
-    field121BeforeUpload(file) {
+    fileMapBeforeUpload(file) {
       let isRightSize = file.size / 1024 / 1024 < 2;
       if (!isRightSize) {
         this.$message.error("文件大小超过 2MB");

ruoyi-ui/src/views/crmSystem/customerInformation/index.vue

@@ -8,41 +8,130 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="客户编号" prop="customerCode">
-        <el-input
-          v-model="queryParams.customerCode"
-          placeholder="请输入客户编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户名称" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="全部" clearable>
-          <el-option
-            v-for="(item, index) in statusOptions"
-            :key="index"
-            :label="item.dictname"
-            :value="item.dictvalue"
-            :disabled="item.disabled"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="登记日期" prop="createdDate">
-        <el-input
-          v-model="queryParams.createdDate"
-          placeholder="请输入登记日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      <el-collapse class="searchCollapse">
+        <el-collapse-item>
+          <template slot="title">
+            <div class="titleWrapper">
+              <el-form-item label="客户名称" prop="customerName">
+                <el-input
+                  v-model="queryParams.customerName"
+                  placeholder="请输入客户名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="客户编号" prop="customerCode">
+                <el-input
+                  v-model="queryParams.customerCode"
+                  placeholder="请输入客户编号"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+
+              <el-form-item label="客户状态" prop="status">
+                <el-select
+                  v-model="queryParams.status"
+                  placeholder="全部"
+                  clearable
+                >
+                  <el-option
+                    v-for="dict in dict.type.CUSTOMER_STATUS"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="登记日期" prop="createdDate">
+                <el-date-picker
+                  v-model="queryParams.createdDate"
+                  type="date"
+                  placeholder="请选择登记日期"
+                  style="width: 205.4px"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </div>
+          </template>
+          <div class="infoWrapper">
+            <el-form-item label="登记人" prop="createdBy">
+              <el-input
+                v-model="queryParams.createdBy"
+                placeholder="请输入登记人"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="审核状态" prop="state">
+              <el-select
+                v-model="queryParams.state"
+                placeholder="全部"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.audit_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否启用" prop="isOpen">
+              <el-select
+                v-model="queryParams.isOpen"
+                placeholder="全部"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.start_using_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="企业性质" prop="customerNature">
+              <el-select
+                v-model="queryParams.customerNature"
+                placeholder="全部"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.CUSTOMER_NATURE"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="申请部门" prop="responsibleDept">
+              <treeselect
+                v-model="queryParams.responsibleDept"
+                :options="deptOptions"
+                :show-count="true"
+                placeholder="全部"
+                style="width: 489px"
+              />
+            </el-form-item>
+            <el-form-item label="行业" prop="trade">
+              <el-select
+                v-model="queryParams.trade"
+                placeholder="全部"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.CUSTOMER_TRADE"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
       <el-form-item>
         <el-button
           type="primary"
@@ -56,6 +145,7 @@
         >
       </el-form-item>
     </el-form>
+
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -67,7 +157,7 @@
           >新增客户</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -76,14 +166,14 @@
           @click="handleApprovePopAdd"
           >指定审批人员</el-button
         >
-      </el-col>
+      </el-col> -->
     </el-row>
     <el-table
       :header-cell-style="{ background: '#f8f8f9' }"
       v-loading="loading"
       :data="myTaskList"
-      @selection-change="handleSelectionChange"
     >
+      <!--  @selection-change="handleSelectionChange" -->
       <el-table-column fixed type="selection" width="55" align="center" />
       <el-table-column
         fixed
@@ -178,16 +268,21 @@
   </div>
 </template>
 <script>
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
+  name: "customerInformationIndex",
+  dicts: [
+    "CUSTOMER_STATUS",//客户状态
+    "audit_status",//审核状态
+    "start_using_yes_no",//是否启用
+    "CUSTOMER_NATURE",//企业性质
+    "CUSTOMER_TRADE",//客户行业
+  ],
+  components: { Treeselect },
   data() {
     return {
-      title: "",
-      open: false,
-      loading: false,
-      form: {
-        financeDept: null,
-        lawDept: null,
-      },
       // 显示搜索条件
       showSearch: true,
       // 查询参数
@@ -198,27 +293,67 @@ export default {
         customerName: null,
         status: null,
         createdDate: null,
+        state: null,
+        isOpen: null,
+        customerNature: null,
+        responsibleDept: null,
+        trade: null,
+      },
+      // 部门树选项
+      deptOptions: [],
+      loading: false,
+      open: false,
+      title: "",
+      form: {
+        financeDept: null,
+        lawDept: null,
       },
-      statusOptions: [],
+      rules: {},
       myTaskList: [],
       financeDeptOptions: [],
       lawDeptOptions: [],
-      rules: {},
     };
   },
-  created() {},
+  created() {
+    // this.getList();
+    this.getDeptTree();
+  },
   mounted() {},
   methods: {
-    submitForm() {},
-    cancel() {},
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
+    /** 查询客户信息列表 */
+    getList() {
+      this.loading = true;
+      listFile(this.queryParams).then((response) => {
+        this.myTaskList = response.rows;
+        this.total1 = response.total;
+        this.loading = false;
+      });
+    },
+    // 新增客户
     handleUserPopAdd() {
       this.$router.push({ name: "customerInformationAdd" });
     },
+    // 指定审批人员
     handleApprovePopAdd() {
       this.reset();
       this.title = "指定审批人员";
       this.open = true;
     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 指定审批人员
+    submitForm() {
+      this.open = false;
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -227,19 +362,10 @@ export default {
       };
       this.resetForm("form");
     },
-    /** 查询DGT请假流程审批列表 */
-    getList() {
-      this.loading = true;
-      listFile(this.queryParams1).then((response) => {
-        this.myTaskList = response.rows;
-        this.total1 = response.total;
-        this.loading = false;
-      });
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      // this.getList();
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {

ruoyi-ui/src/views/crmSystem/myTask/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form
-      :model="queryParams1"
+      :model="queryParams"
       ref="queryForm"
       size="small"
       :inline="true"
@@ -10,7 +10,7 @@
     >
       <el-form-item label="客户编号" prop="customerCode">
         <el-input
-          v-model="queryParams1.customerCode"
+          v-model="queryParams.customerCode"
           placeholder="请输入客户编号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -18,7 +18,7 @@
       </el-form-item>
       <el-form-item label="客户名称" prop="customerName">
         <el-input
-          v-model="queryParams1.customerName"
+          v-model="queryParams.customerName"
           placeholder="请输入客户名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -38,13 +38,12 @@
       </el-form-item>
     </el-form>
 
-    <el-tabs @tab-click="handleClick">
-      <el-tab-pane label="我的代办任务">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="我的代办任务" name="1">
         <el-table
           :header-cell-style="{ background: '#f8f8f9' }"
-          v-loading="loading1"
+          v-loading="loading"
           :data="myTaskList"
-          @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column
@@ -74,7 +73,6 @@
             align="center"
             prop="taskDefinitionKey"
           /> -->
-
           <el-table-column
             label="操作"
             align="center"
@@ -85,16 +83,33 @@
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:file:edit']"
-                >修改</el-button
+                @click="handleManage(scope.row)"
+                >处理</el-button
               >
+              <!-- 
+                v-hasPermi="['system:file:edit']" -->
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleRevocation(scope.row)"
+                >撤回</el-button
+              >
+              <!-- 
+                v-hasPermi="['system:file:revocation']" -->
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleDetail(scope.row)"
+                >详情</el-button
+              >
+
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:file:remove']"
                 >删除</el-button
               >
             </template>
@@ -102,17 +117,17 @@
         </el-table>
 
         <pagination
-          v-show="total1 > 0"
-          :total="total1"
-          :page.sync="queryParams1.pageNum"
-          :limit.sync="queryParams1.pageSize"
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
           @pagination="getList1"
         />
       </el-tab-pane>
-      <el-tab-pane label="我的单据">
+      <el-tab-pane label="我的单据" name="2">
         <el-table
           :header-cell-style="{ background: '#f8f8f9' }"
-          v-loading="loading2"
+          v-loading="loading"
           :data="myList"
         >
           <el-table-column type="selection" width="55" align="center" />
@@ -159,16 +174,33 @@
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:file:edit']"
-                >修改</el-button
+                @click="handleManage(scope.row)"
+                >处理</el-button
+              >
+              <!-- 
+                v-hasPermi="['system:file:edit']" -->
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleRevocation(scope.row)"
+                >撤回</el-button
               >
+              <!-- 
+                v-hasPermi="['system:file:revocation']" -->
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleDetail(scope.row)"
+                >详情</el-button
+              >
+
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['system:file:remove']"
                 >删除</el-button
               >
             </template>
@@ -176,46 +208,39 @@
         </el-table>
 
         <pagination
-          v-show="total2 > 0"
-          :total="total2"
-          :page.sync="queryParams2.pageNum"
-          :limit.sync="queryParams2.pageSize"
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
           @pagination="getList2"
         />
       </el-tab-pane>
     </el-tabs>
-
-    <!-- 添加或修改DGT请假流程审批对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="原文件名" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入原文件名" />
-        </el-form-item>
-        <el-form-item label="文件路径" prop="filePath">
-          <el-input v-model="form.filePath" placeholder="请输入文件路径" />
-        </el-form-item>
-        <el-form-item label="新文件名" prop="newFileName">
-          <el-input v-model="form.newFileName" placeholder="请输入新文件名" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-// import { listFile, getFile, delFile, addFile, updateFile } from "@/api/system/file";
+// import { listFile1,listFile2, getFile, delFile, updateFile } from "@/api/system/file";
 
 export default {
   name: "myTaskIndex",
   data() {
     return {
+      // 查询表单参数
+      form: {},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        customerCode: null,
+        customerName: null,
+      },
+      // 总条数
+      total: 0,
+      // tab首选项
+      activeName: "1",
       // 遮罩层
-      loading1: false,
-      loading2: false,
+      loading: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -224,83 +249,44 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
-      // 总条数
-      total1: 0,
-      total2: 0,
       // DGT请假流程审批表格数据
       myTaskList: [],
       myList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams1: {
-        pageNum: 1,
-        pageSize: 10,
-        customerCode: null,
-        customerName: null,
-      },
-      // 查询参数
-      queryParams2: {
-        pageNum: 1,
-        pageSize: 10,
-        customerCode: null,
-        customerName: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        leaveAuditId: [
-          { required: true, message: "$comment不能为空", trigger: "blur" },
-        ],
-      },
     };
   },
   created() {
     // this.getList();
   },
   methods: {
-    submitForm() {},
-    /** 查询DGT请假流程审批列表 */
+    // tab获取列表
+    getList() {
+      if (this.activeName === "1") {
+        this.getList1();
+      } else if (this.activeName === "2") {
+        this.getList2();
+      }
+    },
+    /** 查询我的代办任务列表 */
     getList1() {
-      this.loading1 = true;
-      listFile(this.queryParams1).then((response) => {
+      this.loading = true;
+      listFile(this.queryParams).then((response) => {
         this.myTaskList = response.rows;
-        this.total1 = response.total;
-        this.loading1 = false;
+        this.total = response.total;
+        this.loading = false;
       });
     },
+    /** 查询我的单据列表 */
     getList2() {
-      this.loading2 = true;
-      listFile(this.queryParams2).then((response) => {
+      this.loading = true;
+      listFile(this.queryParams).then((response) => {
         this.myList = response.rows;
-        this.total2 = response.total;
-        this.loading2 = false;
+        this.total = response.total;
+        this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        leaveAuditId: null,
-        fileName: null,
-        filePath: null,
-        fileType: null,
-        newFileName: null,
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams1.pageNum = 1;
-      this.queryParams2.pageNum = 1;
+      this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -308,36 +294,46 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加DGT请假流程审批";
+    //切换tab
+    handleClick(tab) {
+      this.queryParams.pageNum = 1;
+      this.activeName = tab.name;
+      this.getList();
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
       const id = row.id || this.ids;
-      getFile(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改DGT请假流程审批";
-      });
+      // getFile(id).then((response) => {
+      //   this.form = response.data;
+      // });
+    },
+    // 处理
+    handleManage(row) {
+      const ids = row.id || this.ids;
+    },
+    // 撤回
+    handleRevocation(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认撤回该条数据?")
+        .then(function () {
+          // return delFile(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("撤回成功");
+        })
+        .catch(() => {});
+    },
+    // 详情
+    handleDetail(row) {
+      const ids = row.id || this.ids;
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除DGT请假流程审批编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除该条数据?")
         .then(function () {
           return delFile(ids);
         })