Browse Source

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

lilei 1 year ago
parent
commit
d54fe33e05

+ 1 - 1
src/views/reportData/salesDetails/list.vue

@@ -86,7 +86,7 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="促销产品">
                 <a-form-model-item label="促销产品">
-                  <a-select v-model="queryParam.giftFLag" placeholder="请选择促销产品">
+                  <a-select v-model="queryParam.giftFLag" placeholder="请选择促销产品" allowClear>
                     <a-select-option value="1">
                     <a-select-option value="1">
                     </a-select-option>
                     </a-select-option>

+ 1 - 1
src/views/salesReturnManagement/custConfirm/setPriceModal.vue

@@ -228,7 +228,7 @@ export default {
     },
     },
     handleGrabOrderOk (con) {
     handleGrabOrderOk (con) {
       if (this.noShowBillSnList && this.noShowBillSnList.length > 0) {
       if (this.noShowBillSnList && this.noShowBillSnList.length > 0) {
-        this.salesBillSnList = this.salesBillSnList.concat(con)
+        this.salesBillSnList = this.noShowBillSnList.concat(con)
       } else {
       } else {
         this.salesBillSnList = con
         this.salesBillSnList = con
       }
       }