chenrui vor 4 Jahren
Ursprung
Commit
fb4d8b57b8

+ 1 - 1
src/views/shop/GoodsLogistics.vue

@@ -9,7 +9,7 @@
     @cancle="isShow=false"
     :width="1000">
     <a-form
-      id="goodsLogistics-form"
+      id="logistics-form"
       :form="form"
       ref="form"
       v-bind="formItemLayout"

+ 1 - 1
src/views/shop/GoodsOrder.vue

@@ -82,7 +82,7 @@ export default {
     .goods-order-header{
       border-left: 5px solid #ff9900;
       padding-left: 10px;
-      margin: 30px 0 20px;
+      margin: 25px 0 20px;
       .unDelivered{
         .order-status{
           display: inline-block;

+ 7 - 7
src/views/shop/goodsEdit.vue

@@ -23,7 +23,7 @@
       </a-form-item>
       <a-form-item label="商品名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
         <a-input
-          id="goodsEdit-title"
+          id="goodsEdit-name"
           :maxLength="30"
           v-decorator="[
             'formData.name',
@@ -34,10 +34,10 @@
       </a-form-item>
       <a-form-item label="商品分类" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
         <v-select
-          ref="position"
+          ref="classification"
           code="ADVERT_POSITION"
           allowClear
-          id="goodsEdit-position"
+          id="goodsEdit-classification"
           placeholder="请选择商品分类"
           v-decorator="['formData.classification', { initialValue: formData.classification, rules: [{ required: true, message: '请选择商品分类' }] }]"
         ></v-select>
@@ -70,17 +70,17 @@
           ref="supplierName"
           code="ADVERT_POSITION"
           allowClear
-          id="goodsEdit-position"
+          id="goodsEdit-supplierName"
           placeholder="请选择供货商"
           v-decorator="['formData.supplierName', { initialValue: formData.supplierName, rules: [{ required: true, message: '请选择商品分类' }] }]"
         ></v-select>
       </a-form-item>
       <a-form-item label="商品详情" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-        <editor ref="editor" class="goodsEdit-editor" @on-change="editorChange" :cache="false"></editor>
+        <editor id="goodsEdit-editor" ref="editor" class="goodsEdit-editor" @on-change="editorChange" :cache="false"></editor>
       </a-form-item>
       <a-form-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-        <a-button type="primary" html-type="submit" id="goodsEdit-submit" style="margin-right: 15px">保存</a-button>
-        <a-button @click="close" style="margin-left: 15px" id="goodsEdit-close">取消</a-button>
+        <a-button type="primary" html-type="submit" id="goodsEdit-btn-submit" style="margin-right: 15px">保存</a-button>
+        <a-button @click="close" style="margin-left: 15px" id="goodsEdit-btn-close">取消</a-button>
       </a-form-item>
     </a-form>
   </a-card>

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

@@ -5,12 +5,12 @@
         <a-row :gutter="48">
           <a-col :span="6">
             <a-form-item label="商品名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input allowClear v-model.trim="queryParam.name" :maxLength="11" placeholder="请输入商品名称" />
+              <a-input id="goodsList-name" allowClear v-decorator="[ 'queryParam.name', { initialValue: queryParam.name, getValueFromEvent: $filterEmpty, rules: [] }]" :maxLength="30" placeholder="请输入商品名称" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
             <a-form-item label="供货商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input allowClear v-model.trim="queryParam.supplierName" placeholder="请输入供货商" />
+              <a-input id="goodsList-supplierName" allowClear v-decorator="[ 'queryParam.supplierName', { initialValue: queryParam.supplierName, getValueFromEvent: $filterEmpty, rules: [] }]" :maxLength="30" placeholder="请输入供货商" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -25,15 +25,15 @@
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-button class="handle-btn serach-btn" id="goodsList-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button class="handle-btn" type="" id="goodsList-reset" @click="handleReset">重置</a-button>
+            <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>
           </a-col>
         </a-row>
       </a-form>
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="handleGoods('add')">新增</a-button>
+      <a-button id="goodsList-btn-add" type="primary" icon="plus" @click="handleGoods('add')">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -48,8 +48,8 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon title="编辑" type="edit" id="goodsList-delect" class="actionBtn icon-blues" @click="handleGoods('edit', record)" />
-        <a-icon title="删除" type="delete" id="goodsList-delect" class="actionBtn icon-red" @click="handleDel(record)" />
+        <a-icon title="编辑" type="edit" id="goodsList-btn-edit" class="actionBtn icon-blues" @click="handleGoods('edit', record)" />
+        <a-icon title="删除" type="delete" id="goodsList-btn-delect" class="actionBtn icon-red" @click="handleDel(record)" />
       </template>
     </s-table>
   </a-card>
@@ -58,9 +58,6 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { getTenantsList, tenantsDelete } from '@/api/tenants.js'
-import getDate from '@/libs/getDate.js'
-import moment from 'moment'
 export default {
   name: 'GoodsList',
   components: { STable, VSelect },

+ 3 - 5
src/views/shop/orderDetail.vue

@@ -50,11 +50,9 @@
       <a-divider />
       <div class="goods-info-cont">
         <!-- 供应商列 -->
-        <a-menu class="menu-cont" :defaultSelectedKeys="[menuList[0].id]" mode="horizontal" @click="handleClick">
-          <a-menu-item v-for="item in menuList" :key="item.id" :title="item.name">
-            {{ item.name }}
-          </a-menu-item>
-        </a-menu>
+        <a-tabs type="card" @change="handleClick">
+          <a-tab-pane v-for="item in menuList" :key="item.id" :tab="item.name"></a-tab-pane>
+        </a-tabs>
         <!-- 商品订单 -->
         <GoodsOrder v-for="(item, index) in orderData" :key="index" :orderData="item" @sendGoods="sendGoods" />
       </div>

+ 5 - 6
src/views/shop/shopOrder.vue

@@ -16,12 +16,12 @@
           </a-col>
           <a-col :span="6">
             <a-form-item label="用户手机" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input allowClear :maxLength="11" v-decorator="[ 'queryParam.contactPhone', { initialValue: queryParam.contactPhone, getValueFromEvent: $filterEmpty, rules: [] }]" placeholder="请输入用户手机" />
+              <a-input id="shopOrder-contactPhone" allowClear :maxLength="11" v-decorator="[ 'queryParam.contactPhone', { initialValue: queryParam.contactPhone, getValueFromEvent: $filterEmpty, rules: [] }]" placeholder="请输入用户手机" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
             <a-form-item label="订单编号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input allowClear :maxLength="30" v-decorator="[ 'queryParam.orderNo', { initialValue: queryParam.orderNo, getValueFromEvent: $filterEmpty, rules: [] }]" placeholder="请输入订单编号" />
+              <a-input id="shopOrder-orderNo" allowClear :maxLength="30" v-decorator="[ 'queryParam.orderNo', { initialValue: queryParam.orderNo, getValueFromEvent: $filterEmpty, rules: [] }]" placeholder="请输入订单编号" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -36,15 +36,15 @@
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-button class="handle-btn serach-btn" id="shopOrder-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button class="handle-btn" type="" id="shopOrder-reset" @click="handleReset">重置</a-button>
+            <a-button class="handle-btn serach-btn" id="shopOrder-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+            <a-button class="handle-btn" type="" id="shopOrder-btn-reset" @click="handleReset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button class="export-btn" id="shopOrder-export" type="" :loading="loading" @click="handleExport">导出</a-button>
+      <a-button class="export-btn" id="shopOrder-btn-export" type="" :loading="loading" @click="handleExport">导出</a-button>
     </div>
     <s-table
       ref="table"
@@ -72,7 +72,6 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { getTenantsList, tenantsDelete } from '@/api/tenants.js'
 import getDate from '@/libs/getDate.js'
 import moment from 'moment'
 export default {