浏览代码

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

chenrui 1 年之前
父节点
当前提交
b31ed036da

+ 1 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -85,7 +85,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="advanced ? (isShowWarehouse&&isShowCustomerSearch ? 24:6) : 6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: advanced ? (isShowWarehouse&&isShowCustomerSearch ? 'center': 'left') : 'left'}">
               <a-button type="primary" @click="searchTable" :disabled="disabled" id="outboundOrderList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">

+ 1 - 1
src/views/salesManagement/salesList/list.vue

@@ -101,7 +101,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="advanced ? 24 : 6" :sm="24" :style="{textAlign: advanced ? 'center' : 'left'}">
               <div class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="handleSearch">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>

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

@@ -54,7 +54,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign:isShowCustomerSearch?'center':''}">
+            <a-col :md="advanced ? (isShowCustomerSearch?24:6) : 6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign:advanced ? (isShowCustomerSearch?'center':'') : 'left'}">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsPList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shortageStatisticsPList-reset">重置</a-button>
               <a-button

+ 1 - 1
src/views/salesReturnManagement/pickUp/list.vue

@@ -54,7 +54,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="textAlign:center;">
+            <a-col :md="advanced ? (isShowWarehouse ? 24 : 6) : 6" :sm="24" :style="{textAlign:advanced ? (isShowWarehouse?'center':'left') : 'left'}">
               <div class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>

+ 5 - 5
src/views/salesReturnManagement/salesReturn/list.vue

@@ -46,12 +46,12 @@
                 <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户采退申请单号">
+                <a-input id="salesReturn-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入客户采退申请单号"/>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="客户采退申请单号">
-                  <a-input id="salesReturn-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入客户采退申请单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="单据来源">
                   <v-select