diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue
index b7b5fb2bdb..3c2428cc54 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue
@@ -15,8 +15,8 @@
-
-
+
+
@@ -44,7 +44,7 @@
-
+
@@ -81,12 +81,8 @@
- 业务类型
-
-
-
-
-
+ 银行简称
+
备注
@@ -125,8 +121,7 @@ export default {
companyName: '', // 单位名称
bank: '', // 开户行
receivingAccount: '', // 收款银行账号
- businessTypeKey: '', // 业务类型key
- businessTypeValue: '', // 业务类型value
+ bankShortName: '',
remarks: '', // 备注
useOrgSid: '', // 分公司sid
useOrgName: ''
@@ -171,7 +166,7 @@ export default {
params: {
companyCode: '',
companyName: '',
- businessTypeValue: '',
+ bank: '',
orgPath: '',
menuUrl: '',
userSid: ''
@@ -265,7 +260,7 @@ export default {
params: {
companyCode: '',
companyName: '',
- businessTypeValue: '',
+ bank: '',
orgPath: '',
menuUrl: '',
userSid: ''
@@ -326,8 +321,7 @@ export default {
companyName: '', // 单位名称
bank: '', // 开户行
receivingAccount: '', // 收款银行账号
- businessTypeKey: '', // 业务类型key
- businessTypeValue: '', // 业务类型value
+ bankShortName: '',
remarks: '', // 备注
useOrgSid: '', // 分公司sid
useOrgName: ''
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
index 70f42a9457..86edc07208 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
@@ -223,6 +223,18 @@ export default {
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
+ if (this.formobj.list.length === 0) {
+ this.$message({ showClose: true, type: 'error', message: '商品列表不能为空' })
+ return
+ }
+ for (var i = 0; i < this.formobj.list.length; i++) {
+ if (this.formobj.list[i].actualInCount === '' ) {
+ this.$message({ showClose: true, type: 'error', message: '实收数量不能为空' })
+ return
+ } else if (parseFloat(this.formobj.list[i].actualInCount) < 1) {
+ this.$message({ showClose: true, type: 'error', message: '实收数量不能为零' })
+ }
+ }
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
@@ -245,14 +257,11 @@ export default {
return
}
for (var i = 0; i < this.formobj.list.length; i++) {
- var item = this.formobj.list[i]
- if (item.actualInCount == 0) {
- this.$message({
- showClose: true,
- type: 'error',
- message: '实收数量不能为空'
- })
+ if (this.formobj.list[i].actualInCount === '' ) {
+ this.$message({ showClose: true, type: 'error', message: '实收数量不能为空' })
return
+ } else if (parseFloat(this.formobj.list[i].actualInCount) < 1) {
+ this.$message({ showClose: true, type: 'error', message: '实收数量不能为零' })
}
}
this.submitdisabled = true