diff --git a/.DS_Store b/.DS_Store index f527377..966a8b6 100644 --- a/.DS_Store +++ b/.DS_Store diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development index 2513186..bfa2e32 100644 --- a/antis-ncc-admin/.env.development +++ b/antis-ncc-admin/.env.development @@ -1,5 +1,5 @@ # 开发 VUE_CLI_BABEL_TRANSPILE_MODULES = true -VUE_APP_BASE_API = 'http://localhost:2011' +VUE_APP_BASE_API = 'http://192.168.110.45:5000' VUE_APP_BASE_WSS = 'ws://localhost:2011/websocket' diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue b/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue index 90cce88..8ab1f9d 100644 --- a/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue +++ b/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue @@ -1,205 +1,161 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ isDetail ? '成员信息' : '成员管理' }} + + 添加成员 + 刷新 + 共 {{ members.length }} 人 + + 共 {{ members.length }} 人 + + + + + + + + + + {{ scope.row.userName }} + + + + + + + + + + + + {{ scope.row.userId }} + + + + + + + 是 + 否 + + + + + {{ scope.row.isLeader === 1 ? '是' : '否' }} + + + + + + + {{ scope.row.sortOrder }} + + + + + + + + {{ scope.row.status === 'ACTIVE' ? '活跃' : '非活跃' }} + + + + + + 删除 + + + + + - 取 消 + 取 消 确 定 + + + \ No newline at end of file diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue b/antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue new file mode 100644 index 0000000..cf858e5 --- /dev/null +++ b/antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue @@ -0,0 +1,197 @@ + + + + + + + 添加成员 + 刷新 + 保存全部 + 共 {{ members.length }} 人 + + + + + + + + + + + + + + + + + + + 是 + 否 + + + + + + + + + + + 删除 + + + + + + + 重新排序 + 清空全部 + + + + + 取 消 + 确 定 + + + + + + + diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/index.vue b/antis-ncc-admin/src/views/lqYcsdJsj/index.vue index 22afa1a..38b74dd 100644 --- a/antis-ncc-admin/src/views/lqYcsdJsj/index.vue +++ b/antis-ncc-admin/src/views/lqYcsdJsj/index.vue @@ -4,168 +4,45 @@ - - - - - - + + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - 重置 - 展开 - 收起 + + + 查询 + 重置 + @@ -185,41 +62,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 编辑 - 删除 + + + {{ formatMonth(scope.row.yf) }} + + + + + + + {{ getStoreName(scope.row.md) }} + + + + + + + + {{ scope.row.jsj }} + + + + + + + + {{ scope.row.memberCount }}人 + + + + 0人 + + + + + + + 编辑 + 详情 + 删除 + @@ -230,6 +112,107 @@ + +