售后、客服、销售问题修改

CallCenterWeb.UI/src/api/CustomerServiceReport/CustomerServiceReport.js

@@ -43,4 +43,12 @@ export function getdatareport(params) {
     params
   })
 }
+//售后总表
+export function getAfterSalesSummaryReport(params) {
+  return request({
+    url: 'api/AfterSale/getaftersalebypagesh',
+    method: 'get',
+    params
+  })
+}
 

CallCenterWeb.UI/src/api/afterSaleManagement/afterSaleList.js

@@ -141,3 +141,12 @@ export function reviewAfterSaleOrder(params) {
     params
   })
 }
+
+// 未收到货提醒
+export function remindNotReceiptGoods(params) {
+  return request({
+    url: 'api/AfterSale/notreceived',
+    method: 'POST',
+    params
+  })
+}

CallCenterWeb.UI/src/api/orderManagement/orderList.js

@@ -113,3 +113,12 @@ export function updateWaybillNumber(data) {
     data
   })
 }
+
+// 获取最大可使用积分
+export function getMaxUsePoints(params) {
+  return request({
+    url: 'api/Order/deductible',
+    method: 'get',
+    params
+  })
+}

CallCenterWeb.UI/src/views/CustomerServiceReport/afterSalesSummary/index.vue

@@ -0,0 +1,107 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-date-picker
+        v-model="searchDate"
+        :picker-options="pickerOptions"
+        class="filter-item"
+        type="daterange"
+        format="yyyy年MM月dd日"
+        value-format="yyyy-MM-dd"
+        align="left"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      />
+      <el-input v-model="searchData.checkUserNameXS" placeholder="请输入销售" class="filter-item" />
+      <el-input v-model="searchData.core" placeholder="请输入中心" class="filter-item" />
+      <el-button type="primary" @click="btn_search">搜索</el-button>
+      <el-button type="primary" @click="btn_export">导出</el-button>
+    </div>
+    <el-table v-loading="loading" :data="dataLists" border stripe>
+      <el-table-column prop="F_Core" label="中心" align="center" />
+      <el-table-column prop="F_CheckUserNameXS" label="销售" align="center" />
+      <el-table-column prop="F_Data" label="拆货日期" align="center" />
+      <el-table-column prop="F_CustomerName" label="客户名字" align="center" />
+      <el-table-column prop="F_CustomerPhone" label="电话" align="center" />
+      <el-table-column prop="F_TrackingNo" label="退回运单号" align="center" />
+      <el-table-column prop="F_Express" label="寄回快递" align="center" />
+      <el-table-column prop="F_ReturnDetails" label="寄回明细" align="center" />
+      <el-table-column prop="F_Situation" label="鞋子正常情况" align="center" />
+      <el-table-column prop="F_Note" label="有无纸条" align="center" />
+      <el-table-column prop="F_PayOnDelivery" label="到付金额" align="center" />
+      <el-table-column prop="F_KGRemarks" label="备注" align="center" />
+      <el-table-column prop="F_Packing" label="标准化包装" align="center" />
+      <el-table-column prop="F_Standardfast" label="是否顺丰标快" align="center" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getAfterSalesSummaryReport } from '@/api/CustomerServiceReport/CustomerServiceReport'
+import { pickerOptions } from '@/utils'
+
+export default {
+  data() {
+    return {
+      loading: false,
+      searchDate: '', // 日期
+      pickerOptions, // 日期数据
+      dataLists: [], // 列表数据
+      searchData: {
+        checkUserNameXS: '', // 销售
+        core: '', // 中心
+      }
+    }
+  },
+  watch: {
+    searchDate(val) {
+      if (val == null) {
+        this.searchDate = ''
+      }
+    }
+  },
+  created() {
+    this.getList()
+    document.onkeyup = (e) => {
+      if (e.keyCode === 13) {
+        this.getList()
+      }
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      return new Promise((resolve) => {
+        const params = {
+          SearchStartTime: this.searchDate && this.searchDate[0], // 开始时间
+          SearchEndTime: this.searchDate && this.searchDate[1], // 结束时间
+          F_CheckUserNameXS: this.searchData.checkUserNameXS, //销售
+          core: this.searchData.core, // 中心
+        }
+        getAfterSalesSummaryReport(params).then((response) => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.dataLists = response.data
+          }
+        })
+        resolve()
+      })
+    },
+    btn_search() {
+      this.getList()
+    },
+    btn_export() {
+      window.location.href =
+        this.$store.getters.serverConfig.BASE_API + 'api/AfterSale/getaftersalebypagesh?isdc=2' + '&starttime=' + (this.searchDate && this.searchDate[0]) + '&endtime=' + (this.searchDate && this.searchDate[1]) + '&F_CheckUserNameXS=' + this.searchData.checkUserNameXS + '&core=' + this.searchData.core
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+span {
+  font-size: 14px;
+}
+</style>

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleList/index.vue

@@ -1,6 +1,19 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
+      <el-date-picker
+        v-model="searchData.searchTime"
+        :picker-options="pickerOptions"
+        class="filter-item"
+        type="daterange"
+        format="yyyy年MM月dd日"
+        value-format="yyyy-MM-dd"
+        align="left"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="发起售后开始日期"
+        end-placeholder="发起售后结束日期"
+      />
       <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择售后类型">
         <el-option label="调换" value="1"/>
         <el-option label="退货" value="2"/>
@@ -55,10 +68,14 @@
       <el-table-column prop="F_Money" label="变动金额" align="center" />
       <el-table-column prop="F_Remark" label="备注" align="center" />
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
+      <el-table-column prop="F_CheckUserNameXS" label="销售" align="center" />
+      <el-table-column prop="F_Core" label="中心" align="center" />
+      <el-table-column prop="F_Group" label="小组" align="center" />
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
           <el-button v-permission="'HY_review'" v-if="authority_review(scope.row.F_CheckStateSH)" type="text" @click="btn_review(scope.row.F_Id)">审核</el-button>
+          <el-button v-permission="'HY_remind'" v-if="authority_remind(scope.row.F_CheckStateSH)" type="text" @click="btn_remind(scope.row.F_Id)">提醒</el-button>
           <!-- <el-button v-permission="'HY_edit'" v-if="authority_edit(scope.row.F_CheckStateSH)" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button> -->
           <el-button v-permission="'HY_delete'" v-if="authority_delete(scope.row.F_CheckStateSH)" type="text" @click="btn_delete(scope.row.F_Id)">删除</el-button>
         </template>
@@ -77,7 +94,7 @@
 
 <script>
 import { getDictionaryValueList } from '@/api/commonAPI'
-import { getAfterSaleList, deleteAfterSaleList } from '@/api/afterSaleManagement/afterSaleList'
+import { getAfterSaleList, deleteAfterSaleList, remindNotReceiptGoods } from '@/api/afterSaleManagement/afterSaleList'
 import { pickerOptions, formatterContent } from '@/utils'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
 import addOrEdit from './addOrEdit'
@@ -130,6 +147,7 @@ export default {
       searchData: {
         checkState: '-2', // 售后审核状态
         type: '', // 售后类型
+        searchTime: '',
       },
       pickerOptions, // 日期数据
       pageParams: {
@@ -162,6 +180,8 @@ export default {
           pageindex: 1, // int 第几页
           pagesize: 1000000, // int 每页几条信息
           F_PayState: '-2',
+          SearchStartTime: this.searchData.searchTime[0], // 售后开始时间
+          SearchEndTime: this.searchData.searchTime[1], // 售后结束时间
         }
         getAfterSaleList(params).then(response => {
           this.loading = false
@@ -197,6 +217,26 @@ export default {
         title: '审核'
       })
     },
+    // 提醒
+    btn_remind(id) {
+      this.$confirm('您确定提醒吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const params = {
+          orderids: id
+        }
+        remindNotReceiptGoods(params).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.getList()
+            this.$message.success('提醒成功!')
+          }
+        })
+      }).catch(() => {
+        this.$message.info('已取消提醒')
+      })
+    },
     // 编辑
     btn_edit(editId) {
       this.$layer.iframe({
@@ -271,6 +311,13 @@ export default {
         return false
       }
     },
+    authority_remind(checkStateSH) {
+      if (checkStateSH == 4) {
+        return true
+      } else {
+        return false
+      }
+    },
     authority_edit(checkStateSH) {
       if ((checkStateSH == 0 || checkStateSH == 2) && this.activeName == "-2" ) {
         return true

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleOrderList/edit.vue

@@ -187,7 +187,7 @@
             <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
-        <el-col :span='6'>
+        <el-col :span='12'>
           <el-form-item label="使用积分" prop="F_UseScore" >
             <el-input v-model.number="ruleForm.F_UseScore" placeholder="请输入使用积分" @blur="blurUseScore"/>
           </el-form-item>
@@ -197,6 +197,11 @@
             <span>{{ alreadyPoints }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="最大可使用积分">
+            <span>{{ maxUsePoints }}</span>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="推荐人" prop="F_RecommendName" >
             <el-select v-model="ruleForm.F_RecommendName" class="form_select" filterable remote reserve-keyword clearable value-key="F_ID" placeholder="请输入电话号码" :remote-method="remoteMethodRecommend" :loading="loading" @change="recommendChangeSelect">
@@ -351,7 +356,7 @@
 
 <script>
 import { getProviceCity, getDictionaryValueList } from '@/api/commonAPI'
-import { getOrder, getActivityAccount, getTotalAmount, editOrder } from "@/api/orderManagement/orderList"
+import { getOrder, getActivityAccount, getTotalAmount, editOrder, getMaxUsePoints } from "@/api/orderManagement/orderList"
 import { getAfterSaleEditOrderList } from "@/api/afterSaleManagement/afterSaleList"
 import { getMemberInfo } from '@/api/memberManagement/memberList'
 import { validateTel } from '@/utils/validate'
@@ -439,6 +444,7 @@ export default {
         configurationQuantityTwo: ''
       },
       alreadyPoints: '', //已拥有积分
+      maxUsePoints: '', // 最大可使用积分
       judgmentIsPayment: false, // 判断是否货到付款
       totalAmount: '',
       selectAddress: 3, // 选择地址
@@ -1017,6 +1023,20 @@ export default {
               }
             })
           })
+          this.getMaxUsePointsFun()
+        })
+        resolve()
+      })
+    },
+    // 获取最大使用积分
+    getMaxUsePointsFun() {
+      return new Promise((resolve) => {
+        const params = {
+          vip: this.ruleForm.F_VipId,
+          money: this.totalAmount,
+        }
+        getMaxUsePoints(params).then((response) => {
+          
         })
         resolve()
       })

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleOrderList/index.vue

@@ -19,6 +19,7 @@
       <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
+      <el-input v-model="searchData.submitUser" placeholder="请输入提交员工" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" v-if="isSubmit()" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
     </div>
@@ -51,6 +52,7 @@
           {{ scope.row.F_State | judgmentStateName }}
         </template>
       </el-table-column>
+      <el-table-column prop="F_CheckRemark" label="客服退回原因" align="center" />
       <el-table-column label="地址" align="center">
         <template slot-scope="scope">{{ scope.row | judgmentAddress }}</template>
       </el-table-column>
@@ -152,6 +154,7 @@ export default {
         customer: '', //客户姓名
         customerPhone: '', //客户手机号
         trackingNo: '', //运单号
+        submitUser: '', //提交员工
         searchTime: '', //订单时间
         F_State: '0',
         State: ''
@@ -204,20 +207,6 @@ export default {
     getList() {
       this.loading = true;
       return new Promise(resolve => {
-        // const params = {
-        //   F_State: this.activeName, //订单状态
-        //   pageindex: 1, // int 第几页
-        //   pagesize: 1000000, // int 每页几条信息
-        //   F_ADFrom: this.searchData.adFrom, //消息/广告来源
-        //   // F_Type: '售后订单', //订单类型
-        //   F_Id: this.searchData.id, //订单号
-        //   F_Customer: this.searchData.customer, //客户姓名
-        //   F_CustomerPhone: this.searchData.customerPhone, //客户手机号
-        //   F_TrackingNo: this.searchData.trackingNo, //运单号
-        //   SearchStartTime: this.searchData.searchTime[0], //添加开始时间
-        //   SearchEndTime: this.searchData.searchTime[1], //添加结束时间
-        //   F_PayState:'-2',
-        // };
         const params = {
           F_State: this.searchData.F_State, // 订单状态
           pageindex: 1, // int 第几页
@@ -230,6 +219,7 @@ export default {
           F_Status: this.searchData.logisticsStatus, // 物流状态
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
+          F_SubmitUser: this.searchData.submitUser, // 提交员工
           SearchStartTime: this.searchData.searchTime[0], // 添加开始时间
           SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
           F_PayState: -2,

CallCenterWeb.UI/src/views/callScreen/components/AddOrEditCustomer.vue

@@ -133,6 +133,11 @@
             ></el-input>
           </el-form-item>
         </el-col>
+        <el-col :xl="6" :md="8">
+          <el-form-item label="销售负责人">
+            {{ salesManager }}
+          </el-form-item>
+        </el-col>
         <el-col :xl="24" :md="24">
           <el-form-item label="备用号码">
             <el-table :data="mobileTableData" stripe style="width: 100%">
@@ -315,6 +320,7 @@ export default {
       pickerOptions,// 日期数据
       mobileTableData: [], // 备用号码列表
       mobileData: '', // 备用号码数据
+      salesManager: '', // 销售负责人
       ruleForm: {
         unique_id: "", //		否	string	callid
         id: "", //编辑会员信息id
@@ -541,14 +547,14 @@ export default {
       getCusUser(rid).then(response => {
         if (response.state.toLowerCase() === "success") {
           if (response.rows.Rows.length > 0) {
-            console.log('response.rows.Rows[0]', response.rows.Rows[0])
             this.$emit('cus-info-list', response.rows.Rows[0])
             this.vipid = response.rows.Rows[0].F_ID
             this.resulBtn = false;
-            this.ruleForm = response.rows.Rows[0];
-            response.data = response.rows.Rows[0];
-            this.ruleForm.id = response.rows.Rows[0].F_ID;
+            this.ruleForm = response.rows.Rows[0]
+            response.data = response.rows.Rows[0]
+            this.ruleForm.id = response.rows.Rows[0].F_ID
             this.ruleForm.F_Class = response.rows.Rows[0].F_Label
+            this.salesManager = response.rows.Rows[0].usercode
             if (response.data.F_Province && response.data.F_City) {
               this.placeholderArea = response.data.F_Province + '/'
             } else {

CallCenterWeb.UI/src/views/callScreen/components/CallRecordList.vue

@@ -169,7 +169,7 @@ export default {
           pageindex: this.pageParams.pageindex, // 第几页
           pagesize: this.pageParams.pagesize, // 每页几条信息
           CallType:'',
-          keyword: this.callinNum //	否	string	模糊查询（呼叫号码）
+          CallNumber: this.callinNum //	否	string	模糊查询（呼叫号码）
         }
         getCallRecords(params).then(response => {
           this.loading = false

CallCenterWeb.UI/src/views/callScreen/components/createOrder.vue

@@ -321,7 +321,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="使用积分" prop="F_UseScore">
                 <el-input
                   v-model.number="ruleForm.F_UseScore"
@@ -335,6 +335,13 @@
                 <span>{{ alreadyPoints }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="最大可使用积分">
+                <span>{{ maxUsePoints }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="推荐人" prop="F_RecommendName">
                 <el-select
@@ -359,8 +366,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="12">
               <el-form-item label="媒体" prop="F_MediaName">
                 <el-select
@@ -594,7 +599,7 @@
 
 <script>
 import { getProviceCity, getDictionaryValueList } from '@/api/commonAPI'
-import { addOrder, getActivityAccount, getTotalAmount} from '@/api/orderManagement/orderList'
+import { addOrder, getActivityAccount, getTotalAmount, getMaxUsePoints} from '@/api/orderManagement/orderList'
 import { getMemberInfo } from '@/api/memberManagement/memberList'
 import { validateTel } from '@/utils/validate'
 import { delFiles, filterContent, pickerOptions } from '@/utils'
@@ -688,6 +693,7 @@ export default {
         configurationQuantityTwo: ''
       },
       alreadyPoints: '', // 已拥有积分
+      maxUsePoints: '', // 最大可使用积分
       judgmentIsPayment: false, // 判断是否货到付款
       totalAmount: 0, // 总金额
       defaultAddress: {
@@ -1316,6 +1322,20 @@ export default {
               }
             })
           })
+          this.getMaxUsePointsFun()
+        })
+        resolve()
+      })
+    },
+    // 获取最大使用积分
+    getMaxUsePointsFun() {
+      return new Promise((resolve) => {
+        const params = {
+          vip: this.ruleForm.F_VipId,
+          money: this.totalAmount,
+        }
+        getMaxUsePoints(params).then((response) => {
+          
         })
         resolve()
       })

CallCenterWeb.UI/src/views/callScreen/index.vue

@@ -229,7 +229,6 @@ export default {
     console.log(this.telCallNum)
     this.callinNum = this.telCallNum // 来电号码  $route.params.telInNumber
     this.callinCallid = this.$route.params.callid // 来电callid
-
     // this.callinNum = '15093270696' // 来电号码
     // this.callinCallid = '1540884241276539386' // 来电callid
     if (this.callinNum) {

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrder.vue

@@ -321,7 +321,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="使用积分" prop="F_UseScore">
                 <el-input
                   v-model.number="ruleForm.F_UseScore"
@@ -335,6 +335,13 @@
                 <span>{{ alreadyPoints }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="最大可使用积分">
+                <span>{{ maxUsePoints }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="推荐人" prop="F_RecommendName">
                 <el-select
@@ -359,8 +366,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="12">
               <el-form-item label="媒体" prop="F_MediaName">
                 <el-select
@@ -594,7 +599,7 @@
 
 <script>
 import { getProviceCity, getDictionaryValueList } from '@/api/commonAPI'
-import { addOrder, getActivityAccount, getTotalAmount} from '@/api/orderManagement/orderList'
+import { addOrder, getActivityAccount, getTotalAmount, getMaxUsePoints} from '@/api/orderManagement/orderList'
 import { getMemberInfo } from '@/api/memberManagement/memberList'
 import { validateTel } from '@/utils/validate'
 import { delFiles, filterContent, pickerOptions } from '@/utils'
@@ -688,6 +693,7 @@ export default {
         configurationQuantityTwo: ''
       },
       alreadyPoints: '', // 已拥有积分
+      maxUsePoints: '', // 最大可使用积分
       judgmentIsPayment: false, // 判断是否货到付款
       totalAmount: 0, // 总金额
       defaultAddress: {
@@ -1318,6 +1324,20 @@ export default {
               }
             })
           })
+          this.getMaxUsePointsFun()
+        })
+        resolve()
+      })
+    },
+    // 获取最大使用积分
+    getMaxUsePointsFun() {
+      return new Promise((resolve) => {
+        const params = {
+          vip: this.ruleForm.F_VipId,
+          money: this.totalAmount,
+        }
+        getMaxUsePoints(params).then((response) => {
+          
         })
         resolve()
       })

CallCenterWeb.UI/src/views/orderManagement/changeCollectionOrderList/index.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择售后类型">
+      <!-- <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择售后类型">
         <el-option label="调换" value="1"/>
         <el-option label="退货" value="2"/>
-        <!-- <el-option label="部分退货" value="3"/> -->
+        <el-option label="部分退货" value="3"/>
         <el-option label="对发货" value="4"/>
         <el-option label="补发货" value="5"/>
-        <!-- <el-option label="补差额" value="6"/> -->
+        <el-option label="补差额" value="6"/>
         <el-option label="错发" value="7"/>
-        <!-- <el-option label="漏发" value="8"/> -->
-      </el-select>
+        <el-option label="漏发" value="8"/>
+      </el-select> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_import_waybill_number'" type="primary" class="filter-item" @click="btn_import_waybill_number">导入运单号</el-button>
     </div>
@@ -113,7 +113,7 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="已签收" name="1">
+      <el-tab-pane label="已处理" name="1">
         <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
           <el-table-column type="selection"/>
           <el-table-column type="index" label="编号" align="center" fixed width="80" />
@@ -239,16 +239,49 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
+      <el-tab-pane label="退回" name="4">
+        <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
+          <el-table-column type="selection"/>
+          <el-table-column type="index" label="编号" align="center" fixed width="80" />
+          <el-table-column prop="F_OrderId" label="订单编号" align="center" min-width="180" >
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_OrderId)">{{ scope.row.F_OrderId }}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="售后类型" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_Type | judgmentStateName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="售后审核状态" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_CheckStateSH | judgmentAfterSaleCheckState }}
+            </template>
+          </el-table-column>
+          <el-table-column label="仓库审核状态" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_CheckStateKG | judgmentCustodianStateName }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="F_Money" label="变动金额" align="center" />
+          <el-table-column prop="F_ReturnType" label="售后原因" align="center" />
+          <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
+          <el-table-column prop="F_Remark" label="备注" align="center" />
+          <el-table-column prop="F_AddTime" label="下单日期" align="center" />
+          <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
+            <template slot-scope="scope">
+              <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
+              <el-button
+                v-permission="'HY_waybill_number'"
+                v-if="authority_waybill_number(scope.row.F_ReturnType)"
+                type="text"
+                @click="btn_waybill_number(scope.row.F_OrderId)"
+              >运单号</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
     </el-tabs>
-
-    <!-- <pagination
-      v-show="pageParams.total > 0"
-      :total="pageParams.total"
-      :pageindex.sync="pageParams.pageindex"
-      :pagesize.sync="pageParams.pagesize"
-      class="pagination"
-      @pagination="getList"
-    /> -->
   </div>
 </template>
 
@@ -469,15 +502,39 @@ export default {
         this.$message.info('已取消删除')
       })
     },
+    /* 
+    activeName
+    6: 全部
+    0: 改代收
+    1: 已处理
+    2: 已拒收
+    3: 已提交
+    4: 退回
+    */
     handleTabClick(tab, event) {
       this.pageParams.pageindex = 1
-      if (this.activeName == '3') {
+      if (this.activeName == '6') {
+        this.getlists()
+      } else if (this.activeName == '0') {
+        this.searchData.woState = '-1'
+        this.searchData.isSignfor = this.activeName
+        this.searchData.returnType = '改代收'
+        this.getList()
+      } else if (this.activeName == '1') {
+        this.searchData.woState = '0'
+        this.searchData.isSignfor = ''
+        this.searchData.returnType = '改代收'
+        this.getList()
+      } else if (this.activeName == '3') {
         this.searchData.woState = '1'
         this.searchData.isSignfor = ''
         this.searchData.returnType = '改代收'
         this.getList()
-      } else if (this.activeName == '6') {
-        this.getlists()
+      } else if (this.activeName == '4') {
+        this.searchData.woState = '3'
+        this.searchData.isSignfor = ''
+        this.searchData.returnType = '改代收'
+        this.getList()
       } else {
         this.searchData.woState = ''
         this.searchData.isSignfor = this.activeName
@@ -541,7 +598,7 @@ export default {
       }
     },
     authority_waybill_number(returnType) {
-      if (returnType == '改代收') {
+      if (this.activeName == '1') {
         return true
       } else {
         return false

CallCenterWeb.UI/src/views/orderManagement/orderList/detail.vue

@@ -79,6 +79,15 @@
               寄回运单号：{{ orderDetailData.F_SendbackTrackingNo }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
+              销售：{{ orderDetailData.F_BelongName }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              中心：{{ orderDetailData.F_CoreName }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              小组：{{ orderDetailData.F_GroupName }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
               备注：{{ orderDetailData.F_Remark }}
             </el-col>
             <el-col :md="24">
@@ -209,6 +218,9 @@ export default {
         F_TotlePrice: '', // 商品金额
         F_MediaName: '', // 媒体名称
         F_SendbackTrackingNo: '', // 寄回运单号
+        F_BelongName: '', //销售
+        F_CoreName: '', //中心
+        F_GroupName: '', //小组
       },
       ordercode: '', // 工单编号
       name: '', // 姓名
@@ -350,6 +362,9 @@ export default {
         this.orderDetailData.F_ShouldPrice = res.F_ShouldPrice // 应付金额
         this.orderDetailData.F_MediaName = res.F_MediaName // 媒体名称
         this.orderDetailData.F_SendbackTrackingNo = res.F_SendbackTrackingNo // 寄回运单号
+        this.orderDetailData.F_BelongName = res.F_BelongName // 销售
+        this.orderDetailData.F_CoreName = res.F_CoreName // 中心
+        this.orderDetailData.F_GroupName = res.F_GroupName // 小组
       })
     },
     edit() {

CallCenterWeb.UI/src/views/orderManagement/orderList/edit.vue

@@ -187,7 +187,7 @@
             <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
-        <el-col :span='6'>
+        <el-col :span='12'>
           <el-form-item label="使用积分" prop="F_UseScore" >
             <el-input v-model.number="ruleForm.F_UseScore" placeholder="请输入使用积分" @blur="blurUseScore"/>
           </el-form-item>
@@ -197,6 +197,11 @@
             <span>{{ alreadyPoints }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="最大可使用积分">
+            <span>{{ maxUsePoints }}</span>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="推荐人" prop="F_RecommendName" >
             <el-select v-model="ruleForm.F_RecommendName" class="form_select" filterable remote reserve-keyword clearable value-key="F_ID" placeholder="请输入电话号码" :remote-method="remoteMethodRecommend" :loading="loading" @change="recommendChangeSelect">
@@ -351,7 +356,7 @@
 
 <script>
 import { getProviceCity, getDictionaryValueList } from '@/api/commonAPI'
-import { getOrder, editOrder, getActivityAccount, getTotalAmount } from "@/api/orderManagement/orderList";
+import { getOrder, editOrder, getActivityAccount, getTotalAmount, getMaxUsePoints } from "@/api/orderManagement/orderList";
 import { getMemberInfo } from '@/api/memberManagement/memberList'
 import { validateTel } from '@/utils/validate'
 import { delFiles, filterContent, pickerOptions } from '@/utils'
@@ -439,6 +444,7 @@ export default {
         configurationQuantityTwo: ''
       },
       alreadyPoints: '', //已拥有积分
+      maxUsePoints: '', // 最大可使用积分
       judgmentIsPayment: false, // 判断是否货到付款
       totalAmount: 0,
       selectAddress: 3, // 选择地址
@@ -1017,6 +1023,20 @@ export default {
               }
             })
           })
+          this.getMaxUsePointsFun()
+        })
+        resolve()
+      })
+    },
+    // 获取最大使用积分
+    getMaxUsePointsFun() {
+      return new Promise((resolve) => {
+        const params = {
+          vip: this.ruleForm.F_VipId,
+          money: this.totalAmount,
+        }
+        getMaxUsePoints(params).then((response) => {
+          
         })
         resolve()
       })

CallCenterWeb.UI/src/views/orderManagement/orderList/index.vue

@@ -238,6 +238,7 @@
           scope.row.F_State | judgmentStateName
         }}</template>
       </el-table-column>
+      <el-table-column prop="F_CheckRemark" label="客服退回原因" align="center" />
       <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />
       <el-table-column prop="F_Type" label="订单类型" align="center" />