Browse Source

发送明细手册纱单价和手册纱占比必填条件增加

jbb 2 năm trước cách đây
mục cha
commit
7887bdf34e

+ 2 - 2
src/views/shipment-details/addShipDetDrawer.vue

@@ -761,10 +761,10 @@ export default {
           //判断当是手册纱时,手册纱单价和手册纱占比是否为空
           for (var i=0; i<newObj.syShippingDetailsItemList.length; i++){
             var rowData = newObj.syShippingDetailsItemList[i];
-            if((rowData.manualYarnFlag === 1 && rowData.manualYarnUnitPrice === undefined) || (rowData.manualYarnFlag === 1 && rowData.manualYarnUnitPrice === '') ){
+            if((rowData.manualYarnFlag === 1 && !rowData.manualYarnUnitPrice) || (rowData.manualYarnFlag === 1 && rowData.manualYarnUnitPrice === '')|| (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === "0") || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === 0) ){
                this.$message.error('手册纱单价为必填项');
                return
-             }else if((rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === undefined) || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === '') || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === "0") || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === 0)){
+             }else if((rowData.manualYarnFlag === 1 && !rowData.manualYarnProportion) || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === '') || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === "0") || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === 0)){
                this.$message.error('手册纱占比为必填项');
                return
             }

+ 2 - 2
src/views/shipment-details/editShipDetDrawer.vue

@@ -665,10 +665,10 @@ export default {
           //判断当是手册纱时,手册纱单价和手册纱占比是否为空
           for (var i=0; i<this.editShipDet.syShippingDetailsItemList.length; i++){
             var rowData = this.editShipDet.syShippingDetailsItemList[i];
-            if((rowData.manualYarnFlag === 1 && rowData.manualYarnUnitPrice === undefined) || (rowData.manualYarnFlag === 1 && rowData.manualYarnUnitPrice === '') ){
+            if((rowData.manualYarnFlag === 1 && !rowData.manualYarnUnitPrice) || (rowData.manualYarnFlag === 1 && rowData.manualYarnUnitPrice === '')|| (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === "0") || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === 0)){
                this.$message.error('手册纱单价为必填项');
                return
-             }else if((rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === undefined) || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === '') || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === "0") || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === 0)){
+             }else if((rowData.manualYarnFlag === 1 && !rowData.manualYarnProportion ) || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === '') || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === "0") || (rowData.manualYarnFlag === 1 && rowData.manualYarnProportion === 0)){
                this.$message.error('手册纱占比为必填项');
                return
             }