diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue deleted file mode 100644 index b306698..0000000 --- a/src/views/system/user/list.user.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue deleted file mode 100644 index b306698..0000000 --- a/src/views/system/user/list.user.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue new file mode 100644 index 0000000..87ef699 --- /dev/null +++ b/src/views/system/user/listUser.vue @@ -0,0 +1,381 @@ + + + + + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue deleted file mode 100644 index b306698..0000000 --- a/src/views/system/user/list.user.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue new file mode 100644 index 0000000..87ef699 --- /dev/null +++ b/src/views/system/user/listUser.vue @@ -0,0 +1,381 @@ + + + + + diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue deleted file mode 100644 index 52b9073..0000000 --- a/src/views/system/user/role.assignment.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue deleted file mode 100644 index b306698..0000000 --- a/src/views/system/user/list.user.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue new file mode 100644 index 0000000..87ef699 --- /dev/null +++ b/src/views/system/user/listUser.vue @@ -0,0 +1,381 @@ + + + + + diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue deleted file mode 100644 index 52b9073..0000000 --- a/src/views/system/user/role.assignment.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue new file mode 100644 index 0000000..4b09678 --- /dev/null +++ b/src/views/system/user/roleAssignment.vue @@ -0,0 +1,116 @@ + + + + + + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue deleted file mode 100644 index b306698..0000000 --- a/src/views/system/user/list.user.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue new file mode 100644 index 0000000..87ef699 --- /dev/null +++ b/src/views/system/user/listUser.vue @@ -0,0 +1,381 @@ + + + + + diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue deleted file mode 100644 index 52b9073..0000000 --- a/src/views/system/user/role.assignment.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue new file mode 100644 index 0000000..4b09678 --- /dev/null +++ b/src/views/system/user/roleAssignment.vue @@ -0,0 +1,116 @@ + + + + + + diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue new file mode 100644 index 0000000..efbac4a --- /dev/null +++ b/src/views/system/user/selecTree.vue @@ -0,0 +1,182 @@ + + + + + + + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue deleted file mode 100644 index b306698..0000000 --- a/src/views/system/user/list.user.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue new file mode 100644 index 0000000..87ef699 --- /dev/null +++ b/src/views/system/user/listUser.vue @@ -0,0 +1,381 @@ + + + + + diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue deleted file mode 100644 index 52b9073..0000000 --- a/src/views/system/user/role.assignment.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue new file mode 100644 index 0000000..4b09678 --- /dev/null +++ b/src/views/system/user/roleAssignment.vue @@ -0,0 +1,116 @@ + + + + + + diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue new file mode 100644 index 0000000..efbac4a --- /dev/null +++ b/src/views/system/user/selecTree.vue @@ -0,0 +1,182 @@ + + + + + + + diff --git a/src/views/system/user/select.tree.vue b/src/views/system/user/select.tree.vue deleted file mode 100644 index efbac4a..0000000 --- a/src/views/system/user/select.tree.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue deleted file mode 100644 index b306698..0000000 --- a/src/views/system/user/list.user.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue new file mode 100644 index 0000000..87ef699 --- /dev/null +++ b/src/views/system/user/listUser.vue @@ -0,0 +1,381 @@ + + + + + diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue deleted file mode 100644 index 52b9073..0000000 --- a/src/views/system/user/role.assignment.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue new file mode 100644 index 0000000..4b09678 --- /dev/null +++ b/src/views/system/user/roleAssignment.vue @@ -0,0 +1,116 @@ + + + + + + diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue new file mode 100644 index 0000000..efbac4a --- /dev/null +++ b/src/views/system/user/selecTree.vue @@ -0,0 +1,182 @@ + + + + + + + diff --git a/src/views/system/user/select.tree.vue b/src/views/system/user/select.tree.vue deleted file mode 100644 index efbac4a..0000000 --- a/src/views/system/user/select.tree.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts new file mode 100644 index 0000000..e27a855 --- /dev/null +++ b/src/views/system/user/user-interface.ts @@ -0,0 +1,66 @@ +export interface IlistQueryType { + keywords: string + beginTime: string + endTime: string + offset: number + limit: number + sort: string + deptId: string + deptType: string +} +// 树形结构 +export interface TreeStructure { + checked: boolean + children: TreeStructure[] + code: string + id: string + name: string + open: boolean + pCodes: string + pid: string + value: string + +} +// 新增或添加 +export interface addInfo { + id: string // 编号 + account: string // 账号 + name: string // 姓名 + email: string // 邮箱， + phone: string // 手机号， + deptId: string // 组织机构编号 + roleid: string // 角色 + password?: string // 密码 + rePassword?: string // 重复密码 + birthday?: string + sex?: string // 性别 + roleName?: string +} +// 用户列表返回值类型 +export interface userType { + account: string + attr1: string + avatar: string + birthday: string + createtime: string + deptId: string + deptName: string + email: string + id: string + name: string + phone: string + roleId: string + roleName: string + sex: string + sexName: string + status: string + statusName: string + syncId: string + syncName: string + version: string + +} +export interface changePageType { + page?: number + size?: number +} diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue deleted file mode 100644 index b306698..0000000 --- a/src/views/system/user/list.user.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue new file mode 100644 index 0000000..87ef699 --- /dev/null +++ b/src/views/system/user/listUser.vue @@ -0,0 +1,381 @@ + + + + + diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue deleted file mode 100644 index 52b9073..0000000 --- a/src/views/system/user/role.assignment.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue new file mode 100644 index 0000000..4b09678 --- /dev/null +++ b/src/views/system/user/roleAssignment.vue @@ -0,0 +1,116 @@ + + + + + + diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue new file mode 100644 index 0000000..efbac4a --- /dev/null +++ b/src/views/system/user/selecTree.vue @@ -0,0 +1,182 @@ + + + + + + + diff --git a/src/views/system/user/select.tree.vue b/src/views/system/user/select.tree.vue deleted file mode 100644 index efbac4a..0000000 --- a/src/views/system/user/select.tree.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts new file mode 100644 index 0000000..e27a855 --- /dev/null +++ b/src/views/system/user/user-interface.ts @@ -0,0 +1,66 @@ +export interface IlistQueryType { + keywords: string + beginTime: string + endTime: string + offset: number + limit: number + sort: string + deptId: string + deptType: string +} +// 树形结构 +export interface TreeStructure { + checked: boolean + children: TreeStructure[] + code: string + id: string + name: string + open: boolean + pCodes: string + pid: string + value: string + +} +// 新增或添加 +export interface addInfo { + id: string // 编号 + account: string // 账号 + name: string // 姓名 + email: string // 邮箱， + phone: string // 手机号， + deptId: string // 组织机构编号 + roleid: string // 角色 + password?: string // 密码 + rePassword?: string // 重复密码 + birthday?: string + sex?: string // 性别 + roleName?: string +} +// 用户列表返回值类型 +export interface userType { + account: string + attr1: string + avatar: string + birthday: string + createtime: string + deptId: string + deptName: string + email: string + id: string + name: string + phone: string + roleId: string + roleName: string + sex: string + sexName: string + status: string + statusName: string + syncId: string + syncName: string + version: string + +} +export interface changePageType { + page?: number + size?: number +} diff --git a/src/views/system/user/user.add.vue b/src/views/system/user/user.add.vue deleted file mode 100644 index 2505000..0000000 --- a/src/views/system/user/user.add.vue +++ /dev/null @@ -1,332 +0,0 @@ - - - - - - diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue deleted file mode 100644 index b306698..0000000 --- a/src/views/system/user/list.user.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue new file mode 100644 index 0000000..87ef699 --- /dev/null +++ b/src/views/system/user/listUser.vue @@ -0,0 +1,381 @@ + + + + + diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue deleted file mode 100644 index 52b9073..0000000 --- a/src/views/system/user/role.assignment.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue new file mode 100644 index 0000000..4b09678 --- /dev/null +++ b/src/views/system/user/roleAssignment.vue @@ -0,0 +1,116 @@ + + + + + + diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue new file mode 100644 index 0000000..efbac4a --- /dev/null +++ b/src/views/system/user/selecTree.vue @@ -0,0 +1,182 @@ + + + + + + + diff --git a/src/views/system/user/select.tree.vue b/src/views/system/user/select.tree.vue deleted file mode 100644 index efbac4a..0000000 --- a/src/views/system/user/select.tree.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts new file mode 100644 index 0000000..e27a855 --- /dev/null +++ b/src/views/system/user/user-interface.ts @@ -0,0 +1,66 @@ +export interface IlistQueryType { + keywords: string + beginTime: string + endTime: string + offset: number + limit: number + sort: string + deptId: string + deptType: string +} +// 树形结构 +export interface TreeStructure { + checked: boolean + children: TreeStructure[] + code: string + id: string + name: string + open: boolean + pCodes: string + pid: string + value: string + +} +// 新增或添加 +export interface addInfo { + id: string // 编号 + account: string // 账号 + name: string // 姓名 + email: string // 邮箱， + phone: string // 手机号， + deptId: string // 组织机构编号 + roleid: string // 角色 + password?: string // 密码 + rePassword?: string // 重复密码 + birthday?: string + sex?: string // 性别 + roleName?: string +} +// 用户列表返回值类型 +export interface userType { + account: string + attr1: string + avatar: string + birthday: string + createtime: string + deptId: string + deptName: string + email: string + id: string + name: string + phone: string + roleId: string + roleName: string + sex: string + sexName: string + status: string + statusName: string + syncId: string + syncName: string + version: string + +} +export interface changePageType { + page?: number + size?: number +} diff --git a/src/views/system/user/user.add.vue b/src/views/system/user/user.add.vue deleted file mode 100644 index 2505000..0000000 --- a/src/views/system/user/user.add.vue +++ /dev/null @@ -1,332 +0,0 @@ - - - - - - diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue new file mode 100644 index 0000000..6d35832 --- /dev/null +++ b/src/views/system/user/userAdd.vue @@ -0,0 +1,332 @@ + + + + + + diff --git a/.eslintrc b/.eslintrc index 5c6806e..72e93a1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "curly": ["error", "all"], "no-tabs":"off", "no-const-assign": "off", + "no-console": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 554c264..7b12a6a 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -9,3 +9,14 @@ offset: number limit: number } + +export interface Iform { + number: string // 编号 + name: string // 名称 + business: string // 关联业务 + desc?: string // 流程描述 + selectDecision: string // 选择的决策 + rejectTo?: string // 可驳回至 + changeData?: string // 驳回修改数据 + isMessage: string // 审批结果通知发起人 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 84319b8..f248fe7 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -3,9 +3,11 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import type { IlistQuery } from './process' +import EditProcess from './editProcess.vue' import { delLoginLog, getLoginLogList } from '@/api/system/log' const { proxy } = getCurrentInstance() as any +const active = ref('main') const listQuery: IlistQuery = reactive({ number: '', // 编号 name: '', // 名称 @@ -104,90 +106,128 @@ } fetchData(true) } + +// 重置 +const reset = () => { + console.log('点击重置') +} +// 编辑 +const edit = (row: IlistQuery) => { + console.log('编辑') + active.value = 'edit' +} +// 详情 +const detail = (row: IlistQuery) => { + console.log('查看详情') + active.value = 'detail' +} +// 废止 +const abolish = (row: IlistQuery) => { + console.log('废止') +} +// 删除 +const del = (row: IlistQuery) => { + console.log('删除') +} +// 编辑页面点击关闭 +const close = () => { + active.value = 'main' +} diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue deleted file mode 100644 index b306698..0000000 --- a/src/views/system/user/list.user.vue +++ /dev/null @@ -1,373 +0,0 @@ - - - - - diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue new file mode 100644 index 0000000..87ef699 --- /dev/null +++ b/src/views/system/user/listUser.vue @@ -0,0 +1,381 @@ + + + + + diff --git a/src/views/system/user/role.assignment.vue b/src/views/system/user/role.assignment.vue deleted file mode 100644 index 52b9073..0000000 --- a/src/views/system/user/role.assignment.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue new file mode 100644 index 0000000..4b09678 --- /dev/null +++ b/src/views/system/user/roleAssignment.vue @@ -0,0 +1,116 @@ + + + + + + diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue new file mode 100644 index 0000000..efbac4a --- /dev/null +++ b/src/views/system/user/selecTree.vue @@ -0,0 +1,182 @@ + + + + + + + diff --git a/src/views/system/user/select.tree.vue b/src/views/system/user/select.tree.vue deleted file mode 100644 index efbac4a..0000000 --- a/src/views/system/user/select.tree.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - diff --git a/src/views/system/user/user-interface.ts b/src/views/system/user/user-interface.ts new file mode 100644 index 0000000..e27a855 --- /dev/null +++ b/src/views/system/user/user-interface.ts @@ -0,0 +1,66 @@ +export interface IlistQueryType { + keywords: string + beginTime: string + endTime: string + offset: number + limit: number + sort: string + deptId: string + deptType: string +} +// 树形结构 +export interface TreeStructure { + checked: boolean + children: TreeStructure[] + code: string + id: string + name: string + open: boolean + pCodes: string + pid: string + value: string + +} +// 新增或添加 +export interface addInfo { + id: string // 编号 + account: string // 账号 + name: string // 姓名 + email: string // 邮箱， + phone: string // 手机号， + deptId: string // 组织机构编号 + roleid: string // 角色 + password?: string // 密码 + rePassword?: string // 重复密码 + birthday?: string + sex?: string // 性别 + roleName?: string +} +// 用户列表返回值类型 +export interface userType { + account: string + attr1: string + avatar: string + birthday: string + createtime: string + deptId: string + deptName: string + email: string + id: string + name: string + phone: string + roleId: string + roleName: string + sex: string + sexName: string + status: string + statusName: string + syncId: string + syncName: string + version: string + +} +export interface changePageType { + page?: number + size?: number +} diff --git a/src/views/system/user/user.add.vue b/src/views/system/user/user.add.vue deleted file mode 100644 index 2505000..0000000 --- a/src/views/system/user/user.add.vue +++ /dev/null @@ -1,332 +0,0 @@ - - - - - - diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue new file mode 100644 index 0000000..6d35832 --- /dev/null +++ b/src/views/system/user/userAdd.vue @@ -0,0 +1,332 @@ + + + + + + diff --git a/src/views/system/user/user_interface.ts b/src/views/system/user/user_interface.ts deleted file mode 100644 index e27a855..0000000 --- a/src/views/system/user/user_interface.ts +++ /dev/null @@ -1,66 +0,0 @@ -export interface IlistQueryType { - keywords: string - beginTime: string - endTime: string - offset: number - limit: number - sort: string - deptId: string - deptType: string -} -// 树形结构 -export interface TreeStructure { - checked: boolean - children: TreeStructure[] - code: string - id: string - name: string - open: boolean - pCodes: string - pid: string - value: string - -} -// 新增或添加 -export interface addInfo { - id: string // 编号 - account: string // 账号 - name: string // 姓名 - email: string // 邮箱， - phone: string // 手机号， - deptId: string // 组织机构编号 - roleid: string // 角色 - password?: string // 密码 - rePassword?: string // 重复密码 - birthday?: string - sex?: string // 性别 - roleName?: string -} -// 用户列表返回值类型 -export interface userType { - account: string - attr1: string - avatar: string - birthday: string - createtime: string - deptId: string - deptName: string - email: string - id: string - name: string - phone: string - roleId: string - roleName: string - sex: string - sexName: string - status: string - statusName: string - syncId: string - syncName: string - version: string - -} -export interface changePageType { - page?: number - size?: number -}