完善

src/components/RightModel/index.vue

@@ -37,13 +37,15 @@
           <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
         </a-menu>
         <a-button>
-          树操作 <a-icon type="up" />
+          树操作
+          <a-icon type="up" />
         </a-button>
       </a-dropdown>
       <a-popconfirm title="确定放弃编辑？" ok-text="确定" cancel-text="取消" @confirm="close">
         <a-button style="margin-right: .8rem">取消</a-button>
       </a-popconfirm>
-      <a-button type="primary" :loading="loading" ghost style="margin-right: 0.8rem" @click="handleSubmit(false)">仅保存</a-button>
+      <a-button type="primary" :loading="loading" ghost style="margin-right: 0.8rem" @click="handleSubmit(false)">仅保存
+      </a-button>
       <a-button type="primary" :loading="loading" @click="handleSubmit(true)">保存并关闭</a-button>
     </div>
 
@@ -55,8 +57,7 @@ import { getAction } from '@/api/request'
 
 export default {
   name: 'RoleModal',
-  components: {
-  },
+  components: {},
   props: ['treeCheckList', 'treeList'],
   data() {
     return {
@@ -68,7 +69,8 @@ export default {
       allTreeKeys: [],
       checkStrictly: true,
       visible: false,
-      loading: false
+      loading: false,
+      roleData: {}
     }
   },
   watch: {
@@ -86,8 +88,9 @@ export default {
         this.checkedKeys = o
       }
     },
-    show() {
+    show(data) {
       this.visible = true
+      this.roleData = data
     },
     close() {
       this.reset()
@@ -113,11 +116,10 @@ export default {
       this.close()
     },
     handleSubmit(exit) {
-      const that = this
-      const params = {
-        permissionIds: that.checkedKeys.join(','),
+      this.$emit('ok', this.checkedKeys, this.roleData)
+      if (exit) {
+        this.visible = false
       }
-      console.log(params)
     },
     setThisExpandedKeys(node) {
       if (node.children && node.children.length > 0) {
@@ -145,6 +147,7 @@ export default {
           this.getAllKeys(temp)
         }
         getAction(this.treeCheckList).then((res) => {
+          this.checkedKeys = res.checkedKeys
         })
       })
     }

src/views/sys/job/index.vue

@@ -114,7 +114,7 @@ export default {
       columns: columns(this),
       url: {
         list: '/system/role/list',
-        delete: '/system/role/{roleIds}',
+        delete: '/system/role/',
         exportXlsUrl: '/exportXlsUrl',
         importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
       }
@@ -143,11 +143,17 @@ export default {
       this.$refs.rightModal.title = 'pc菜单权限'
       this.treeList = '/system/menu/treeselect'
       this.treeCheckList = `/system/menu/roleMenuTreeselect/${data.roleId}`
-      this.$refs.rightModal.show()
+      this.$refs.rightModal.show(data)
     },
-    updateQueryParam(data) {
-      this.queryParam.unit = data.id
-      this.queryParam.unitName = data.departName
+    updateQueryParam(checkedKeys, roleData) {
+      roleData.menuIds = checkedKeys
+      httpAction('/system/role', roleData, 'put').then((res) => {
+        if (res.code === 200) {
+          this.$message.success(res.msg)
+        } else {
+          console.log(res)
+        }
+      })
     }
   }
 }

src/views/sys/log/index.vue

@@ -3,38 +3,37 @@
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
+<!--        <a-form-item>-->
+<!--          <a-input-->
+<!--            v-model="queryParam.glb"-->
+<!--            style="width: 150px"-->
+<!--            placeholder="输入搜索关键字"-->
+<!--          />-->
+<!--        </a-form-item>-->
+<!--        <a-form-item>-->
+<!--          <j-dict-select-tag-->
+<!--            v-model="queryParam.sb"-->
+<!--            style="width: 150px"-->
+<!--            placeholder="所属模块"-->
+<!--            dict-code="sj_plan_status"-->
+<!--          />-->
+<!--        </a-form-item>-->
+<!--        <a-form-item>-->
+<!--          <j-dict-select-tag-->
+<!--            v-model="queryParam.hb"-->
+<!--            style="width: 150px"-->
+<!--            placeholder="操作类型"-->
+<!--            dict-code="sj_plan_status"-->
+<!--          />-->
+<!--        </a-form-item>-->
+<!--        <a-form-item>-->
+<!--          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-<a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />-->
+<!--        </a-form-item>-->
         <a-form-item>
           <a-input
-            v-model="queryParam.glb"
-            style="width: 150px"
-            placeholder="输入搜索关键字"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.sb"
-            style="width: 150px"
-            placeholder="所属模块"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.hb"
-            style="width: 150px"
-            placeholder="操作类型"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-<a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.hb"
+            v-model="queryParam.operName"
             style="width: 150px"
             placeholder="操作人员"
-            dict-code="sj_plan_status"
           />
         </a-form-item>
         <a-form-item>

src/views/sys/menu/index.vue

@@ -22,9 +22,9 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-input
-            v-model="queryParam.deptName"
+            v-model="queryParam.menuName"
             style="width: 150px"
-            placeholder="部门名称"
+            placeholder="菜单名称"
           />
         </a-form-item>
         <a-form-item>

src/views/sys/worker/CheckAndEditModel.vue

@@ -26,10 +26,10 @@
       </a-form-model-item>
       <a-form-model-item label="职工职务" prop="roles">
         <sys-list-select-tag
-          mode="multiple"
           v-model="model.roles"
+          mode="multiple"
           dict-code="role"
-      />
+        />
       </a-form-model-item>
       <a-form-model-item label="职工工号" prop="userName">
         <a-input v-model="model.userName" />
@@ -80,7 +80,7 @@ export default {
         deptId: [{ required: true, message: '请选择' }],
         userName: [{ required: true, message: '请选择' }],
         roles: [{ required: true, message: '请选择' }],
-        phonenumber: [{ required: true, message: '请输入' }],
+        phonenumber: [{ required: true, message: '请输入' }]
       },
       url: {
         add: '/system/user',