diff --git a/RuoYi-App-master/api/out/productOut.js b/RuoYi-App-master/api/out/productOut.js
index 3d5eff4..71a5265 100644
--- a/RuoYi-App-master/api/out/productOut.js
+++ b/RuoYi-App-master/api/out/productOut.js
@@ -52,7 +52,7 @@ export function submitError(data) {
})
}
-export function sunbmitDeatil(query) {
+export function submitDetail(query) {
return request({
url: '/out/submit/list',
method: 'get',
diff --git a/RuoYi-App-master/pages/in/bindMsg.vue b/RuoYi-App-master/pages/in/bindMsg.vue
index f82fd50..838134e 100644
--- a/RuoYi-App-master/pages/in/bindMsg.vue
+++ b/RuoYi-App-master/pages/in/bindMsg.vue
@@ -517,6 +517,7 @@
this.subOrderInfo = null
},
handleQuantityInput(value) {
+ console.log(this.subOrderInfo.quantity)
const numValue = Number(value)
if (numValue <= 0) {
this.inQuantity = ''
@@ -536,26 +537,26 @@
}
this.inQuantity = String(numValue)
},
- handleQuantityInput(value) {
- const numValue = Number(value)
- if (numValue <= 0) {
- this.inQuantity = ''
- uni.showToast({
- title: this.$t('inbound.bindMsg.quantityGreaterThanZero'),
- icon: 'none'
- })
- return
- }
- if (numValue > this.subOrderInfo.quantity) {
- this.inQuantity = String(this.subOrderInfo.quantity)
- uni.showToast({
- title: this.$t('inbound.bindMsg.notExceedMaxQuantity'),
- icon: 'none'
- })
- return
- }
- this.inQuantity = String(numValue)
- },
+ // handleQuantityInput(value) {
+ // const numValue = Number(value)
+ // if (numValue <= 0) {
+ // this.inQuantity = ''
+ // uni.showToast({
+ // title: this.$t('inbound.bindMsg.quantityGreaterThanZero'),
+ // icon: 'none'
+ // })
+ // return
+ // }
+ // if (numValue > this.subOrderInfo.quantity) {
+ // this.inQuantity = String(this.subOrderInfo.quantity)
+ // uni.showToast({
+ // title: this.$t('inbound.bindMsg.notExceedMaxQuantity'),
+ // icon: 'none'
+ // })
+ // return
+ // }
+ // this.inQuantity = String(numValue)
+ // },
// 处理绑定子单据事件
async handleBindSubOrder() {
// 验证必填信息
diff --git a/RuoYi-App-master/pages/in/qualityCheck.vue b/RuoYi-App-master/pages/in/qualityCheck.vue
index 4cc390e..e90e9f2 100644
--- a/RuoYi-App-master/pages/in/qualityCheck.vue
+++ b/RuoYi-App-master/pages/in/qualityCheck.vue
@@ -34,7 +34,13 @@
- {{ material.extraField.materialDesc }}
+
+ {{ material.extraField.materialDesc }}
+
+ {{ material.stockStatus == '1' ? $t('inbound.qualityCheck.checked') : $t('inbound.qualityCheck.unchecked') }}
+
+
+
{{ $t('inbound.qualityCheck.quantity') }}
-
- {{ material.stockStatus == '1' ? $t('inbound.qualityCheck.checked') : $t('inbound.qualityCheck.unchecked') }}
-
+
@@ -195,12 +199,31 @@ export default {
// 质检操作
async handleQualityCheck(index, mIndex) {
const material = this.orderList[index].materials[mIndex]
+ // if(material.stockStatus == 1)
+ // {
+ // uni.showToast({
+ // title:"该物料已质检",
+ // icon: "error"
+ // })
+ // return
+ // }
+
+ if(material.quantity <= 0)
+ {
+ uni.showToast({
+ title:"请输入正确数量",
+ icon: "error"
+ })
+ return
+ }
+
const response = await updateReceiveStockinStatus({
stockinDetailId: material.stockinDetailId,
quantity: material.quantity,
stockinGuid:material.stockinGuid,
stockStatus: '1'
})
+
if (response.code === 200) {
uni.showToast({
title: `${material.extraField.materialDesc} ${this.$t('inbound.qualityCheck.checkSuccess')}`,
@@ -299,7 +322,7 @@ export default {
}
.material-detail {
- margin: 0 24rpx 24rpx;
+ margin: 0rpx 10rpx 10rpx;
transition: all 0.3s ease;
max-height: 600rpx;
overflow-y: auto;
@@ -320,6 +343,7 @@ export default {
&:active {
background-color: #3a8ee6;
+ background: linear-gradient(to bottom, #537bff 0%, #318aff 70%,);
}
}
}
@@ -331,7 +355,7 @@ export default {
.material-row {
display: flex;
align-items: center;
- padding: 20rpx 0;
+ padding: 20rpx 15rpx;
gap: 20rpx;
flex-wrap: nowrap;
@@ -343,9 +367,10 @@ export default {
.material-name {
flex: 1;
- font-size: 28rpx;
+ display: flex;
+ font-size: 26rpx;
color: #303133;
- min-width: 200rpx;
+ min-width: 148rpx;
word-break: break-word;
white-space: normal;
overflow: hidden;
@@ -354,7 +379,7 @@ export default {
.material-quantity {
font-size: 26rpx;
color: #606266;
- width: 250rpx;
+ width: 230rpx;
display: flex;
align-items: center;
gap: 10rpx;
@@ -366,13 +391,14 @@ export default {
color: #fff;
border: none;
border-radius: 10rpx;
- padding: 12rpx 24rpx;
+ padding: 5rpx 24rpx;
font-size: 26rpx;
cursor: pointer;
min-width: 100rpx;
&:active {
background-color: #3a8ee6;
+ background: linear-gradient(to bottom, #537bff 0%, #318aff 70%,);
}
&.button-disabled {
diff --git a/RuoYi-App-master/pages/out/bindShell.vue b/RuoYi-App-master/pages/out/bindShell.vue
index 9874337..f48bc20 100644
--- a/RuoYi-App-master/pages/out/bindShell.vue
+++ b/RuoYi-App-master/pages/out/bindShell.vue
@@ -101,7 +101,7 @@