Browse Source

bug 修复

lilei 4 years ago
parent
commit
dc36cb4d4e

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

@@ -35,7 +35,7 @@
               <a-icon style="color: #FF9900;" type="bell" /> 已选产品可参加<span>【买10副刹车片送2个滤清器】、【买电瓶送滤清器】</span>的促销活动,促销产品为指定产品
               <a-icon style="color: #FF9900;" type="bell" /> 已选产品可参加<span>【买10副刹车片送2个滤清器】、【买电瓶送滤清器】</span>的促销活动,促销产品为指定产品
             </div>
             </div>
           </a-col>
           </a-col>
-          <a-col :span="6">
+          <!-- <a-col :span="6">
             <div style="float:right;overflow: hidden;">
             <div style="float:right;overflow: hidden;">
               <a-button size="small" id="salesEdit-dru">导入明细</a-button>
               <a-button size="small" id="salesEdit-dru">导入明细</a-button>
               <a-button
               <a-button
@@ -46,7 +46,7 @@
                 style="margin-left: 10px"
                 style="margin-left: 10px"
                 id="salesEdit-del-all">整单删除</a-button>
                 id="salesEdit-del-all">整单删除</a-button>
             </div>
             </div>
-          </a-col>
+          </a-col> -->
         </a-row>
         </a-row>
       </div>
       </div>
       <!-- 总计 -->
       <!-- 总计 -->
@@ -99,13 +99,13 @@
             class="button-error"
             class="button-error"
             @click="handleDel(record)"
             @click="handleDel(record)"
           >删除</a-button>
           >删除</a-button>
-          <a-button
+          <!-- <a-button
             size="small"
             size="small"
             type="primary"
             type="primary"
             :loading="delLoading"
             :loading="delLoading"
             class="button-warning"
             class="button-warning"
             @click="handleSelCx(record)"
             @click="handleSelCx(record)"
-          >选择促销品</a-button>
+          >选择促销品</a-button> -->
         </template>
         </template>
       </s-table>
       </s-table>
     </a-card>
     </a-card>
@@ -282,7 +282,7 @@ export default {
         purchaseBillSn: this.detailData.purchaseBillSn,
         purchaseBillSn: this.detailData.purchaseBillSn,
         purchaseBillNo: this.detailData.purchaseBillNo,
         purchaseBillNo: this.detailData.purchaseBillNo,
         stockSn: row.stockSn,
         stockSn: row.stockSn,
-        promotableFlag: 0, // 可促销标记 有活动的传1,没活动的传0
+        promotableFlag: row.promotableFlag || 0, // 可促销标记 有活动的传1,没活动的传0
         promotionFlag: promotionFlag // 促销标记 正品传0,促销品传1
         promotionFlag: promotionFlag // 促销标记 正品传0,促销品传1
       }).then(res => {
       }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {

+ 1 - 0
src/views/salesManagement/salesQuery/queryPart.vue

@@ -146,6 +146,7 @@ export default {
             data.list[i].no = no + i + 1
             data.list[i].no = no + i + 1
             data.list[i].salesNums = 1
             data.list[i].salesNums = 1
             data.list[i].currentStockQty = data.list[i].currentStockQty || 0
             data.list[i].currentStockQty = data.list[i].currentStockQty || 0
+            data.list[i].productPackQty = 1
           }
           }
           this.disabled = false
           this.disabled = false
           return data
           return data