From 7590d546b26d62c8d0da99077d7ba2953535f158 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 17 Apr 2025 15:46:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.css | 15 +++++++++++ components/ScanInput.vue | 1 + components/ScanInput_new.vue | 1 + components/SearchBox.vue | 1 + manifest.json | 4 +-- pages/management/alloc-maintenance_new.vue | 26 ++++++++++++++++--- pages/management/in-storage_LLCKD.vue | 26 ++++++++++++++++--- pages/management/in-storage_new.vue | 30 +++++++++++++++++----- pages/management/receive-confirm_new.vue | 28 ++++++++++++++++---- utils/request.js | 4 +++ 10 files changed, 115 insertions(+), 21 deletions(-) diff --git a/common/style/layout.css b/common/style/layout.css index 1640c83..198ea1d 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -600,4 +600,19 @@ uni-toast .uni-toast { } .uni-select__input-placeholder { color: grey !important; +} +/** 提示框 */ +uni-modal .uni-modal { + border: 1px solid #24A9EE; + background: linear-gradient(0deg, rgba(36, 184, 244, 90%), rgba(26, 148, 220, 90%)); + color: #fff; +} +.uni-modal .uni-modal__title { + font-weight: bold; +} +.uni-modal .uni-modal__bd { + color: #fff; +} +uni-modal .uni-modal__btn_primary { + background: radial-gradient(50% 140%, rgba(36, 184, 244, 90%), rgba(26, 148, 220, 90%)); } \ No newline at end of file diff --git a/components/ScanInput.vue b/components/ScanInput.vue index 792cdab..3d1eb9c 100644 --- a/components/ScanInput.vue +++ b/components/ScanInput.vue @@ -81,6 +81,7 @@ uni.showModal({ content: "需要相机权限", confirmText: "设置", + confirmColor: '#fff', success: function(res) { if (res.confirm) { permision.gotoAppSetting(); diff --git a/components/ScanInput_new.vue b/components/ScanInput_new.vue index 18f129e..55ed7ff 100644 --- a/components/ScanInput_new.vue +++ b/components/ScanInput_new.vue @@ -84,6 +84,7 @@ uni.showModal({ content: "需要相机权限", confirmText: "设置", + confirmColor: '#fff', success: function(res) { if (res.confirm) { permision.gotoAppSetting(); diff --git a/components/SearchBox.vue b/components/SearchBox.vue index 547871f..3345231 100644 --- a/components/SearchBox.vue +++ b/components/SearchBox.vue @@ -89,6 +89,7 @@ uni.showModal({ content: "需要相机权限", confirmText: "设置", + confirmColor: '#fff', success: function(res) { if (res.confirm) { permision.gotoAppSetting(); diff --git a/manifest.json b/manifest.json index d9fcbbe..ddb17bf 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "诺力三期", "appid" : "__UNI__E82B13F", "description" : "诺力三期平板系统", - "versionName" : "1.1.0", - "versionCode" : 110, + "versionName" : "1.1.1", + "versionCode" : 111, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue index cc98016..03c1f1e 100644 --- a/pages/management/alloc-maintenance_new.vue +++ b/pages/management/alloc-maintenance_new.vue @@ -509,10 +509,13 @@ this.disabled1 = true try { let res = await easOutInBillSync('ALLO') - uni.showToast({ - title: res.desc, - icon: 'none' - }) + if (res) { + this._allocationPage() + uni.showToast({ + title: res.desc, + icon: 'none' + }) + } this.disabled1 = false } catch (e) { this.disabled1 = false @@ -618,6 +621,21 @@ this.disabled1 = false return } + uni.showModal({ + title: '提示', + content: '是否确认删除？', + cancelColor: '#fff', + confirmColor: '#fff', + success: (res) => { + if (res.confirm) { + this.__easOutInBillDelete() + } else if (res.cancel) { + this.disabled1 = false + } + } + }) + }, + async __easOutInBillDelete () { try { let res = await easOutInBillDelete('ALLO', this.checkData) if (res.code === 1) { diff --git a/pages/management/in-storage_LLCKD.vue b/pages/management/in-storage_LLCKD.vue index b2a8d64..8fa7c6b 100644 --- a/pages/management/in-storage_LLCKD.vue +++ b/pages/management/in-storage_LLCKD.vue @@ -603,10 +603,13 @@ try { let type = this.id === 'CGRKD' ? 'SRMINOUT' : 'EASINOUT' let res = await easOutInBillSync(type) - uni.showToast({ - title: res.desc, - icon: 'none' - }) + if (res) { + this._easOutInBillPage() + uni.showToast({ + title: res.desc, + icon: 'none' + }) + } this.disabled1 = false } catch (e) { this.disabled1 = false @@ -619,6 +622,21 @@ this.disabled1 = false return } + uni.showModal({ + title: '提示', + content: '是否确认删除？', + cancelColor: '#fff', + confirmColor: '#fff', + success: (res) => { + if (res.confirm) { + this.__easOutInBillDelete() + } else if (res.cancel) { + this.disabled1 = false + } + } + }) + }, + async __easOutInBillDelete () { try { let type = this.id === 'CGRKD' ? 'SRMINOUT' : 'EASINOUT' let res = await easOutInBillDelete(type, this.checkData) diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue index c7b511b..62f76ff 100644 --- a/pages/management/in-storage_new.vue +++ b/pages/management/in-storage_new.vue @@ -96,8 +96,8 @@ - {{el.wlbm}} - {{el.wlbm}} + {{el.wlbm}} + {{el.wlmc}} {{el.gzhbm}} {{el.ckmc}} @@ -573,10 +573,13 @@ try { let type = this.id === 'CGRKD' ? 'SRMINOUT' : 'EASINOUT' let res = await easOutInBillSync(type) - uni.showToast({ - title: res.desc, - icon: 'none' - }) + if (res) { + this._easOutInBillPage() + uni.showToast({ + title: res.desc, + icon: 'none' + }) + } this.disabled1 = false } catch (e) { this.disabled1 = false @@ -589,6 +592,21 @@ this.disabled1 = false return } + uni.showModal({ + title: '提示', + content: '是否确认删除？', + cancelColor: '#fff', + confirmColor: '#fff', + success: (res) => { + if (res.confirm) { + this.__easOutInBillDelete() + } else if (res.cancel) { + this.disabled1 = false + } + } + }) + }, + async __easOutInBillDelete () { try { let type = this.id === 'CGRKD' ? 'SRMINOUT' : 'EASINOUT' let res = await easOutInBillDelete(type, this.checkData) diff --git a/pages/management/receive-confirm_new.vue b/pages/management/receive-confirm_new.vue index ea8aef1..7016941 100644 --- a/pages/management/receive-confirm_new.vue +++ b/pages/management/receive-confirm_new.vue @@ -61,7 +61,7 @@ - + @@ -620,10 +620,13 @@ this.disabled1 = true try { let res = await easOutInBillSync('RECE') - uni.showToast({ - title: res.desc, - icon: 'none' - }) + if (res) { + this._receiptPage() + uni.showToast({ + title: res.desc, + icon: 'none' + }) + } this.disabled1 = false } catch (e) { this.disabled1 = false @@ -661,6 +664,21 @@ this.disabled1 = false return } + uni.showModal({ + title: '提示', + content: '是否确认删除？', + cancelColor: '#fff', + confirmColor: '#fff', + success: (res) => { + if (res.confirm) { + this.__easOutInBillDelete() + } else if (res.cancel) { + this.disabled1 = false + } + } + }) + }, + async __easOutInBillDelete () { try { let res = await easOutInBillDelete('RECE', this.checkData) if (res.code === 1) { diff --git a/utils/request.js b/utils/request.js index 63f762d..0bb1cc3 100644 --- a/utils/request.js +++ b/utils/request.js @@ -49,6 +49,7 @@ const request = (params) => { uni.hideLoading(); uni.showModal({ content: 'request:fail', + confirmColor: '#fff', showCancel: false }) reject('request:fail') @@ -56,6 +57,7 @@ const request = (params) => { uni.hideLoading(); uni.showModal({ content: `${res[1].data.message}`, + confirmColor: '#fff', showCancel: false }) reject(res[1].data.message) @@ -63,6 +65,7 @@ const request = (params) => { uni.hideLoading(); uni.showModal({ content: `${res[1].data.message}`, + confirmColor: '#fff', showCancel: false }) // store.dispatch('delUserInfo', '') @@ -79,6 +82,7 @@ const request = (params) => { uni.hideLoading(); uni.showModal({ content: `${res[1].data.message}`, + confirmColor: '#fff', showCancel: false }) reject(res[1].data.message)