From 5ddc8322249bddc42d6171bf3470b35e6f75fcde Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 9 Jul 2024 16:54:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=80=80=E6=96=99?= =?UTF-8?q?=E6=97=B6bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7=E6=97=B6=E9=A6=96=E5=82=AC?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/App.vue | 28 +++-------- .../return/receive/component/handlePage.vue | 2 +- .../return/scrap/component/return.vue | 9 ++-- sgzb-ui/src/views/repairTest/repair/index.vue | 11 ++++- .../views/repairTest/repairScrap/index.vue | 11 ++++- .../forecastWaste/auditingReturn/index.vue | 1 + sgzb-ui/src/views/system/user/index.vue | 48 +++++++++---------- sgzb-ui/vue.config.js | 4 +- 8 files changed, 60 insertions(+), 54 deletions(-) diff --git a/sgzb-ui/src/App.vue b/sgzb-ui/src/App.vue index bbe64e14..42825bf0 100644 --- a/sgzb-ui/src/App.vue +++ b/sgzb-ui/src/App.vue @@ -44,18 +44,17 @@ export default { }, updated() { // 判断是否需要获取通知信息 - if ( - localStorage.getItem('notice') && - getToken() && - !this.noticeDialog.outerVisible - ) { - this.getHomeNoticeFun() - } + // if ( + // localStorage.getItem('notice') && + // getToken() && + // !this.noticeDialog.outerVisible + // ) { + // this.getHomeNoticeFun() + // } }, methods: { // 获取通知公告的信息 async getHomeNoticeFun() { - console.log('获取公告！！！') const res = await getHomeNoticeApi() if (res.code == 200) { if (res.data.length > 0) { @@ -80,16 +79,3 @@ export default { } - diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue index 03030565..acea28fa 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue @@ -1188,7 +1188,7 @@ export default { } arr.push(obj) - if (!obj.scrapType || !obj.fileUrl) { + if (obj.scrapType === '' || !obj.fileUrl) { this.$message.error('请编辑报废信息！') isScrapInfo = true return diff --git a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue index 4b068eed..aee77ed4 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue @@ -407,7 +407,7 @@ export default { scrapType: '', // 损坏原因 fileUrl: '', }, - isNumReturn: false, + isNumReturnNew: false, } }, created() { @@ -629,6 +629,7 @@ export default { } if (bfNum > 0) { + this.isNumReturnNew = !this.isNumReturnNew detailsInfo.backNum = bfNum detailsInfo.backStatus = 3 if ( @@ -636,7 +637,6 @@ export default { !this.numDetailsInfo.fileUrl ) { this.$message.error('请编辑报废信息！') - this.isNumReturn = true return } const { scrapReason, scrapType, fileUrl } = this.numDetailsInfo @@ -663,6 +663,7 @@ export default { this.$message.error('报废数量已超过剩余待退料数量') return } + this.isNumReturnNew = true this.dialogConfigReturn.innerVisible = true }, // 批量撤回 @@ -709,7 +710,7 @@ export default { this.$refs.scrapInfoRef.validate((valid) => { if (valid) { // this.isNumReturn 为true则未数量退料 - if (this.isNumReturn) { + if (this.isNumReturnNew) { this.numDetailsInfo.scrapReason = this.scrapInfoParams.scrapReason this.numDetailsInfo.scrapType = @@ -844,7 +845,7 @@ export default { this.scrapInfoParams.fileUrl = '' this.scrapInfoParams.fileList = [] this.codeDetails = true - this.isNumReturn = false + this.isNumReturnNew = false this.imgUrlList = [] } }, diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue index ff09638e..10940fa2 100644 --- a/sgzb-ui/src/views/repairTest/repair/index.vue +++ b/sgzb-ui/src/views/repairTest/repair/index.vue @@ -160,7 +160,16 @@ @selection-change="handleSelectionChange" border > - + - + - + 删除 - - - - - - - - - - - + + + + + + + + + + + - + @@ -375,12 +375,12 @@ @@ -623,8 +623,8 @@ export default { // 列信息 columns: [ { key: 0, label: `用户编号`, visible: true }, - { key: 1, label: `用户名称`, visible: true }, - { key: 2, label: `用户昵称`, visible: true }, + { key: 1, label: `账号名`, visible: true }, + { key: 2, label: `用户姓名`, visible: true }, { key: 3, label: `部门`, visible: true }, { key: 4, label: `手机号码`, visible: true }, { key: 5, label: `状态`, visible: true }, @@ -635,20 +635,20 @@ export default { userName: [ { required: true, - message: '用户名称不能为空', + message: '账号名不能为空', trigger: 'blur', }, { min: 2, max: 20, - message: '用户名称长度必须介于 2 和 20 之间', + message: '账号名长度必须介于 2 和 20 之间', trigger: 'blur', }, ], nickName: [ { required: true, - message: '用户昵称不能为空', + message: '用户姓名不能为空', trigger: 'blur', }, ], diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index eb4b088a..40502dd6 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -43,10 +43,10 @@ module.exports = { // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - // target: `http://192.168.2.122:28080`, //超 + target: `http://192.168.2.122:28080`, //超 // target: `http://10.40.92.81:28080`, //韩/ // target: `http://10.40.92.74:8080`,//旭/ - target: `http://192.168.2.248:28080`, //帅 + // target: `http://192.168.2.248:28080`, //帅 // target: `http://192.168.2.209:28080`, //福 //******** 注意事项 ********* */ From 8e07744e101d75641a3d1f0fb4d37f9b8a76a79c Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 9 Jul 2024 17:07:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=90=9C=E7=B4=A0=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/warehousing/repairWarehousing.vue | 9 +++++++-- .../warehousing/newParts/index.vue | 2 +- .../warehousing/repair/index.vue | 19 +++++++++++++++---- .../warehousing/return/index.vue | 9 +++++++-- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue index 413e9a20..2559c2a1 100644 --- a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue +++ b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue @@ -18,7 +18,7 @@ @keyup.enter.native="handleQuery" /> - +