Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

2023-05-08 11:04:32 +08:00
parent adeab1ccea 20af7e5b14
commit c655fcf5bb
29 changed files with 1151 additions and 731 deletions
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -413,7 +413,7 @@ export default {
        } else {
          this.confirm_flag = true
        }
-        if (current.bill_status === '40') {
+        if (current.bill_status === '40' || current.bill_status === '30') {
          this.outReturn_flag = false
        } else {
          this.outReturn_flag = true