lilei 3 rokov pred
rodič
commit
38992fdc8f

+ 2 - 2
src/views/salesManagement/salesQuery/edit.vue

@@ -459,7 +459,7 @@ export default {
           centered: true,
           closable: true,
           onOk () {
-            if (row.putCost > row.salePrice) {
+            if (row.putCost > row.price) {
               // 销售价低于成本价
               _this.$confirm({
                 title: '提示',
@@ -490,7 +490,7 @@ export default {
         cost: row.putCost,
         // productCode: row.productCode,
         // productOrigCode: row.productOrigCode,
-        price: row.salePrice,
+        price: row.price,
         qty: row.salesNums,
         salesBillSn: this.detailData.salesBillSn,
         salesBillNo: this.detailData.salesBillNo,

+ 2 - 3
src/views/salesManagement/salesQuery/queryPart.vue

@@ -411,15 +411,14 @@ export default {
     // 选择配件
     handleAdd (row) {
       const _this = this
-      console.log(row.lastSalePrice, row.salePrice, row.lastSalePrice < row.salePrice)
-      if (row.lastSalePrice && (row.lastSalePrice < row.salePrice)) {
+      console.log(row.price, row.lastSalePrice, row.salePrice, row.lastSalePrice < row.salePrice)
+      if (row.lastSalePrice && (row.price < row.salePrice)) {
         _this.$confirm({
           title: '提示',
           content: '售价低于定价,是否仍继续添加?',
           centered: true,
           closable: true,
           onOk () {
-            row.salePrice = row.lastSalePrice
             _this.$emit('add', row)
           }
         })