From bc3435fa09c6ae1ddff17ab014e6f308b94c05a1 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Fri, 29 Apr 2022 11:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=87=BA=E5=BA=93=202022-04-?= =?UTF-8?q?28=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 4 +- src/api/crollinfo/crollinfo.js | 5 + src/views/main-navbar-update-password.vue | 19 +- .../finishedProductWarehouse/otherOut.vue | 760 ++---------------- .../modules/shopOrder/shopOrder/shopOrder.vue | 8 +- 5 files changed, 112 insertions(+), 684 deletions(-) diff --git a/src/App.vue b/src/App.vue index a763052..ffa533a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,7 +11,7 @@ data() { return { query: {}, - version: '1.2.1' + version: '1.2.2' } }, created() { @@ -21,7 +21,7 @@ versionReload(){ let version = this.version; //版本号（每次上线前需要更新下版本号） console.log('最新系统版本: ',version) - console.log('当前系统班帮: ',this.version) + console.log('当前系统版本: ',this.version) let versionLocal = localStorage.getItem('_version_'); if(version!=versionLocal){ localStorage.setItem('_version_',version); diff --git a/src/api/crollinfo/crollinfo.js b/src/api/crollinfo/crollinfo.js index cdd4e69..5d95f44 100644 --- a/src/api/crollinfo/crollinfo.js +++ b/src/api/crollinfo/crollinfo.js @@ -15,3 +15,8 @@ export const batchUpdateExpireddate = data => createAPI(`/finishedProduct/crolli // 获取有效期列表 export const expiryList = data => createAPI(`/finishedProduct/crollinfo/expiryList`,'post',data) + +// 批量出库 +export const batchRollUpdateStatus = data => createAPI(`/finishedProduct/crollinfo/batchRollUpdateStatus`,'post',data) + + diff --git a/src/views/main-navbar-update-password.vue b/src/views/main-navbar-update-password.vue index d726d07..d257bb8 100644 --- a/src/views/main-navbar-update-password.vue +++ b/src/views/main-navbar-update-password.vue @@ -78,6 +78,21 @@ // 表单提交 dataFormSubmit () { this.$refs['dataForm'].validate((valid) => { + let password = this.dataForm.password + let newPassword = this.dataForm.newPassword + let confirmPassword =this.dataForm.confirmPassword + if (!password){ + this.$message.warning('原密码不能为空') + return + } + if (!newPassword){ + this.$message.warning('新密码不能为空') + return + } + if (!confirmPassword){ + this.$message.warning('确认密码不能为空') + return + } if (valid) { this.$http({ url: this.$http.adornUrl('/sys/user/password'), @@ -88,7 +103,7 @@ }) }).then(({data}) => { if (data && data.code === 0) { - this.$message( '操作成功') + this.$message.success( '操作成功') this.visible = false this.$nextTick(() => { this.mainTabs = [] @@ -96,7 +111,7 @@ this.$router.replace({ name: 'login' }) }) } else { - this.$message.error(data.msg) + this.$message.warning(data.msg) } }) } diff --git a/src/views/modules/finishedProductWarehouse/otherOut.vue b/src/views/modules/finishedProductWarehouse/otherOut.vue index b8e6b7b..7089af6 100644 --- a/src/views/modules/finishedProductWarehouse/otherOut.vue +++ b/src/views/modules/finishedProductWarehouse/otherOut.vue @@ -7,9 +7,10 @@ - + + {{ buttons.outList }} {{ buttons.defaultTable }} {{ buttons.settingTable }} @@ -38,18 +39,28 @@ + + + + - - +