lilei 2 年之前
父節點
當前提交
f72fb9a08b

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1675996972827
+  "version": 1675998345499
 }

+ 2 - 2
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -53,7 +53,7 @@
       <!-- 上次缺货 -->
       <outStockModal :openModal="openOutStockModal" :paramsData="paramsData" @close="openOutStockModal=false" @ok="hanldeOkOutStock" />
       <!-- 购物车 -->
-      <shopingCatModal :showModal="openShopCatModal" :paramsData="paramsData" @close="openShopCatModal=false" @ok="resetPurchaseForm"></shopingCatModal>
+      <shopingCatModal :showModal="openShopCatModal" :paramsData="paramsData" @close="openShopCatModal=false" @ok="getOrderDetail(false, true)"></shopingCatModal>
       <!-- 已选产品 -->
       <div>
         <div class="chooseBox-title">
@@ -65,7 +65,7 @@
             <a-button v-if="detail&&detail.totalCategory" id="purchaseNewOrderEdit-add-btn" type="danger" @click="openChooseProduct=true"><a-icon type="plus-circle" />添加产品</a-button>
             <a-button id="purchaseNewOrderEdit-import-btn" type="danger" ghost @click="openGuideModal=true"><a-icon type="import" />产品导入</a-button>
             <a-button id="purchaseNewOrderEdit-outStock-btn" type="danger" ghost @click="handleOutStock"><a-icon type="funnel-plot" />上次缺货</a-button>
-            <a-button id="purchaseNewOrderEdit-cart-btn" type="danger" ghost @click="hanldCart"><a-icon type="shopping" />购物车</a-button>
+            <a-button id="purchaseNewOrderEdit-cart-btn" v-if="$hasPermissions('M_shoppingCart')" type="danger" ghost @click="hanldCart"><a-icon type="shopping" />购物车</a-button>
           </div>
         </div>
         <div class="choosed-table" v-if="detail&&detail.totalCategory">

+ 2 - 1
src/views/shoppingCarManagement/shoppingCar/list.vue

@@ -250,7 +250,7 @@ export default {
           cancelQty: item.qty,
           qty: item.qty,
           productSn: item.productSn,
-          price: item.purchasePrice
+          price: item.productEntity.purchasePrice
         })
       })
       const params = {
@@ -301,6 +301,7 @@ export default {
           purchaseDetailCancelSave(params).then(res => {
             if (res.status == 200) {
               _this.$emit('ok')
+              _this.getCartList()
               _this.loading = false
             } else {
               _this.loading = false