Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue

@@ -638,6 +638,10 @@ export default {
     submit() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.pmsPurchaseBillDetailList.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '商品列表不能为空' })
+            return
+          }
           this.submitdisabled = true
           this.formobj.payableAmount = this.yfTotal
           this.formobj.purchasePay.goodsMoney = this.calculateGoodsMoney

yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue

@@ -236,7 +236,7 @@ export default {
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100
           }
         })
       }
@@ -248,7 +248,7 @@ export default {
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            th = Math.round((parseFloat(th) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+            th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmotun !== '' ? e.backAmotun : '0')) * 100) / 100
           }
         })
       }
@@ -423,6 +423,10 @@ export default {
     submit() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.pmsPurchasebackDetailList.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '商品列表不能为空' })
+            return
+          }
           this.submitdisabled = true
           this.formobj.receivableAmount = this.ysTotal
           req.submit(this.formobj).then((res) => {

yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue

@@ -215,7 +215,7 @@ export default {
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100
           }
         })
       }
@@ -227,7 +227,7 @@ export default {
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            th = Math.round((parseFloat(th) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+            th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmotun !== '' ? e.backAmotun : '0')) * 100) / 100
           }
         })
       }

yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue

@@ -636,6 +636,10 @@ export default {
     submit() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.pmsPurchaseBillDetailList.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '商品列表不能为空' })
+            return
+          }
           this.submitdisabled = true
           this.formobj.payableAmount = this.yfTotal
           this.formobj.purchasePay.goodsMoney = this.calculateGoodsMoney

yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue

@@ -321,7 +321,7 @@ export default {
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100
           }
         })
       }
@@ -333,7 +333,7 @@ export default {
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            th = Math.round((parseFloat(th) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+            th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmotun !== '' ? e.backAmotun : '0')) * 100) / 100
           }
         })
       }

yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue

@@ -251,7 +251,7 @@ export default {
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100
           }
         })
       }
@@ -263,7 +263,7 @@ export default {
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            th = Math.round((parseFloat(th) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+            th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmotun !== '' ? e.backAmotun : '0')) * 100) / 100
           }
         })
       }
@@ -417,6 +417,10 @@ export default {
     submit() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.pmsPurchasebackDetailList.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '商品列表不能为空' })
+            return
+          }
           this.submitdisabled = true
           this.formobj.receivableAmount = this.ysTotal
           req.submit(this.formobj).then((res) => {

yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue

@@ -250,7 +250,7 @@ export default {
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.backCount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100
           }
         })
       }
@@ -262,7 +262,7 @@ export default {
       if (this.formobj.pmsPurchasebackDetailList.length > 0) {
         this.formobj.pmsPurchasebackDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            th = Math.round((parseFloat(th) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+            th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmotun !== '' ? e.backAmotun : '0')) * 100) / 100
           }
         })
       }