更新

src/views/order/components/confirmSubmit.vue

@@ -124,6 +124,7 @@ export default {
             console.log('价格发生变化了捏')
             // 新的价格
             this.newSalePrice = salePrice2company
+
             this.policyPopulation()
           } else console.log('芜湖 没变')
         })
@@ -136,15 +137,25 @@ export default {
       }
     },
     policyPopulation() {
-      let { salePrice, preQuantity, preAmount } = this.controlWindows.addInfo
-      console.log(salePrice, preQuantity, preAmount)
+      let { salePrice, floorPrice, preQuantity, preAmount } = this.controlWindows.addInfo
+      // console.log(salePrice, preQuantity, preAmount)
       if ((salePrice, preQuantity, preAmount)) {
         // 原策略
-        Object.assign(this.tableData[0], { salePrice, preQuantity, preAmount })
+        Object.assign(this.tableData[0], { salePrice, floorPrice, preQuantity, preAmount })
         // 以提货量为准
-        Object.assign(this.tableData[1], { salePrice: this.newSalePrice, preQuantity, preAmount: +this.newSalePrice * +preQuantity })
+        Object.assign(this.tableData[1], {
+          salePrice: this.newSalePrice,
+          floorPrice: this.newSalePrice,
+          preQuantity,
+          preAmount: +this.newSalePrice * +preQuantity
+        })
         // 以订单金额为准
-        Object.assign(this.tableData[2], { salePrice: this.newSalePrice, preQuantity: +preAmount / +this.newSalePrice, preAmount })
+        Object.assign(this.tableData[2], {
+          salePrice: this.newSalePrice,
+          floorPrice: this.newSalePrice,
+          preQuantity: +preAmount / +this.newSalePrice,
+          preAmount
+        })
         this.undergoChanges = true
       }
     },
@@ -157,6 +168,7 @@ export default {
         }
         serve.orderSuccess({ id: this.controlWindows.addInfo.id, ...targetPolicy[0] }).then(res => {
           if (res.code == 20000) {
+            this.$message.success(res.msg)
             this.closeWindow()
           }
         })
@@ -164,6 +176,7 @@ export default {
       }
       serve.orderSuccess({ id: this.controlWindows.addInfo.id }).then(res => {
         if (res.code == 20000) {
+          this.$message.success(res.msg)
           this.closeWindow()
         }
       })

src/views/order/index.vue

@@ -31,7 +31,7 @@
         </el-option>
       </el-select> -->
       <div class="buttons">
-        <el-button icon="el-icon-search" @click="handleCurrentChange(1)">查询</el-button>
+        <el-button icon="el-icon-search" @click="search">查询</el-button>
         <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
       </div>
     </div>
@@ -116,7 +116,7 @@
               <el-link slot="reference" type="primary" :underline="false">订单锁定</el-link>
             </el-popconfirm>
 
-            <el-link v-else type="primary" :underline="false" @click="confirmSubmit(row)">下单确认</el-link>
+            <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' ? '是否确认取消订单？' : '是否确认退款？'"
@@ -156,8 +156,8 @@
       </general-details>
     </el-drawer>
     <!-- 提货单 -->
-    <billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="handleCurrentChange" />
-    <confirmSubmit :controlWindows="controlWindows" @closeWindow="() => {}" />
+    <billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="getByPage" />
+    <confirmSubmit :controlWindows="controlWindows" @closeWindow="getByPage" />
   </div>
 </template>
 
@@ -319,6 +319,10 @@ export default {
       this.parameter.pageSize = size
       this.getByPage()
     },
+    search() {
+      this.parameter.currentPage = 1
+      this.getByPage()
+    },
     //table list
     getByPage() {
       order.getByPage(this.parameter).then(res => {