Prechádzať zdrojové kódy

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

lilei 2 rokov pred
rodič
commit
d728a57c3d

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

@@ -45,7 +45,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="billingReturnReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="billingReturnReportList-reset">重置</a-button>
               <a-button

+ 2 - 6
src/views/reportData/regionTypeSalesReport/list.vue

@@ -5,7 +5,7 @@
         <a-tab-pane :key="item.id" :tab="item.name" v-for="item in tabsList">
         </a-tab-pane>
       </a-tabs>
-      <div class="table-page-search-wrapper">
+      <div class="table-page-search-wrapper newTableSearchName">
         <a-form-model
           id="returnGoodsPresentationList-form"
           ref="ruleForm"
@@ -51,10 +51,6 @@
                 :loading="exportLoading"
                 v-if="$hasPermissions('B_regionTypeSalesReportExport')"
                 id="returnGoodsPresentationList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px" v-if="activeKey==0">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
             </a-col>
           </a-row>
         </a-form-model>
@@ -95,7 +91,7 @@ export default {
   data () {
     return {
       spinning: false,
-      tabsList: [{ id: 0, name: '各品类实售明细' }, { id: 1, name: '各区品类实售明细' }],
+      tabsList: [{ id: 0, name: '各分区品类实售明细' }, { id: 1, name: '各区品类实售明细' }],
       salesStatusTypeList: [{ code: 'SALES', name: '实售销售' }, { code: 'SALES_RETURN', name: '实售退货' }, { code: 'REAL_SALES', name: '实际销售' }],
       activeKey: 0,
       advanced: true, // 高级搜索 展开/关闭

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

@@ -50,7 +50,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnGoodsPresentationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnGoodsPresentationList-reset">重置</a-button>
               <a-button

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

@@ -50,7 +50,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSlipReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="returnSlipReportList-reset">重置</a-button>
               <a-button

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

@@ -45,7 +45,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesAmountReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesAmountReportList-reset">重置</a-button>
               <a-button

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

@@ -50,7 +50,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesPresentationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesPresentationList-reset">重置</a-button>
               <a-button

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

@@ -45,7 +45,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReportList-reset">重置</a-button>
               <a-button

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

@@ -50,7 +50,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesSlipReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesSlipReportList-reset">重置</a-button>
               <a-button