Browse Source

Merge branch 'develop_szhj07' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_szhj07

lilei 2 years ago
parent
commit
78a3b5f867

+ 6 - 2
src/views/numsGoodsShelves/recallManagement/detailModal.vue

@@ -23,7 +23,7 @@
           <span v-else>
           <span v-else>
             --
             --
           </span>
           </span>
-          <a-button type="primary" ghost class="recallBillBtn" @click="seeRecallBill" v-if="itemData.billState != 'CANCEL' && itemData.billState!='FINISH'">生成销售退货单</a-button>
+          <a-button type="primary" ghost class="recallBillBtn" @click="seeRecallBill" v-if="itemData.billState != 'CANCEL' && !isZero">生成销售退货单</a-button>
         </a-descriptions-item>
         </a-descriptions-item>
       </a-descriptions>
       </a-descriptions>
     </div>
     </div>
@@ -147,7 +147,8 @@ export default {
         }
         }
       }
       }
       ],
       ],
-      shelfName: ''
+      shelfName: '',
+      isZero: false
     }
     }
   },
   },
   watch: {
   watch: {
@@ -166,6 +167,9 @@ export default {
             con.no = i + 1
             con.no = i + 1
           })
           })
           this.detailList = this.itemData.detailList
           this.detailList = this.itemData.detailList
+          this.isZero = this.itemData.detailList.every((item) => {
+            return item.confirmQty == 0
+          })
           this.shelfName = '调回单详情——' + this.itemData.shelfInfo.shelfName
           this.shelfName = '调回单详情——' + this.itemData.shelfInfo.shelfName
         }
         }
       }
       }

+ 3 - 0
src/views/numsGoodsShelves/recallStockManagement/editStock.vue

@@ -162,6 +162,9 @@ export default {
     },
     },
     // 修改入库单价
     // 修改入库单价
     handleEdit (costPrice, opt) {
     handleEdit (costPrice, opt) {
+      if (!costPrice && costPrice != 0) {
+        return
+      }
       this.updateSelectData({ id: opt.id, putCost: costPrice })
       this.updateSelectData({ id: opt.id, putCost: costPrice })
     },
     },
     changeWarehouseCascade (val, opt) {
     changeWarehouseCascade (val, opt) {

+ 1 - 1
src/views/salesManagement/salesQuery/chooseShelfProduct.vue

@@ -9,7 +9,7 @@
     @cancel="isShow = false"
     @cancel="isShow = false"
     width="80%">
     width="80%">
     <a-spin :spinning="spinning" tip="Loading...">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-tabs>
+      <a-tabs type="card">
         <a-tab-pane :defaultActiveKey="curTab" v-model="curTab" :key="1" tab="待补货产品">
         <a-tab-pane :defaultActiveKey="curTab" v-model="curTab" :key="1" tab="待补货产品">
           <!-- 搜索条件 -->
           <!-- 搜索条件 -->
           <div class="table-page-search-wrapper">
           <div class="table-page-search-wrapper">