chenrui vor 2 Jahren
Ursprung
Commit
cedb5f3b7f

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -429,7 +429,7 @@ export default {
           this.visibleAudit = false
           this.$message.success(res.message)
           this.spinningAudit = false
-          if (billStatus == 'AUDIT_PASS' && !this.auditText) {
+          if (billStatus == 'AUDIT_PASS' && !this.auditText && res.data.dispatchBillSn) {
             this.$router.push({ name: 'waitDispatch', params: { salesBillSn: this.bizSn || this.$route.params.sn, dispatchBillSn: res.data.dispatchBillSn } })
           } else {
             //  关闭详情跳列表

+ 16 - 11
src/views/salesManagement/salesQuery/edit.vue

@@ -589,18 +589,23 @@ export default {
     },
     // 提交销售单
     handleSubmit () {
-      // 先不提交,先判断是否有价格更新
-      submitCheck({ salesBillSn: this.salesBillSn }).then(res => {
-        if (res.status == 200) {
-          if (res.data.length > 0) {
-            this.updataData = res.data
-            this.priceUpdateModal = true
-          } else {
-            const ajax_data = { salesBillSn: this.salesBillSn }
-            this.submitResult(ajax_data)
+      // 先不提交,先判断是否有价格更新  (下级创建时判断)
+      if (this.detailData && this.detailData.salesBillSource && this.detailData.salesBillSource == 'PURCHASE') {
+        submitCheck({ salesBillSn: this.salesBillSn }).then(res => {
+          if (res.status == 200) {
+            if (res.data.length > 0) {
+              this.updataData = res.data
+              this.priceUpdateModal = true
+            } else {
+              const ajax_data = { salesBillSn: this.salesBillSn }
+              this.submitResult(ajax_data)
+            }
           }
-        }
-      })
+        })
+      } else {
+        const ajax_data = { salesBillSn: this.salesBillSn }
+        this.submitResult(ajax_data)
+      }
     },
     // 提交
     submitResult (data) {

+ 6 - 0
src/views/salesManagement/salesQuery/list.vue

@@ -611,6 +611,12 @@ export default {
           font-size: 13px;
         }
       }
+      .warehouse_box{
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
       .warehouse_box>span::after{
         content:','
       }