浏览代码

权限自助-有效期不传时分秒,根据最新调整去除对接验证重复申请逻辑代码

林倩 3 年之前
父节点
当前提交
7afc1b350f

+ 7 - 29
src/pages/permission-selfhelp-manage/component/app-func-form.vue

@@ -27,7 +27,7 @@
 
 
 <script>
 <script>
 import transferTree from '@/pages/common/transfer-tree';
 import transferTree from '@/pages/common/transfer-tree';
-import { allAppFuncTree, userHasAuthFunIds, checkAppFunRepeat } from '@/api/permission-selfhelp-manage';
+import { allAppFuncTree, userHasAuthFunIds } from '@/api/permission-selfhelp-manage';
 export default {
 export default {
   props: {
   props: {
     selectKeys: [Array],
     selectKeys: [Array],
@@ -92,6 +92,10 @@ export default {
       const cancelContent = this.nodeTransferLabel(cancelKeys, this.data);
       const cancelContent = this.nodeTransferLabel(cancelKeys, this.data);
       // 获取目标树所有的key,包含父节点
       // 获取目标树所有的key,包含父节点
       const allKeys = this.$refs.transferTree.allKeyValue(false, this.$refs.transferTree.targetData);
       const allKeys = this.$refs.transferTree.allKeyValue(false, this.$refs.transferTree.targetData);
+      // 剔除该用户已经拥有的资源
+      // const validRepeatNode = resourceInfos
+      //   .filter((item) => !this.havefunIds.includes(item.funId))
+      //   .map((item) => item.funId);
       // 实际保存的节点,剔除应用节点
       // 实际保存的节点,剔除应用节点
       const resourceInfos = allKeys
       const resourceInfos = allKeys
         .map((item) => this.$refs.transferTree.$refs['to-tree'].getNode(item).data)
         .map((item) => this.$refs.transferTree.$refs['to-tree'].getNode(item).data)
@@ -107,36 +111,10 @@ export default {
       if (applyKeys.length == 0 && cancelKeys.length == 0) {
       if (applyKeys.length == 0 && cancelKeys.length == 0) {
         this.$message.warning('已选资源无变更。');
         this.$message.warning('已选资源无变更。');
       } else {
       } else {
-        // 需要验证是否有重复申请的资源,
-        const repeatFlag = await this.handleCheckRepeat(resourceInfos);
-        if (repeatFlag == '200') {
-          this.$emit('success', approveContent, cancelContent, this.selectedValue, resourceInfos);
-        }
+        this.$emit('success', approveContent, cancelContent, this.selectedValue, resourceInfos);
       }
       }
     },
     },
-    // 验证是否重复申请
-    handleCheckRepeat(resourceInfos) {
-      return new Promise((resolve) => {
-        // 剔除该用户已经拥有的资源
-        const validRepeatNode = resourceInfos
-          .filter((item) => !this.havefunIds.includes(item.funId))
-          .map((item) => item.funId);
-        let params = {
-          applicantIdcard: this.$store.getters.user.idcard,
-          addFunIds: validRepeatNode
-        };
-        if (this.applicantOrdNo) {
-          params['applicantOrdNo'] = this.applicantOrdNo;
-        }
-        checkAppFunRepeat(params).then((res) => {
-          const { result, msg } = res.data;
-          if (result !== '200') {
-            this.$message.warning(msg);
-          }
-          resolve(result);
-        });
-      });
-    },
+
     handleSearch(value, data) {
     handleSearch(value, data) {
       if (!value) return true;
       if (!value) return true;
       return data.label.indexOf(value) !== -1;
       return data.label.indexOf(value) !== -1;

+ 0 - 1
src/pages/permission-selfhelp-manage/component/basic-form.vue

@@ -202,7 +202,6 @@
                     start-placeholder="开始日期"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                     end-placeholder="结束日期"
                     value-format="yyyy-MM-dd HH:mm:ss"
                     value-format="yyyy-MM-dd HH:mm:ss"
-                    :default-time="['00:00:00', '23:59:59']"
                     v-show="sizeForm.permissionValidType !== '02'"
                     v-show="sizeForm.permissionValidType !== '02'"
                     :picker-options="pickerOptions"
                     :picker-options="pickerOptions"
                     clearable
                     clearable