增加为取消和批量取消分享；增加分享审核和批量审核

src/api/user/share.js

@@ -3,6 +3,7 @@
 /**
  * 分享相关接口
  */
+import qs from 'qs'
 import request from '@/utils/request'
 const baseUrl = '/v1/api'
 
@@ -31,6 +32,16 @@ export const getMyShareList = params => {
     })
 }
 
+// 取消分享（个人使用）
+export const removeShare = params => {
+    return request({
+        url: baseUrl + '/folder/share/removeShare',
+        method: 'get',
+        params
+    })
+}
+
+
 // 分享管理列表（管理员使用）
 export const getAdminShareList = params => {
     return request({
@@ -41,3 +52,13 @@ export const getAdminShareList = params => {
 }
 
 
+// 分享审核（管理员使用）
+export const verifyShare = data => {
+    return request({
+        url: baseUrl + '/folder/share/verifyShare',
+        method: 'post',
+        data: qs.stringify(data),
+        headers: { 'content-type': 'application/x-www-form-urlencoded' }
+    })
+}
+

src/components/file/dialog/shareFile/Dialog.vue

@@ -50,8 +50,6 @@
           valueKey="userId"
           :paginationOption="setSelectPage"
         />
-        <!-- {{ userListAllByLocal }} -->
-        <!-- <div v-if="form.shareType == 2">人员列表</div> -->
       </el-form-item>
       <!-- <el-form-item label="链接有效期至" prop="endTime">
         <el-date-picker
@@ -73,7 +71,7 @@
         </el-radio-group>
       </el-form-item> -->
     </el-form>
-    <el-form
+    <!-- <el-form
       v-if="shareIsSuccess"
       class="share-success-form"
       :model="shareData"
@@ -100,7 +98,7 @@
           :readonly="true"
         ></el-input>
       </el-form-item>
-    </el-form>
+    </el-form> -->
     <div slot="footer" class="dialog-footer">
       <el-button
         v-if="shareIsSuccess"
@@ -129,6 +127,12 @@ import store from "@/store/index.js";
 import { shareFile } from "@/api/qwFile";
 import { deptTreeSelect, listUser } from "@/api/system/user";
 import PaginationSelector from "@/components/PaginationSelector";
+const shareTypeConstant = {
+  PUBLIC_SHARE: 0, //分享给公共社区
+  DEPT_SHARE: 1, //分享给部门
+  PERSONAL_SHARE: 2, //分享给个人
+};
+
 export default {
   name: "ShareFileDialog",
   components: {
@@ -229,20 +233,20 @@ export default {
       return store.state.common.screenWidth;
     },
     getChooseDataLabel() {
-      if (this.form.shareType == 1) {
+      if (this.form.shareType == shareTypeConstant.DEPT_SHARE) {
         return "选择部门";
-      } else if (this.form.shareType == 2) {
+      } else if (this.form.shareType == shareTypeConstant.PERSONAL_SHARE) {
         return "选择个人";
       }
     },
   },
   watch: {
     "form.shareType"(value) {
-      if (value == 1) {
+      if (value == shareTypeConstant.DEPT_SHARE) {
         this.getDeptTree();
         // 清空人员的选择
         this.clearCheckedUser();
-      } else if (value == 2) {
+      } else if (value == shareTypeConstant.PERSONAL_SHARE) {
         this.getUserList();
         // 清空部门的选择
         this.clearCheckedDept();
@@ -289,8 +293,9 @@ export default {
             .then((res) => {
               this.sureBtnLoading = false;
               if (res.code == 200) {
-                this.shareData = res.data;
-                this.shareIsSuccess = true;
+                // this.shareData = res.data;
+                // this.shareIsSuccess = true;
+                this.$message.success("分享成功！");
                 this.callback("confirm");
               } else {
                 this.$message.error(res.message);

src/views/manage/shareManage/constant.js

@@ -8,6 +8,7 @@ export const shareTypeConstant = {
 // 分享状态
 export const shareStatusConstant = {
     SHARED: 0, //已分享
-    EXPIRED: 1,//已失效
+    IS_REVIEW: 1,//审核中 仅部门和社区需要审核，分享到个人不需要审核
     REVOKED: 2,//已撤销
+    REJECTED: 3,//已驳回
 }
\ No newline at end of file

src/views/mine/myShare/index.vue

@@ -47,21 +47,20 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-       <el-button
-          type="primary"
-          plain
-          size="mini"
-          :disabled="multiple"
-          @click.native="handleMultiRevoke"
-          ><svg-icon icon-class="revoke" class="mr5"> </svg-icon>批量撤销分享</el-button
-        >
-      </el-col>
+    <div class="mb8">
+      <el-button
+        type="primary"
+        plain
+        size="mini"
+        :disabled="multiple"
+        @click.native="handleMultiRevoke"
+        >批量取消分享</el-button
+      >
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
-    </el-row>
+    </div>
     <el-table
       v-loading="loading"
       :data="shareList"
@@ -73,14 +72,17 @@
         align="center"
         prop="fileName"
         :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="分享截止时间"
-        align="center"
-        prop="endTime"
-        width="180"
       >
+        <template slot-scope="scope">
+          <div class="fileName">
+            <img :src="$file.setFileImg(scope.row)" />
+            <el-link @click="handleOpenFile(scope.row)">
+              {{ scope.row.fileName }}
+            </el-link>
+          </div>
+        </template>
       </el-table-column>
+
       <el-table-column
         label="分享类型"
         align="center"
@@ -103,9 +105,9 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="备注"
+        label="审核意见"
         align="center"
-        prop="remark"
+        prop="verifyDesc"
         :show-overflow-tooltip="true"
       />
 
@@ -115,10 +117,21 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-link type="primary" style="margin-right: 16px">
-            <svg-icon icon-class="revoke"> </svg-icon>撤销分享
+          <el-link
+            v-if="scope.row.shareStatus == shareStatusConstant.SHARED"
+            type="primary"
+            style="margin-right: 16px"
+            @click="handleCancelShare(scope.row.shareId)"
+          >
+            <svg-icon icon-class="revoke"> </svg-icon>取消分享
+          </el-link>
+          <el-link
+            type="primary"
+            icon="el-icon-view"
+            @click="handleOpenFile(scope.row)"
+          >
+            预览
           </el-link>
-          <el-link type="primary" icon="el-icon-view"> 预览 </el-link>
         </template>
       </el-table-column>
     </el-table>
@@ -129,11 +142,37 @@
       :limit.sync="queryParams.pageCount"
       @pagination="getList"
     />
+    <el-dialog
+      title="批量取消"
+      :visible.sync="multiCancelVisible"
+      width="400px"
+    >
+      <div class="multi-verify">
+        <div class="text">
+          一共选择了{{ shareIdsArr.length }}条数据，是否确定批量取消分享？
+        </div>
+        <div class="buttons">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-check"
+            @click="handleSubmitMultiRemoveShare"
+            >确定</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleCloseMultiRemoveShare"
+            >取消</el-button
+          >
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getMyShareList } from "@/api/user/share";
+import { getMyShareList, removeShare } from "@/api/user/share";
 import { shareStatusConstant } from "./constant";
 
 export default {
@@ -144,7 +183,7 @@ export default {
       // 遮罩层
       loading: true,
       // 选中数组
-      ids: [],
+      shareIdsArr: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -170,6 +209,9 @@ export default {
       },
       // 分享状态常量
       shareStatusConstant,
+      // 批量取消的弹窗可见性
+      multiCancelVisible: false,
+      shareIdsArr: [],
     };
   },
   computed: {
@@ -178,10 +220,12 @@ export default {
         switch (shareStatus) {
           case shareStatusConstant.SHARED: //已分享
             return "success";
-          case shareStatusConstant.EXPIRED: //已失效
-            return "info";
+          case shareStatusConstant.IS_REVIEW: //审核中
+            return "primary";
           case shareStatusConstant.REVOKED: //已撤销
-            return "warning";
+            return "info";
+          case shareStatusConstant.REJECTED: //已驳回
+            return "danger";
         }
       };
     },
@@ -192,7 +236,7 @@ export default {
   methods: {
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.dictId);
+      this.shareIdsArr = selection.map((item) => item.shareId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -225,15 +269,55 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 取消分享
-    handleCancelShare(row) {
-      console.log(row);
+    // 点击取消分享
+    async handleCancelShare(fileIds) {
+      const params = {
+        fileIds,
+      };
+      let res = await removeShare(params);
+      if (res.code == 200) {
+        this.$message.success("取消分享成功！");
+        this.getList();
+      }
     },
     // 批量取消分享
-    handleMultiRevoke(){
-      console.log(this.ids);
-      
-    }
+    handleMultiRevoke() {
+      this.multiCancelVisible = true;
+    },
+    // 提交批量取消分享
+    handleSubmitMultiRemoveShare() {
+      const fileIds = this.shareIdsArr.join(",");
+      this.handleCancelShare(fileIds);
+      this.handleCloseMultiRemoveShare();
+    },
+    // 关闭批量取消分享
+    handleCloseMultiRemoveShare() {
+      this.multiCancelVisible = false;
+    },
+    // 点击打开文件
+    handleOpenFile(file) {
+      this.$file.handleFileNameClickNew(file);
+    },
   },
 };
 </script>
+<style lang="scss" scoped>
+.fileName {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  img {
+    width: 18px;
+    height: 18px;
+    object-fit: contain;
+    margin-right: 4px;
+  }
+}
+.multi-verify {
+  .buttons {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 16px;
+  }
+}
+</style>