lilei 3 weeks ago
parent
commit
49b50cacde

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -549,7 +549,7 @@ export default {
             data[i].qtyBackups = data[i].qty
             data[i].productUnit = data[i].productEntity && data[i].productEntity.unit
             // 禁用选框
-            if (data[i].indexOf('GIFT') >= 0 && !!data[i].salesPromoDetailParentSn) {
+            if (data[i].promotionFlag.indexOf('GIFT') >= 0 && !!data[i].salesPromoDetailParentSn) {
               this.disableSelectedRowKeys.push(data[i].id)
             }
           }

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/setWarehouse.vue

@@ -5,7 +5,7 @@
     centered
     :maskClosable="false"
     :confirmLoading="confirmLoading"
-    width="36%"
+    width="480px"
     :footer="null"
     @cancel="cancel"
   >