瀏覽代碼

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

chenrui 1 年之前
父節點
當前提交
17dd1ef206

+ 2 - 2
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -44,8 +44,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="区域/分区">
-                <subarea id="priceDifferenceDetailList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
+              <a-form-model-item label="所在区域">
+                <subarea id="priceDifferenceDetailList-allocateTypeSn" placeholder="请选择区域" showLeve="1" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">

+ 2 - 2
src/views/reportData/tireSalesReport/detailList.vue

@@ -88,7 +88,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 v-if="$hasPermissions('B_tireDetailExport')"
-                id="tireSalesDealerList-export">导出明细</a-button>
+                id="tireSalesDealerList-export">导出出库明细</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'" />
@@ -124,7 +124,7 @@
               class="button-warning"
               @click="handleOutDetail(record)"
               id="transferReturnConfirmation-audit-btn">出库明细</a-button>
-            <span>--</span>
+            <span v-else>--</span>
           </template>
           <template slot="footer">
             <a-row :gutter="15">