root/pad-nl-three-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改111

Browse Source
This commit is contained in:
caill
2025-04-17 15:46:32 +08:00
parent 88955a178b
commit 7590d546b2
10 changed files with 115 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/style/layout.css
View File

@@ -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%));
}

1
components/ScanInput.vue
View File

@@ -81,6 +81,7 @@
uni.showModal({
content: "需要相机权限",
confirmText: "设置",
confirmColor: '#fff',
success: function(res) {
if (res.confirm) {
permision.gotoAppSetting();

1
components/ScanInput_new.vue
View File

@@ -84,6 +84,7 @@
uni.showModal({
content: "需要相机权限",
confirmText: "设置",
confirmColor: '#fff',
success: function(res) {
if (res.confirm) {
permision.gotoAppSetting();

1
components/SearchBox.vue
View File

@@ -89,6 +89,7 @@
uni.showModal({
content: "需要相机权限",
confirmText: "设置",
confirmColor: '#fff',
success: function(res) {
if (res.confirm) {
permision.gotoAppSetting();

4
manifest.json
View File

@@ -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" : {

26
pages/management/alloc-maintenance_new.vue
View File

@@ -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) {

26
pages/management/in-storage_LLCKD.vue
View File

@@ -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)

30
pages/management/in-storage_new.vue
View File

@@ -96,8 +96,8 @@
<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
</view>
</td>
<td v-if="id !== 'CGRKD'" class="underline fontcol1" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
<td v-if="id === 'CGRKD'" class="fontcol1">{{el.wlbm}}</td>
<td class="underline fontcol1" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
<!-- <td v-if="id === 'CGRKD'" class="fontcol1">{{el.wlbm}}</td> -->
<td>{{el.wlmc}}</td>
<td>{{el.gzhbm}}</td>
<td>{{el.ckmc}}</td>
@@ -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)

28
pages/management/receive-confirm_new.vue
View File

@@ -61,7 +61,7 @@
<button class="confirm-button" @tap="toSubSearch(e)">查询</button>
<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked}" @tap="showPop(1, e, {})">一键设置</button>
<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked || !e.subStatus1}" @tap="showPop(4, e, {})">库位分配</button>
<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked || !e.subStatus1}" @tap="inWarehouseSure(e)">库存提交</button>
<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked || !e.subStatus1}" @tap="inWarehouseSure(e)">提交</button>
<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked || !e.subStatus1}" :disabled="disabled1" @tap="_receiptBillConfirm(e)">确认收货</button>
</view>
</view>
@@ -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) {

4
utils/request.js
View File

@@ -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)