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
849b20408e

+ 1 - 1
src/views/numsGoodsShelves/recallManagement/addRecallBillModal.vue

@@ -344,8 +344,8 @@ export default {
         this.$refs.ruleForm.resetFields()
       } else {
         this.$nextTick(() => {
-          this.resetSearchForm();
           this.$refs.recallBillTable.clearSelected();
+          this.resetSearchForm();
         })
       }
     }

+ 1 - 1
src/views/numsGoodsShelves/recallManagement/detailModal.vue

@@ -23,7 +23,7 @@
           <span v-else>
             --
           </span>
-          <a-button type="primary" ghost class="recallBillBtn" @click="seeRecallBill" v-if="itemData.billState != 'CANCEL'">生成销售退货单</a-button>
+          <a-button type="primary" ghost class="recallBillBtn" @click="seeRecallBill" v-if="itemData.billState != 'CANCEL' && itemData.billState!='FINISH'">生成销售退货单</a-button>
         </a-descriptions-item>
       </a-descriptions>
     </div>