Przeglądaj źródła

Merge branch 'develop_0216' of jianguan-web/jg-ocs-html into pre-release

李磊 3 lat temu
rodzic
commit
1f916952f2

+ 1 - 3
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -230,9 +230,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      if (this.advanced) {
-        this.$refs.rangeDate.resetDate()
-      }
+      this.$refs.rangeDate.resetDate()
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.bizType = undefined

+ 1 - 0
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -37,6 +37,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
+                v-if="$hasPermissions('B_oosDetailExportByProduct')"
                 id="shortageStatisticsCList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}