bug修复

config/dev.env.js

@@ -34,8 +34,8 @@ module.exports = merge(prodEnv, {
     PROXY_TABLE: JSON.stringify({
         "/dcucauth": {
             // target: "http://10.11.1.237:8861"
-            target: "http://10.254.11.203:8861"
-            //  target: "http://192.168.10.2:8871"
+            // target: "http://10.254.11.203:8861"
+             target: "http://192.168.10.2:8871"
 
         }
     })

src/pages/admin-manage/add.vue

@@ -34,7 +34,7 @@
                         </el-form-item>
                     </dg-col>
                     <dg-col :span="12">
-                        <el-form-item label="所属单位">
+                        <el-form-item label="单位名称">
                             <org v-model="tempOrgId" :key="orgKey" type="APP" />
                         </el-form-item>
                     </dg-col>

src/pages/common/new-table/index.vue

@@ -22,7 +22,7 @@
       <dg-table-column v-if="selection" type="selection" reserve-selection width="55" align="center" />
       <dg-table-column type="index" label="序号" width="75" align="center" />
       <template v-for="item in tableHeader">
-        <dg-table-column :key="item.id" v-bind="item" align="center">
+        <dg-table-column :key="item[rowKey]" v-bind="item" align="center">
           <template slot-scope="{ row }">
             <span v-if="item.dateFormat">{{ row[item.prop] | dateFormatter(item.dateFormat) }}</span>
             <slot v-if="item.custom" v-bind:row="scope.row" :name="item.prop"></slot>
@@ -117,9 +117,9 @@ export default {
         let rowKeys = [];
         for (let j = 0; j < content.length; j++) {
           const cItem = content[j];
-          const index = this.newChooseArr.findIndex((item) => (item.id || item) == cItem.id);
+          const index = this.newChooseArr.findIndex((item) => (item[this.rowKey] || item) == cItem[this.rowKey]);
           if (index > -1) {
-            rowKeys.push(this.newChooseArr[index].id || this.newChooseArr[index]);
+            rowKeys.push(this.newChooseArr[index][this.rowKey]|| this.newChooseArr[index]);
           }
         }
         setTimeout(() => {
@@ -140,7 +140,7 @@ export default {
      */
     handleSelect(selection, row) {
       let copyAttr = _.cloneDeep(this.newChooseArr);
-      const index = this.newChooseArr.findIndex((item) => (item.id || item) == row.id);
+      const index = this.newChooseArr.findIndex((item) => (item[this.rowKey] || item) == row[this.rowKey]);
       if (index > -1) {
         copyAttr.splice(index, 1);
       } else {
@@ -157,7 +157,7 @@ export default {
       this.currentPageContent.forEach((row) => {
         // this.handleSelect([], element);
         let copyAttr = _.cloneDeep(this.newChooseArr);
-        const index = this.newChooseArr.findIndex((item) => (item.id || item) == row.id);
+        const index = this.newChooseArr.findIndex((item) => (item[this.rowKey] || item) == row[this.rowKey]);
         if (checked) {
           if (index < 0) {
             copyAttr.push(row);

src/pages/common/select-tree/index.vue

@@ -37,7 +37,7 @@ export default {
     },
     placeholder: {
       type: String,
-      default: '请选择所属单位'
+      default: '请选择单位名称'
     },
     filterable: {
       type: Boolean,

src/pages/common/time-line/index.vue

@@ -29,7 +29,7 @@
                     <p class="line-sub-title">
                         操作人：
                         <span class="line-sub-text">{{ childItem.operateUserName }}</span>
-                        &nbsp;&nbsp;&nbsp; 所属机构：
+                        &nbsp;&nbsp;&nbsp; 单位名称：
                         <span class="line-sub-text">{{ childItem.operateOrgName }}</span>
                         &nbsp;&nbsp;&nbsp; 操作时间：
                         <span class="line-sub-text">{{ childItem.operateTime }}</span>

src/pages/data-auth-module/auth-object-manage/object-prop-manage/function-list.vue

@@ -16,10 +16,10 @@
             <el-form-item label="身份证号码">
                 <el-input clearable placeholder="请输入身份证号码" v-model="cardForm.name"></el-input>
             </el-form-item>
-            <el-form-item label="所属单位">
+            <el-form-item label="单位名称">
                 <dg-tree-select
                     v-model="cardForm.institution"
-                    placeholder="请选择所属单位"
+                    placeholder="请选择单位名称"
                     :data="options"
                     clearable
                     filterable

src/pages/data-auth-module/auth-subject-manage/DataConfig.js

@@ -25,7 +25,7 @@ const UserTableData = [
     prop: 'policeNumber'
   },
   {
-    label: '所属机构',
+    label: '单位名称',
     custom: true,
     prop: 'orgName'
   },
@@ -80,7 +80,7 @@ const cardPersonnelList = [
     prop: ''
   },
   {
-    label: '所属单位',
+    label: '单位名称',
     prop: ''
   }
 ];
@@ -160,7 +160,7 @@ const typeData = {
     { label: '人员类型', value: 'userType', code: 'DM_MAN_TYPE' },
     { label: '职级', value: 'title', code: 'DM_CERT_DUTY_LEVEL' },
     // { label: "用户类别", value: "userType", enum: "UserTypeEnum" },
-    { label: '所属机构', value: 'orgName' },
+    { label: '单位名称', value: 'orgName' },
     { label: '警衔', value: 'rank', code: 'DM_POLICE_RANK' },
     { label: '警种', value: 'policeCategory', code: 'T_MD_POLICE_TYPE' },
     { label: '业务域', value: 'policeBusiness' }
@@ -170,7 +170,7 @@ const typeData = {
     { label: '性别', value: 'sex', code: 'DM_SEX' },
     { label: '身份证号码', value: 'idcard' },
     { label: '编号', value: 'policeNumber' },
-    { label: '所属机构', value: 'orgName' },
+    { label: '单位名称', value: 'orgName' },
     { label: '人员类型', value: 'auxiliaryType', code: 'DM_AUXILIARY_TYPE' },
     // { label: "用户类别", value: "userType", enum: "UserTypeEnum" },
     { label: '业务域', value: 'policeBusiness' },

src/pages/data-auth-module/auth-subject-manage/subject-prop-manage/personnel-list.vue

@@ -15,10 +15,10 @@
             <el-form-item label="身份证号码">
                 <el-input clearable placeholder="请输入身份证号码" v-model="cardForm.name"></el-input>
             </el-form-item>
-            <el-form-item label="所属单位">
+            <el-form-item label="单位名称">
                 <dg-tree-select
                     v-model="cardForm.institution"
-                    placeholder="请选择所属单位"
+                    placeholder="请选择单位名称"
                     :data="options"
                     clearable
                     filterable

src/pages/data-auth-module/auth-subject-manage/user-prop-manage/index.vue

@@ -19,12 +19,12 @@
         <el-input v-model="form.idcard.value" placeholder="请输入身份证号码" clearable></el-input>
       </el-form-item>
 
-      <el-form-item label="所属机构">
+      <el-form-item label="单位名称">
         <select-tree
           ref="selectTree"
           api-name="getOrgTree"
           @submitTreeValue="getTreeValue"
-          placeholder="请选择所属机构"
+          placeholder="请选择单位名称"
         ></select-tree>
       </el-form-item>
 
@@ -42,7 +42,7 @@
       <dg-button type="primary" @click="handleSynchro" icon="el-icon-refresh">同步</dg-button>
     </div>
     <Table ref="myTable" :url="tableUrl" :headerData="UserTableData" :condition="form">
-      <!-- 所属机构 -->
+      <!-- 单位名称 -->
       <template #orgName="{ row }">
         <span v-if="row.userType + '' === '30'"></span>
         <span v-else>{{ row.orgName }}</span>

src/pages/empower-manage/institutional-quotas-manage/edit.vue

@@ -8,7 +8,7 @@
         <!--操作内容导航-->
         <div class="select-item-tab-text">
             <p>
-                当前管理员【 <span class="selected">{{ user.name || "" }}</span> 】,所属机构【
+                当前管理员【 <span class="selected">{{ user.name || "" }}</span> 】,单位名称【
                 <span class="selected">{{ user.securityOrgName }}</span> 】,所选应用名称【
                 <span class="selected">{{ row.name || "" }}</span> 】
             </p>
@@ -513,7 +513,7 @@ export default {
             this.handleSearch();
         });
 
-        // 顶级所属机构
+        // 顶级单位名称
         this.treeFirst = row.appOrgId; // 预存
 
         // 查询机构树

src/pages/empower-manage/institutional-quotas-manage/index.vue

@@ -6,13 +6,13 @@
 <template>
   <dg-row>
     <el-form ref="form" :model="form" label-suffix=":" inline>
-      <el-form-item label="所属机构">
+      <el-form-item label="单位名称">
         <select-tree
           ref="selectTree"
           api-name="getOrgTree"
           @submitTreeValue="getTreeValue"
           nodeKey="id"
-          placeholder="请选择所属机构"
+          placeholder="请选择单位名称"
         ></select-tree>
       </el-form-item>
       <el-form-item label="应用系统名称" prop="applyName.value">

src/pages/list-manage/red-list-manage/component/app-func.vue

@@ -196,7 +196,7 @@ export default {
      */
     handleSetListLevel() {
       if (!this.verify()) return;
-      this.openLayer('批量设置红名单等级', batchSetLevelAppFunc, 'set');
+      this.openLayer('批量设置红名单级别', batchSetLevelAppFunc, 'set');
     },
     /**
      * 批量移除
@@ -257,7 +257,7 @@ export default {
       });
     },
     /**
-     * 获取等级级别枚举
+     * 获取级别级别枚举
      */
     getLevelEnum() {
       return new Promise((resolve) => {

src/pages/list-manage/red-list-manage/component/batch-add-appfunc.vue

@@ -102,12 +102,12 @@ export default {
       }
     },
     /**
-     * 设置名单等级
+     * 设置名单级别
      */
     setLevel(selectedData) {
       const vm = this;
       const layer = this.$dgLayer({
-        title: '设置红名单等级',
+        title: '设置红名单级别',
         content: batchSetlevelAppFunc,
         props: {
           data: this.data,

src/pages/list-manage/red-list-manage/component/batch-setlevel-appfunc.vue

@@ -1,5 +1,5 @@
 <!--
-批量设置应用功能红名单等级
+批量设置应用功能红名单级别
 @Author: linqian
 @Date: 2021-07-014 09:46
 -->
@@ -99,7 +99,7 @@ export default {
         });
       });
     },
-    // 设置等级
+    // 设置级别
     setLevel() {
       const params = {
         level: this.level,

src/pages/list-manage/white-list-manage/component/batch-add-user.vue

@@ -14,7 +14,7 @@
         <el-form-item label="身份证号码">
           <el-input v-model="form.idcard.value" placeholder="身份证号码" clearable></el-input>
         </el-form-item>
-        <el-form-item label="所属单位">
+        <el-form-item label="单位名称">
           <select-tree
             ref="selectTree"
             api-name="getOrgTree"
@@ -117,12 +117,12 @@ export default {
       }
     },
     /**
-     * 设置名单等级
+     * 设置名单级别
      */
     setLevel(selectedData) {
       const vm = this;
       const layer = this.$dgLayer({
-        title: '设置白名单等级',
+        title: '设置白名单级别',
         content: batchSetlevelUser,
         props: {
           selectedData,

src/pages/list-manage/white-list-manage/component/batch-delete-user.vue

@@ -1,5 +1,5 @@
 <!--
-批量删除用户名单等级
+批量删除用户名单级别
 @Author: linqian
 @Date: 2021-07-13 10:17
 -->

src/pages/list-manage/white-list-manage/component/batch-setlevel-user.vue

@@ -1,5 +1,5 @@
 <!--
-批量设置用户名单等级
+批量设置用户名单级别
 @Author: linqian
 @Date: 2021-07-08 11:31
 -->
@@ -13,7 +13,7 @@
     <p style="margin-bottom: 5px">选中的人员列表：</p>
     <dg-table :data="selectedData" border row-key="id" paging-type="client" :pagination-total="selectedData.length">
       <dg-table-column type="index" label="序号" width="75" align="center" />
-      <dg-table-column label="姓名" prop="user">
+      <dg-table-column label="姓名" prop="user" align="center">
         <template slot-scope="{ row }">
           {{ row.name || row.userName }}
         </template>
@@ -52,7 +52,7 @@ export default {
           prop: 'orgName'
         }
       ],
-      level: '1' // 默认为低等级
+      level: '1' // 默认为低级别
     };
   },
   computed: {},
@@ -65,7 +65,7 @@ export default {
       const params = {
         level: this.level,
         subIds: this.selectedData.map((item) => item.id)
-      };
+      };   
       return new Promise((resolve) => {
         saveWhiteList(params).then((res) => {
           resolve(res.data);
@@ -73,7 +73,7 @@ export default {
         });
       });
     },
-    // 设置等级
+    // 设置级别
     setLevel() {
       const params = {
         level: this.level,

src/pages/list-manage/white-list-manage/component/user-list.vue

@@ -17,7 +17,7 @@
       <el-form-item label="身份证号码">
         <el-input v-model="form.idcard.value" placeholder="请输入身份证号码" clearable></el-input>
       </el-form-item>
-      <el-form-item label="所属单位">
+      <el-form-item label="单位名称">
         <select-tree ref="selectTree" api-name="getOrgTree" nodeKey="id" @submitTreeValue="getTreeValue"></select-tree>
       </el-form-item>
 
@@ -184,7 +184,7 @@ export default {
     },
     handleSetListLevel() {
       if (!this.verify()) return;
-      this.openLayer('批量设置白名单等级', batchSetlevelUser, 'set');
+      this.openLayer('批量设置白名单级别', batchSetlevelUser, 'set');
     },
     /**
      * 移除

src/pages/log-manage/err-auth-earlywarning-manage/auth-earlywarning-info-detail.vue

@@ -15,7 +15,7 @@
             </dg-row>
             <dg-row :gutter="20">
                 <!-- <dg-col :span="12">
-                    <el-form-item label="所属单位">
+                    <el-form-item label="单位名称">
                         <div class="u-detail__text" v-translate="{ code: 'DM_APPLY_STATUS' }">{{ sizeForm.state }}</div>
                     </el-form-item>
                 </dg-col> -->

src/pages/log-report/persionnel-author-audit/timeLine.vue

@@ -27,7 +27,7 @@
                             <span class="line-sub-text">{{
                                 roleCreatorName == null || roleInfo.creator == "" ? "无" : roleCreatorName
                             }}</span>
-                            &nbsp;&nbsp;&nbsp; 所属机构：
+                            &nbsp;&nbsp;&nbsp; 单位名称：
                             <span class="line-sub-text">{{
                                 roleCreatorOrg == null || roleInfo.creator == "" ? "无" : roleCreatorOrg
                             }}</span>
@@ -48,7 +48,7 @@
                                     ? "无"
                                     : childItem.managerName
                             }}</span>
-                            &nbsp;&nbsp;&nbsp; 所属机构：
+                            &nbsp;&nbsp;&nbsp; 单位名称：
                             <span class="line-sub-text">{{ childItem.managerOrg }}</span>
                             &nbsp;&nbsp;&nbsp; 操作时间：
                             <span class="line-sub-text">{{ childItem.createTime }}</span>
@@ -66,7 +66,7 @@
                                     ? "无"
                                     : childItem.createUserName
                             }}</span>
-                            &nbsp;&nbsp;&nbsp; 所属机构：
+                            &nbsp;&nbsp;&nbsp; 单位名称：
                             <span class="line-sub-text">{{ childItem.createUserOrg }}</span>
                             &nbsp;&nbsp;&nbsp; 操作时间：
                             <span class="line-sub-text">{{ childItem.createTime }}</span>
@@ -93,7 +93,7 @@
                                     ? "无"
                                     : childItem.managerName
                             }}</span>
-                            &nbsp;&nbsp;&nbsp; 所属机构：
+                            &nbsp;&nbsp;&nbsp; 单位名称：
                             <span class="line-sub-text">{{ childItem.managerOrg }}</span>
                             &nbsp;&nbsp;&nbsp; 操作时间：
                             <span class="line-sub-text">{{ childItem.createTime }}</span>

src/pages/log-report/scope-author-audit/timeLine.vue

@@ -29,7 +29,7 @@
                     <p class="line-sub-title">
                         操作人：
                         <span class="line-sub-text">{{ childItem.operateUserName }}</span>
-                        &nbsp;&nbsp;&nbsp; 所属机构：
+                        &nbsp;&nbsp;&nbsp; 单位名称：
                         <span class="line-sub-text">{{ childItem.operateOrgName }}</span>
                         &nbsp;&nbsp;&nbsp; 操作时间：
                         <span class="line-sub-text">{{ childItem.operateTime }}</span>

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

@@ -80,22 +80,24 @@ export default {
       this.$emit('close');
     },
     handleSubmit() {
-      if (this.selectedValue.length == 0) {
+      const approveContent = this.nodeTransferLabel();
+      // 获取目标树所有的key
+      const allKeys = this.$refs.transferTree.allKeyValue(false, this.$refs.transferTree.targetData);
+      const resourceInfos = allKeys
+        .map((item) => this.$refs.transferTree.$refs['to-tree'].getNode(item).data)
+        .map((item) => {
+          return {
+            appId: item.appId,
+            funId: item.id
+          };
+        })
+        .filter((item) => item.appId);
+
+      // 已选资源有变更，则可以直接保存，无变更，则需要至少选中一条
+      // 判断有无变更的标准：resourceInfos的funId 与getSetFunIdsByUser方法返回的已选资源id作匹配
+      if (this.havefunIds.length == 0 && this.selectedValue.length == 0) {
         this.$message.warning('请至少选择一条功能资源！');
       } else {
-        const approveContent = this.nodeTransferLabel();
-        // 获取目标树所有的key
-        const allKeys = this.$refs.transferTree.allKeyValue(false, this.$refs.transferTree.targetData);
-        const resourceInfos = allKeys
-          .map((item) => this.$refs.transferTree.$refs['to-tree'].getNode(item).data)
-          .map((item) => {
-            return {
-              appId: item.appId,
-              funId: item.id
-            };
-          })
-          .filter((item) => item.appId);
-
         this.$emit('success', approveContent, this.selectedValue, resourceInfos);
       }
     },
@@ -110,9 +112,11 @@ export default {
         const params = {
           userId: this.$store.getters.user.id
         };
-        userHasAuthFunIds(params).then((res) => {
-          resolve(res.data.content);
-        });
+        userHasAuthFunIds(params)
+          .then((res) => {
+            resolve(res.data.content);
+          })
+          .catch(() => resolve([]));
       });
     },
     // 获取全量的菜单树
@@ -153,10 +157,10 @@ export default {
 
   async created() {
     this.data = await this.getAllTree();
-    const funIds = await this.getSetFunIdsByUser();
-    this.selectedValue = [...this.selectKeys, ...funIds];
+    this.havefunIds = await this.getSetFunIdsByUser();
+    this.selectedValue = [...this.selectKeys, ...this.havefunIds];
     if (this.needFilter) {
-      this.selectedValue = this.getChildKeys(this.data, [...this.selectKeys, ...funIds]);
+      this.selectedValue = this.getChildKeys(this.data, [...this.selectKeys, ...this.havefunIds]);
     }
   },
   mounted() {}

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

@@ -306,6 +306,11 @@ export default {
       rules: {
         flowContent: { required: true, message: '请选择审批内容', trigger: 'change' },
         applyType: { required: true, message: '请选择审批类型', trigger: 'change' },
+        flowTitle: { required: true, message: '请输入审批单标题', trigger: 'change' },
+        applicantName: { required: true, message: '请输入申请人姓名', trigger: 'change' },
+        applicantIdcard: { required: true, message: '请输入申请人身份证号码', trigger: 'change' },
+        applicantOrgCode: { required: true, message: '请输入申请人单位代码', trigger: 'change' },
+        applicantOrgName: { required: true, message: '请输入申请人单位名称', trigger: 'change' },
         processName: { required: true, message: '请输入流程名称', trigger: 'change' },
         applyReason: [{ required: true, message: '请输入申请理由', trigger: 'change' }],
         applicantPhoneNo: [
@@ -551,13 +556,13 @@ export default {
     if (!this.applyOrdNo) {
       this.sizeForm = {
         flowTitle: '',
-        applicantIdcard: idcard, 
-        applicantName: name, 
-        applicantOrgCode: securityOrgs[0], 
-        applicantOrgName: securityOrgName, 
+        applicantIdcard: idcard,
+        applicantName: name,
+        applicantOrgCode: securityOrgs[0],
+        applicantOrgName: securityOrgName,
         applicantPhoneNo: mobile,
-        flowContent: '', 
-        applyReason: '', 
+        flowContent: '',
+        applyReason: '',
         businessCode: '',
         processType: '',
         operateType: '', // 1--保存  2--提交

src/utils/regular.js

@@ -1,7 +1,7 @@
 import _ from "lodash";
 
 // 手机
-export const phone = /^((13[0-9])|(14[0-9])|(15[0-9])|(17[0-9])|(18[0-9]))\d{8}$/;
+export const phone = /^((13[0-9])|(14[0-9])|(15[0-9])|(17[0-9])|(18[0-9])|(19[0-9]))\d{8}$/;
 // 固话
 export const tel = /^(\d{4}-)?\d{6,8}$/;
 // 邮箱