lilei hace 4 años
padre
commit
0287e43bce
Se han modificado 2 ficheros con 29 adiciones y 26 borrados
  1. 12 10
      src/views/shop/goodsList.vue
  2. 17 16
      src/views/shop/shopOrder.vue

+ 12 - 10
src/views/shop/goodsList.vue

@@ -2,27 +2,20 @@
   <a-card :bordered="false" class="goodsList-table-page-wrapper">
     <div class="goodsList-searchForm">
       <a-form layout="inline" ref="form" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="48">
+        <a-row :gutter="20">
           <a-col :span="6">
             <a-form-item label="商品名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-input id="goodsList-name" v-model="queryParam.name" allowClear :maxLength="30" placeholder="请输入商品名称" />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="4">
             <a-form-item label="商品分类" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-select id="goodsList-goodsTypeNo" allowClear placeholder="请选择商品分类" v-model="queryParam.goodsTypeNo">
                 <a-select-option v-for="(item,index) in goodsTypeList" :key="index" :value="item.goodsTypeNo">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-item label="供货商" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-select id="goodsList-officialPartnerNo" allowClear placeholder="请选择供货商" v-model="queryParam.officialPartnerNo">
-                <a-select-option v-for="(item,index) in partnerList" :key="index" :value="item.officialPartnerNo">{{ item.name }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
+          <a-col :span="4">
             <a-form-item label="商品状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select
                 v-model="queryParam.state"
@@ -33,6 +26,15 @@
                 allowClear></v-select>
             </a-form-item>
           </a-col>
+        </a-row>
+        <a-row :gutter="20">
+          <a-col :span="6">
+            <a-form-item label="供货商" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+              <a-select id="goodsList-officialPartnerNo" allowClear placeholder="请选择供货商" v-model="queryParam.officialPartnerNo">
+                <a-select-option v-for="(item,index) in partnerList" :key="index" :value="item.officialPartnerNo">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :span="6">
             <a-button class="handle-btn serach-btn" id="goodsList-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
             <a-button class="handle-btn" type="" id="goodsList-btn-reset" @click="handleReset">重置</a-button>

+ 17 - 16
src/views/shop/shopOrder.vue

@@ -2,7 +2,7 @@
   <a-card :bordered="false" class="shopOrder-table-page-search-wrapper">
     <div class="shopOrder-searchForm">
       <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="48">
+        <a-row :gutter="20">
           <a-col :span="6">
             <a-form-item label="下单时间" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-range-picker
@@ -19,12 +19,7 @@
               <a-input id="shopOrder-customerMobile" allowClear :maxLength="11" v-model="queryParam.customerMobile" placeholder="请输入用户手机" />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-item label="订单编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input id="shopOrder-orderSn" allowClear :maxLength="30" v-model="queryParam.orderSn" placeholder="请输入订单编号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
+          <a-col :span="4">
             <a-form-item label="订单状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select
                 v-model="queryParam.orderState"
@@ -35,22 +30,27 @@
                 allowClear></v-select>
             </a-form-item>
           </a-col>
+
+        </a-row>
+        <a-row :gutter="20">
+          <a-col :span="6">
+            <a-form-item label="订单编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+              <a-input id="shopOrder-orderSn" allowClear :maxLength="30" v-model="queryParam.orderSn" placeholder="请输入订单编号" />
+            </a-form-item>
+          </a-col>
           <a-col :span="6">
             <a-button class="handle-btn serach-btn" id="shopOrder-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+            <a-button
+              v-if="$hasPermissions('B_orderManage_export')"
+              class="export-btn"
+              id="shopOrder-btn-export"
+              :loading="loading"
+              @click="handleExport">导出</a-button>
             <a-button class="handle-btn" type="" id="shopOrder-btn-reset" @click="handleReset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
     </div>
-    <div class="table-operator">
-      <a-button
-        v-if="$hasPermissions('B_orderManage_export')"
-        class="export-btn"
-        id="shopOrder-btn-export"
-        type=""
-        :loading="loading"
-        @click="handleExport" style="margin-top: 18px;">导出</a-button>
-    </div>
     <s-table
       ref="table"
       size="default"
@@ -224,6 +224,7 @@ export default {
       background-color: #ff9900;
       border-color: #ff9900;
       color: #fff;
+      margin-right: 10px;
     }
     .export-btn.ant-btn:focus:not(.ant-btn-primary):not(.ant-btn-danger), .export-btn.ant-btn:hover:not(.ant-btn-primary):not(.ant-btn-danger){
       color: #fff;