zhoux 2 лет назад
Родитель
Сommit
32ffa84c0b

+ 0 - 3
src/api/pages/mst/role.js

@@ -6,9 +6,6 @@
 export default {
   roleService: {
     prefix: '/mdm-server/mst/role/',
-    insertWeb: 'insert_web',
-    updateWeb: 'update_web',
-
   }
 }
 

+ 4 - 2
src/components/modal/dk-function/dk-function.vue

@@ -163,6 +163,7 @@ export default {
      */
     modalOk() {
       let data = this.data.filter(it => it.checked);
+      console.log('dds',data)
       this.okFunc(data,this)
       // this.visible = false;
     },
@@ -262,8 +263,9 @@ export default {
     getApplication() {
       this.excute(this.$service.commonService, this.$service.commonService.getApplication, {}).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          this.appList = res.data
-          this.tabList = res.data.map(m => {return {
+          let data = res.data.filter(it=>it.appCode != 'DK-WEB')
+          this.appList = data
+          this.tabList = data.map(m => {return {
             label: m.appName,
             name: m.appCode
           }})

+ 6 - 24
src/view/mst/role/index.vue

@@ -13,8 +13,6 @@
         <BaseIndexButton ref="edit" name="edit"></BaseIndexButton>
         <!--    功能权限    -->
         <BaseIndexButton ref="moduleRights" name="moduleRights"></BaseIndexButton>
-        <!--    敏感权限    -->
-        <BaseIndexButton ref="sensitive" name="sensitive"></BaseIndexButton>
         <!--    启用    -->
         <BaseIndexButton ref="enable" name="enable"></BaseIndexButton>
         <!--    停用    -->
@@ -64,6 +62,10 @@
       :title="modalTitle"
     >
       <DkForm ref="formInline" v-model="formData" :col-count="1">
+        <!--  角色编码  -->
+        <DkFormItem prop="roleCode" :required="true">
+          <InputPop v-model="formData.roleCode"/>
+        </DkFormItem>
         <!--  角色名称  -->
         <DkFormItem prop="roleName" :required="true">
           <InputPop v-model="formData.roleName"/>
@@ -74,25 +76,6 @@
         </DkFormItem>
       </DkForm>
     </DkModal>
-
-    <!--敏感字段-->
-    <DkModal
-      :loading="loading"
-      ref="modal_function"
-      v-model="sensitiveModal"
-      @modalOk="updateSensitive"
-      @modalCancel="clearFunction"
-      :saveFlag="true"
-      :title="sensitiveTitle"
-    >
-      <div class="main-class">
-        <DkTree :data="sensitiveList" ref="menuTree" :height="400" :loading="loading" :onlyChild="false"
-                :columns="columns" :nodeWidth="200" @switch-change="onSwitchChange"
-                :expand-mode="this.$config.expandMode.all" show-expand-button
-                id="itemCode" parent-id="parentCode" tree-node-name="itemName" node-title="敏感字段">
-        </DkTree>
-      </div>
-    </DkModal>
   </div>
 </template>
 
@@ -336,10 +319,9 @@ export default {
      */
     saveData() {
       if (this.modalParams.button === this.$config.formMode.add) {
-        delete this.params.modelId // 解决提示主键重复的问题,删除主键代码
-        return this.excute(this.$service.roleService, this.$service.roleService.insertWeb, this.params)
+        return this.excute(this.$service.roleService, this.$service.roleService.insert, this.params)
       } else {
-        return this.excute(this.$service.roleService, this.$service.roleService.updateWeb, this.params)
+        return this.excute(this.$service.roleService, this.$service.roleService.update, this.params)
       }
     },