管理后台-商品列表：支持分类搜索

htmldev/manage/src/api/index.js

@@ -27,7 +27,7 @@ axios.interceptors.response.use(response => {
     if (response.data && response.data.code !== 200 && response.data.msg) {
       Message.error(response.data.msg)
     }
-    if (response.data && response.data.code === 403) {
+    if (response.data && (response.data.code === 403 || response.data.code === 401)) {
       store.dispatch('user/logout')
       setTimeout(() => {
         location.href = '/login'

htmldev/manage/src/views/business/oms/detail/index.vue

@@ -11,7 +11,7 @@
           </el-button>
           <el-button size="mini"
                      type="primary"
-                     :disabled="!([1,3].findIndex(item => item === order.order_status) > -1)"
+                     :disabled="!([1,3].findIndex(item => item === order.order_status) > -1) || order.order_pay_type === 3"
                      v-permission="'business_oms_detail_refund'"
                      @click="refundDialogVisible = true">退款
           </el-button>
@@ -30,7 +30,7 @@
         <el-row>
           <el-col :span="3" class="table-cell">{{ $route.query.id }}</el-col>
           <el-col :span="7" class="table-cell">{{ order.created_at }}</el-col>
-          <el-col :span="7" class="table-cell">{{ ['', '微信', '支付宝'][order.order_pay_type] }}</el-col>
+          <el-col :span="7" class="table-cell">{{ ['', '微信', '支付宝', '现场支付'][order.order_pay_type] }}</el-col>
           <el-col :span="7" class="table-cell">{{ order.order_pay_time }}</el-col>
         </el-row>
         <el-row>

htmldev/manage/src/views/business/oms/list/index.vue

@@ -47,19 +47,30 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="支付方式">
+        <template slot-scope="scope">
+          <p>{{ ['', '微信', '支付宝', '现场支付'][scope.row.order_pay_type] }}</p>
+        </template>
+      </el-table-column>
       <el-table-column label="订单状态状态" width="120">
         <template slot-scope="scope">
           <p>{{ ['待支付', '已支付', '全部退款', '部分退款', '已取消'][scope.row.order_status] }}</p>
         </template>
       </el-table-column>
       <el-table-column label="用户支付订单编号" prop="order_official_number" width="240"></el-table-column>
-      <el-table-column label="操作" fixed="right" width="160">
+      <el-table-column label="操作" fixed="right" width="220">
         <template slot-scope="scope">
           <el-button type="text"
                      v-permission="'business_oms_order_print'"
                      :disabled="booLock"
                      @click="handlePrint(scope.row)">出单
           </el-button>
+          <!--TODO 权限-->
+          <el-button type="text"
+                     :disabled="booLock"
+                     @click="handlePrint(scope.row)"
+                     v-if="scope.row.order_pay_type === 3 && scope.row.order_status === 1">确认支付
+          </el-button>
           <el-button type="text"
                      v-permission="'business_oms_order_check'"
                      @click="$router.push({name: 'BusinessOMSDetail', query: {id: scope.row.id}})">订单详情

htmldev/manage/src/views/business/pms/goods/details.vue

@@ -13,7 +13,12 @@
           prop="category_id"
           :rules="rules.categoryId"
           label="商品分类：">
-          <el-select style="width: 100%;" v-model="form.category_id" placeholder="请选择">
+          <el-select
+            style="width: 100%;"
+            v-model="form.category_id"
+            filterable
+            clearable
+            placeholder="请选择">
             <el-option
               v-for="item in categoryData"
               :key="item.id"

htmldev/manage/src/views/business/pms/goods/index.vue

@@ -9,6 +9,20 @@
         <el-form-item label="商品名称:">
           <el-input v-model="searchForm.product_name" placeholder="请输入商品名称" clearable></el-input>
         </el-form-item>
+        <el-form-item label="商品分类名称:">
+          <el-select
+            v-model="searchForm.category_id"
+            filterable
+            clearable
+            placeholder="请选择">
+            <el-option
+              v-for="item in categoryArr"
+              :key="item.id"
+              :label="item.category_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否上架:">
           <el-select clearable v-model="searchForm.product_status">
             <el-option label="上架" :value="1"></el-option>