From 62b642aab5475ca6b1f821c6c34eee43a2e9b44b Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 17 Apr 2024 11:32:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/reportWork/index.vue | 5 +++-- src/views/system/user/authRole.vue | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 028378d..b6bbf4d 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -883,7 +883,7 @@ export default { if(this.queryParams.createTimeArray !=null && this.queryParams.createTimeArray.length>0){ this.queryParams.createTimeStart = moment(this.queryParams.createTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.createTimeEnd = moment(this.queryParams.createTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); - }**/ + } if ( this.queryParams.feedbackTimeArray != null && @@ -895,7 +895,7 @@ export default { this.queryParams.feedbackTimeEnd = moment( this.queryParams.feedbackTimeArray[1] ).format("YYYY-MM-DD"); - } + }**/ this.loading = true; listReportWork(this.queryParams).then((response) => { this.reportWorkList = response.rows; @@ -922,6 +922,7 @@ export default { this.openConsume = false; this.loading = false; this.reset(); + this.getList(); }, getSummaries(param) { const { columns, data } = param; diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue index ab5e72f..bf6a2f8 100644 --- a/src/views/system/user/authRole.vue +++ b/src/views/system/user/authRole.vue @@ -39,7 +39,7 @@ 提交 - 返回 + @@ -104,13 +104,13 @@ export default { const roleIds = this.roleIds.join(","); updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => { this.$modal.msgSuccess("授权成功"); - this.close(); + //this.close(); }); }, /** 关闭按钮 */ close() { - const obj = { path: "/system/user" }; - this.$tab.closeOpenPage(obj); + //const obj = { path: "/system/user" }; + //this.$tab.closeOpenPage(obj); }, }, }; From 24ef15839e7effa2acf290d7fdf3d77fb79629d1 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Wed, 17 Apr 2024 13:48:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/dict/data.js | 52 +++++ src/api/wms/dict/type.js | 60 ++++++ src/router/index.js | 14 ++ src/views/wms/dict/data.vue | 402 +++++++++++++++++++++++++++++++++++ src/views/wms/dict/index.vue | 347 ++++++++++++++++++++++++++++++ 5 files changed, 875 insertions(+) create mode 100644 src/api/wms/dict/data.js create mode 100644 src/api/wms/dict/type.js create mode 100644 src/views/wms/dict/data.vue create mode 100644 src/views/wms/dict/index.vue diff --git a/src/api/wms/dict/data.js b/src/api/wms/dict/data.js new file mode 100644 index 0000000..45da392 --- /dev/null +++ b/src/api/wms/dict/data.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// 查询字典数据列表 +export function listData(query) { + return request({ + url: '/wms/dict/data/list', + method: 'get', + params: query + }) +} + +// 查询字典数据详细 +export function getData(dictCode) { + return request({ + url: '/wms/dict/data/' + dictCode, + method: 'get' + }) +} + +// 根据字典类型查询字典数据信息 +export function getDicts(dictType) { + return request({ + url: '/wms/dict/data/type/' + dictType, + method: 'get' + }) +} + +// 新增字典数据 +export function addData(data) { + return request({ + url: '/wms/dict/data', + method: 'post', + data: data + }) +} + +// 修改字典数据 +export function updateData(data) { + return request({ + url: '/wms/dict/data', + method: 'put', + data: data + }) +} + +// 删除字典数据 +export function delData(dictCode) { + return request({ + url: '/wms/dict/data/' + dictCode, + method: 'delete' + }) +} diff --git a/src/api/wms/dict/type.js b/src/api/wms/dict/type.js new file mode 100644 index 0000000..99ff7e7 --- /dev/null +++ b/src/api/wms/dict/type.js @@ -0,0 +1,60 @@ +import request from '@/utils/request' + +// 查询字典类型列表 +export function listType(query) { + return request({ + url: '/wms/dict/type/list', + method: 'get', + params: query + }) +} + +// 查询字典类型详细 +export function getType(dictId) { + return request({ + url: '/wms/dict/type/' + dictId, + method: 'get' + }) +} + +// 新增字典类型 +export function addType(data) { + return request({ + url: '/wms/dict/type', + method: 'post', + data: data + }) +} + +// 修改字典类型 +export function updateType(data) { + return request({ + url: '/wms/dict/type', + method: 'put', + data: data + }) +} + +// 删除字典类型 +export function delType(dictId) { + return request({ + url: '/wms/dict/type/' + dictId, + method: 'delete' + }) +} + +// 刷新字典缓存 +export function refreshCache() { + return request({ + url: '/wms/dict/type/refreshCache', + method: 'delete' + }) +} + +// 获取字典选择框列表 +export function optionselect() { + return request({ + url: '/wms/dict/type/optionselect', + method: 'get' + }) +} diff --git a/src/router/index.js b/src/router/index.js index 770ec7c..0bae369 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -185,6 +185,20 @@ export const dynamicRoutes = [ } ] }, + { + path: '/wms/dict-data', + component: Layout, + hidden: true, + permissions: ['factory:dict:list'], + children: [ + { + path: 'index/:dictId(\\d+)', + component: () => import('@/views/wms/dict/data'), + name: 'Data', + meta: { title: '字典数据', activeMenu: '/wms/dict' } + } + ] + }, { path: '/qua/quality/qcProject-data', component: Layout, diff --git a/src/views/wms/dict/data.vue b/src/views/wms/dict/data.vue new file mode 100644 index 0000000..16286b5 --- /dev/null +++ b/src/views/wms/dict/data.vue @@ -0,0 +1,402 @@ + + + diff --git a/src/views/wms/dict/index.vue b/src/views/wms/dict/index.vue new file mode 100644 index 0000000..0e86c9d --- /dev/null +++ b/src/views/wms/dict/index.vue @@ -0,0 +1,347 @@ + + + From ce8c5400bd053e0dc4a6a6149d242c5d65868e7c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 18 Apr 2024 14:55:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/reportWork/index.vue | 20 ++++++++------------ src/views/quality/unqualified/index.vue | 3 ++- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index b6bbf4d..aa75b32 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -21,6 +21,7 @@ @@ -879,23 +880,17 @@ export default { }, /** 查询报工报表列表 */ getList() { - /** - if(this.queryParams.createTimeArray !=null && this.queryParams.createTimeArray.length>0){ - this.queryParams.createTimeStart = moment(this.queryParams.createTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); - this.queryParams.createTimeEnd = moment(this.queryParams.createTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); - } - - if ( - this.queryParams.feedbackTimeArray != null && - this.queryParams.feedbackTimeArray.length > 0 - ) { + if (this.queryParams.feedbackTimeArray != null &&this.queryParams.feedbackTimeArray.length > 0) { this.queryParams.feedbackTimeStart = moment( this.queryParams.feedbackTimeArray[0] ).format("YYYY-MM-DD"); this.queryParams.feedbackTimeEnd = moment( this.queryParams.feedbackTimeArray[1] ).format("YYYY-MM-DD"); - }**/ + }else{ + this.queryParams.feedbackTimeStart = null; + this.queryParams.feedbackTimeEnd = null; + } this.loading = true; listReportWork(this.queryParams).then((response) => { this.reportWorkList = response.rows; @@ -916,6 +911,7 @@ export default { }, // 取消按钮 cancel() { + window.location.reload(); this.open = false; this.openReport = false; this.openReportSAP = false; @@ -991,7 +987,7 @@ export default { createTime: null, updateTime: null, updateBy: null, - endReport: "0", + endReport: "0" }; this.resetForm("form"); this.libTabs = []; diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue index db0bac7..a5c6ae8 100644 --- a/src/views/quality/unqualified/index.vue +++ b/src/views/quality/unqualified/index.vue @@ -85,6 +85,7 @@ +