From 49320db995ba95bc223de96806ca35da89c37a9e Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Wed, 10 Jan 2024 16:29:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E7=99=BB=E5=BD=95=EF=BC=8C=E9=A2=86=E6=96=99?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/api/claimAndRefund/receive.js | 8 + sgzb-ui/src/api/login.js | 23 +++ sgzb-ui/src/permission.js | 2 +- sgzb-ui/src/store/modules/user.js | 25 ++- .../base/assetAttributeAllocation/index.vue | 10 +- .../base/assetAttributeManagement/index.vue | 10 +- sgzb-ui/src/views/base/comeAndGo/index.vue | 10 +- sgzb-ui/src/views/base/project/index.vue | 10 +- sgzb-ui/src/views/base/section/index.vue | 14 +- sgzb-ui/src/views/base/unit/index.vue | 10 +- .../claimAndRefund/receive/agreement.vue | 8 +- .../claimAndRefund/receive/receiveApply.vue | 40 ++++- .../receive/receiveApplyAdd.vue | 30 ++-- .../claimAndRefund/receive/receiveExamine.vue | 97 +++++++++-- .../claimAndRefund/receive/receiveManage.vue | 20 ++- .../claimAndRefund/return/returnApply.vue | 5 +- .../claimAndRefund/return/returnApplyAdd.vue | 13 +- .../claimAndRefund/return/returnExamine.vue | 5 +- .../claimAndRefund/return/returnFinshed.vue | 7 +- .../returnAbnormal/returnAbnormal.vue | 7 +- sgzb-ui/src/views/login.vue | 142 +++++++++++++-- .../views/repairTest/brokenExamine/index.vue | 5 +- sgzb-ui/src/views/repairTest/repair/index.vue | 12 +- .../views/repairTest/testExamine/index.vue | 4 +- .../views/store/label/labelBindingHistory.vue | 6 +- .../newBuy/newDevices/newDevicesList.vue | 129 +++++++++++++- .../newDevices/newDevicesWarehousing.vue | 162 +++++++++++++++--- .../src/views/store/shelves/shelvesConfig.vue | 33 ++-- sgzb-ui/src/views/store/tools/devices.vue | 13 +- sgzb-ui/src/views/store/tools/keeper.vue | 11 +- sgzb-ui/src/views/store/tools/repair.vue | 15 +- .../src/views/store/tools/toolsSupplier.vue | 11 +- .../warehousing/accessoryWarehousing.vue | 7 +- .../store/warehousing/devicesWarehousing.vue | 9 +- .../store/warehousing/repairWarehousing.vue | 9 +- sgzb-ui/vue.config.js | 7 +- 36 files changed, 723 insertions(+), 206 deletions(-) diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js index 4d0a9506..2aac9684 100644 --- a/sgzb-ui/src/api/claimAndRefund/receive.js +++ b/sgzb-ui/src/api/claimAndRefund/receive.js @@ -148,6 +148,14 @@ export function auditLeaseByCompany(params = {} ){ data:params }) } +// 领料审核 拒绝 +export function rejectLeaseByCompany(params = {}){ + return request({ + url: '/base/tm_task/rejectLeaseByCompany', + method: 'post', + data: params + }) +} // 获取 物品类型 export function getUseTypeTreee(params = {}){ diff --git a/sgzb-ui/src/api/login.js b/sgzb-ui/src/api/login.js index a623f368..f0a80bce 100644 --- a/sgzb-ui/src/api/login.js +++ b/sgzb-ui/src/api/login.js @@ -61,3 +61,26 @@ export function getCodeImg() { timeout: 20000 }) } + +// 短信验证码 +export function sendCode(data) { + return request({ + url: '/auth/sendCode', + headers: { + isToken: false + }, + method: 'post', + data: data + }) +} +// 短信验证码--登录 +export function checkCode(data) { + return request({ + url: '/auth/checkCode', + headers: { + isToken: false + }, + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/sgzb-ui/src/permission.js b/sgzb-ui/src/permission.js index e1a14da7..d4e1126b 100644 --- a/sgzb-ui/src/permission.js +++ b/sgzb-ui/src/permission.js @@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register'] +const whiteList = ['/login', '/register','/auth/sendCode'] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/sgzb-ui/src/store/modules/user.js b/sgzb-ui/src/store/modules/user.js index 766d9c99..937df7f5 100644 --- a/sgzb-ui/src/store/modules/user.js +++ b/sgzb-ui/src/store/modules/user.js @@ -1,4 +1,4 @@ -import { login, logout, getInfo, refreshToken } from '@/api/login' +import { login, logout, getInfo, refreshToken,checkCode } from '@/api/login' import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth' const user = { @@ -55,6 +55,29 @@ const user = { }) }) }, + // 验证码 登录 + textLogin({ commit }, userInfo) { + console.log(userInfo) + let params = { + phone:userInfo.phone, + code:userInfo.textCode + } + return new Promise((resolve, reject) => { + checkCode(params).then(res => { + console.log(res) + if(res.code==200){ + let data = res.data + setToken(data.access_token) + commit('SET_TOKEN', data.access_token) + setExpiresIn(data.expires_in) + commit('SET_EXPIRES_IN', data.expires_in) + resolve() + } + }).catch(error => { + reject(error) + }) + }) + }, // 获取用户信息 GetInfo({ commit, state }) { diff --git a/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue b/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue index c6dbf8f7..f6305330 100644 --- a/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue +++ b/sgzb-ui/src/views/base/assetAttributeAllocation/index.vue @@ -80,7 +80,7 @@ size="mini" @click="handleImport" >导入 - + --> 导出 - --> + @@ -373,9 +373,9 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('system/user/export', { - ...this.queryParams - }, `user_${new Date().getTime()}.xlsx`) + // this.download('system/user/export', { + // ...this.queryParams + // }, `user_${new Date().getTime()}.xlsx`) }, /** 导入按钮操作 */ handleImport() { diff --git a/sgzb-ui/src/views/base/assetAttributeManagement/index.vue b/sgzb-ui/src/views/base/assetAttributeManagement/index.vue index a0bb2509..0604c0b7 100644 --- a/sgzb-ui/src/views/base/assetAttributeManagement/index.vue +++ b/sgzb-ui/src/views/base/assetAttributeManagement/index.vue @@ -27,7 +27,7 @@ @click="handleAdd" >新增 - + + 新建 - + @@ -315,9 +315,9 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('system/dict/type/export', { - ...this.queryParams - }, `type_${new Date().getTime()}.xlsx`) + // this.download('system/dict/type/export', { + // ...this.queryParams + // }, `type_${new Date().getTime()}.xlsx`) }, /** 刷新缓存按钮操作 */ handleRefreshCache() { diff --git a/sgzb-ui/src/views/base/section/index.vue b/sgzb-ui/src/views/base/section/index.vue index 15155e83..8dbbb9ad 100644 --- a/sgzb-ui/src/views/base/section/index.vue +++ b/sgzb-ui/src/views/base/section/index.vue @@ -43,7 +43,7 @@ >新增 - + - + 新建 - + @@ -248,9 +248,9 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('system/dict/type/export', { - ...this.queryParams - }, `type_${new Date().getTime()}.xlsx`) + // this.download('system/dict/type/export', { + // ...this.queryParams + // }, `type_${new Date().getTime()}.xlsx`) }, } }; diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue index aaf11c7a..daf00e9e 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue @@ -86,7 +86,6 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['store:labelType:export']" >导出 @@ -262,8 +261,7 @@ export default { pageNum: 1, pageSize: 10, keyWord: undefined, - dictType: undefined, - status: undefined + }, // 表单参数 form: {}, @@ -480,9 +478,9 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('system/dict/type/export', { + this.download('material/agreementInfo/export', { ...this.queryParams - }, `type_${new Date().getTime()}.xlsx`) + }, `协议_${new Date().getTime()}.xlsx`) }, } }; diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue index dc2d0305..262b392f 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue @@ -67,7 +67,6 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['store:labelType:export']" >导出 @@ -103,12 +102,27 @@ size="mini" type="text" icon="el-icon-edit" + @click="handleView(scope.row)" + >查看 + 编辑 + 驳回提交 删除 @@ -319,6 +333,12 @@ export default { /** 新增按钮操作 */ handleAdd() { this.$router.push("/claimAndRefund/receive/receiveApplyAdd"); + this.$router.push({ + path:'/claimAndRefund/receive/receiveApplyAdd', + query:{ + isEdit:true + } + }) // this.reset(); // this.open = true; // this.title = "添加字典类型"; @@ -329,12 +349,22 @@ export default { this.single = selection.length!=1 this.multiple = !selection.length }, + handleView(row) { + this.$router.push({ + path:'/claimAndRefund/receive/receiveApplyAdd', + query:{ + taskId:row.taskId, + isEdit:false + } + }) + }, /** 修改按钮操作 */ handleUpdate(row) { this.$router.push({ path:'/claimAndRefund/receive/receiveApplyAdd', query:{ - taskId:row.taskId + taskId:row.taskId, + isEdit:true } }) }, @@ -381,9 +411,9 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('system/dict/type/export', { - ...this.queryParams - }, `type_${new Date().getTime()}.xlsx`) + // this.download('system/dict/type/export', { + // ...this.queryParams + // }, `type_${new Date().getTime()}.xlsx`) }, /** 刷新缓存按钮操作 */ handleRefreshCache() { diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue index e9b214e2..a0740886 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue @@ -76,6 +76,8 @@ plain icon="el-icon-plus" size="mini" + v-if="isEdit=='true'" + :disabled="multiple" @click="handleAdd" >保存 @@ -103,11 +105,11 @@ - - - - - + + + + + - + - -