From 4da9e42ebaa18449faeed39c244c5922a14f0e7e Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Mon, 29 May 2023 17:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/components/confirmSubmit.vue | 12 ++++++----
 src/views/order/index.vue                    | 25 ++++++++++----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/views/order/components/confirmSubmit.vue b/src/views/order/components/confirmSubmit.vue
index e3014fa..0427a35 100644
--- a/src/views/order/components/confirmSubmit.vue
+++ b/src/views/order/components/confirmSubmit.vue
@@ -64,7 +64,7 @@
             <template slot-scope="{ row }"> {{ row.floorPrice }}元 </template>
           </el-table-column>
           <el-table-column label="成本总金额">
-            <template slot-scope="{ row }"> {{ (row.floorPrice * row.preQuantity) | toNumberFixed }}元 </template>
+            <template slot-scope="{ row }"> {{ row.preCostAmount | toNumberFixed }}元 </template>
           </el-table-column>
         </el-table>
       </template>
@@ -150,20 +150,22 @@ export default {
       if (salePrice && floorPrice && preQuantity && preAmount) {
         let strategyArr = [
           // 原策略
-          { salePrice: salePrice, floorPrice: floorPrice, preQuantity: preQuantity, preAmount: preAmount },
+          { salePrice, floorPrice: floorPrice, preQuantity: preQuantity, preAmount, preCostAmount: +floorPrice * +preQuantity },
           // 以提货量为准
           {
             salePrice: this.newSalePrice,
             floorPrice: this.newCostPrice,
-            preQuantity: preQuantity,
-            preAmount: +this.newSalePrice * +preQuantity
+            preQuantity,
+            preAmount: +this.newSalePrice * +preQuantity,
+            preCostAmount: +floorPrice * +preQuantity
           },
           // 以订单金额为准
           {
             salePrice: this.newSalePrice,
             floorPrice: this.newCostPrice,
             preQuantity: +preAmount / +this.newSalePrice,
-            preAmount: preAmount
+            preAmount,
+            preCostAmount: +floorPrice * +preQuantity
           }
         ]
         strategyArr.forEach((item, index) => {
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index d58ef5b..fddc8ab 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -116,9 +116,10 @@
               <el-link slot="reference" type="primary" :underline="false">订单锁定</el-link>
             </el-popconfirm>
 
-            <el-popconfirm v-if="row.orderStatus == 'ORDER_LOCKED'" title="是否确认下单？" icon-color="red" @confirm="confirmSubmit(row)">
-              <el-link slot="reference" type="primary" :underline="false">下单确认</el-link>
-            </el-popconfirm>
+            <!-- <el-popconfirm v-if="row.orderStatus == 'ORDER_LOCKED'" title="是否确认下单？" icon-color="red" @confirm="confirmSubmit(row)">
+            </el-popconfirm> -->
+
+            <el-link v-if="row.orderStatus == 'ORDER_LOCKED'" type="primary" :underline="false" @click="confirmSubmit(row)">下单确认</el-link>
 
             <el-popconfirm
               :title="row.orderStatus == 'SUBMITED' || row.orderStatus == 'ORDER_LOCKED' ? '是否确认取消订单？' : '是否确认退款？'"
@@ -395,16 +396,16 @@ export default {
     },
     // 下单确认
     confirmSubmit(row) {
-      // this.controlWindows.addInfo = row
-      // this.controlWindows.confirmSubmit = true
+      this.controlWindows.addInfo = row
+      this.controlWindows.confirmSubmit = true
 
-      order.orderSuccess({ id: row.id }).then(res => {
-        if (res.code == 20000) {
-          this.$message.success(res.msg)
-          // this.closeWindow()
-          this.getByPage()
-        }
-      })
+      // order.orderSuccess({ id: row.id }).then(res => {
+      //   if (res.code == 20000) {
+      //     this.$message.success(res.msg)
+      //     // this.closeWindow()
+      //     this.getByPage()
+      //   }
+      // })
     },
     //启用禁用
     switchTrigger(val, row) {