Merge remote-tracking branch 'origin/dev' into dev

src/components/customerComplaints/index.vue

@@ -20,10 +20,34 @@
           </el-select>
         </el-form-item>
         <el-form-item label="订单号" prop="orderId">
-          <el-input v-model="form.orderId" placeholder="请输入订单号" />
+          <el-select
+            v-model="form.orderId"
+            filterable
+            remote
+            placeholder="请输入订单号"
+            :remote-method="getOrderList">
+            <el-option
+              v-for="item in orderList"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="提单号" prop="ladingbillId">
-          <el-input v-model="form.ladingbillId" placeholder="请输入提单号" />
+          <el-select
+            v-model="form.ladingbillId"
+            filterable
+            remote
+            placeholder="请输入提单号"
+            :remote-method="getBillList">
+            <el-option
+              v-for="item in billList"
+              :key="item.value"
+              :label="item.value"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="投诉内容" prop="content">
           <el-input v-model="form.content" type="textarea" placeholder="请输入内容" />
@@ -88,6 +112,7 @@ import { createCustomerComplaint, updateCustomerComplaint, deleteCustomerComplai
 import {getCustomerSelect} from '@/api/ecw/customer'
 import DictSelector from '@/components/DictSelector'
 import { DICT_TYPE, getDictDatas, getDictDataLabel } from '@/utils/dict'
+import {getBillNoSearch, getOrderNoSearch} from "@/api/ecw/order"
 
 export default {
   name: "customerComplaints",
@@ -147,7 +172,10 @@ export default {
       // 处理
       handle: {
         dialogVisible: false
-      }
+      },
+
+      billList: [],
+      orderList: []
     };
   },
   created() {
@@ -156,6 +184,21 @@ export default {
     })
   },
   methods: {
+    getBillList(key){
+      getBillNoSearch({key, pageNo: 1, pageSize: 20}).then(r => {
+        if (r.code === 0){
+          this.billList = r.data.list
+        }
+      })
+    },
+
+    getOrderList(key){
+      getOrderNoSearch({key, pageNo: 1, pageSize: 20}).then(r => {
+        if (r.code === 0){
+          this.orderList = r.data.list
+        }
+      })
+    },
     /** 查询列表 */
     /** 取消按钮 */
     cancel() {

src/router/index.js

@@ -303,6 +303,13 @@ export const constantRoutes = [
         name: 'discount',
         meta: {title: '订单优惠申请', icon: '', activeMenu: '/order/index'}
       },
+      {
+        path: 'discount1/:orderItemId(\\d+)',
+        component: (resolve) => import('@/views/ecw/order/special/discount'),
+        props: true,
+        name: 'discount1',
+        meta: {title: '订单折扣申请', icon: '', activeMenu: '/order/index'}
+      },
       {
         path: 'speciallight/:orderId(\\d+)',
         component: (resolve) => import('@/views/ecw/order/special/light'),

src/views/ecw/customerComplaint/index.vue

@@ -116,7 +116,6 @@
             v-model="form.orderId"
             filterable
             remote
-            reserve-keyword
             placeholder="请输入订单号"
             :remote-method="getOrderList"
             :loading="loading">
@@ -133,7 +132,6 @@
             v-model="form.ladingbillId"
             filterable
             remote
-            reserve-keyword
             placeholder="请输入提单号"
             :remote-method="getBillList"
             :loading="loading">

src/views/ecw/order/special/discount.vue

@@ -4,7 +4,7 @@
      <el-col :xs="24" :sm="24" :md="24" :lg="20" :xl="16">
        <el-card class="box-card">
          <div slot="header" class="clearfix" v-if="!readonly">
-           <span>优惠申请</span>
+           <span style="font-size: 18px;font-weight: bold">{{ isDiscount ? '折扣管理' : '优惠申请' }}</span>
          </div>
          <el-form v-if="!readonly" ref="form" :model="form" label-width="80px">
            <el-form-item label="商品类型">
@@ -216,7 +216,7 @@ export default {
   methods: {
     handleSubmit(){
       createOrderSpecial({
-        "applyType": '1',
+        "applyType": this.isDiscount ? '2' : '1',
         clearanceFreight: this.form.clearanceFreight,
         clearanceFreightCurrency: this.form.clearanceFreightCurrency,
         clearanceFreightVolume: this.form.clearanceFreightVolume,
@@ -244,6 +244,10 @@ export default {
     }
   },
   computed: {
+    // 折扣管理页面
+    isDiscount(){
+      return this.$route.query.discount
+    },
     // 根据渠道id显示渠道名
     getChannelNameById(){
       return channelId => {

src/views/ecw/order/special/index.vue

@@ -80,7 +80,7 @@
           <template v-slot="{row}">
             <el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="$router.push(`/order/discount/${row.orderItemId}?orderId=${row.orderId}`)">优惠申请</el-button>
             <el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="$router.push(`/order/specialCommission/${row.orderItemId}`)">佣金规则</el-button>
-            <el-button size="mini" type="text" v-hasPermi="['ecw:order:update']">管理折扣</el-button>
+            <el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="$router.push(`/order/discount1/${row.orderItemId}?orderId=${row.orderId}&discount=1`)">管理折扣</el-button>
           </template>
         </el-table-column>