Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/ZLJ_UI_V6.0

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

@@ -10,11 +10,11 @@ export function getAfterSaleList(params) {
 }
 
 // 添加售后列表
-export function addAfterSaleList(params) {
+export function addAfterSaleList(data) {
   return request({
     url: 'api/AfterSale/addaftersalesh',
     method: 'POST',
-    params
+    data
   })
 }
 
@@ -39,8 +39,17 @@ export function deleteAfterSaleList(params) {
 // 获取售后订单商品列表
 export function getAfterSaleOrderCommodityList(params) {
   return request({
-    url: 'api/AfterSale/deleteaftersalesh',
+    url: 'api/AfterSale/getorderdetail',
     method: 'POST',
     params
   })
-}
+}
+
+// 售后订单列表
+export function getAfterSaleOrderList(params) {
+  return request({
+    url: 'api/AfterSale/getorderlistbyshpage',
+    method: 'POST',
+    params
+  })
+}

CallCenterWeb.UI/src/api/custodianManagement/orderListCustodian.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+// 获取仓库订单列表
+export function getOrderListCustodian(data) {
+  return request({
+    url: 'api/order/getorderlistbykgpage',
+    method: 'post',
+    data
+  })
+}
+
+// 获取仓库订单列表
+export function checkOrderCustodian(data) {
+  return request({
+    url: 'api/order/checkorderbykg',
+    method: 'post',
+    data
+  })
+}

CallCenterWeb.UI/src/api/customerServiceManagement/orderListCustomerService.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 获取客服订单列表
+export function getOrderListCustomerService(data) {
+  return request({
+    url: 'api/order/getorderlistbykfpage',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑客服工单数据
+export function editOrderCustomerService(data) {
+  return request({
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    transformRequest: [function(data) {
+      data = JSON.stringify(data)
+      return data
+    }],
+    url: 'api/order/editorderkf',
+    method: 'post',
+    data
+  })
+}
+
+// 客服审核
+export function checkOrderCustomerService(data) {
+  return request({
+    url: 'api/order/checkorderbykf',
+    method: 'post',
+    data
+  })
+}
+
+// 客服打标签
+export function labelOrderCustomerService(data) {
+  return request({
+    url: 'api/kforder/addordertag',
+    method: 'post',
+    data
+  })
+}
+
+// 客服获取合并订单
+export function getConsolidateOrderListCustomerService(params) {
+  return request({
+    url: 'api/OrderMerge/getordermergebypage',
+    method: 'post',
+    params
+  })
+}

CallCenterWeb.UI/src/api/dashboard/orderDatas.js

@@ -53,3 +53,45 @@ export function getOrderLists(params) {
     params
   })
 }
+
+
+// 获取当月任务
+export function getTaskList(params) {
+  return request({
+    url: 'api/ManagementCenter/totaltasks',
+    method: 'get',
+    params
+  })
+}
+// 获取销售行为分析数据
+export function getSalesData(params) {
+  return request({
+    url: 'api/ManagementCenter/realtimesales',
+    method: 'get',
+    params
+  })
+}
+// 获取重要提醒数据数据
+export function getRemindData(params) {
+  return request({
+    url: 'api/ManagementCenter/reminder',
+    method: 'get',
+    params
+  })
+}
+// 获取排行榜数据
+export function getRankingData(params) {
+  return request({
+    url: 'api/ManagementCenter/rankinglist',
+    method: 'get',
+    params
+  })
+}
+// 获取待办事项数据
+export function getTodolistData(params) {
+  return request({
+    url: 'api/ManagementCenter/todolist',
+    method: 'get',
+    params
+  })
+}

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

@@ -70,56 +70,3 @@ export function editOrder(data) {
     data
   })
 }
-
-// 获取客服订单列表
-export function getOrderListCustomerService(data) {
-  return request({
-    url: 'api/order/getorderlistbykfpage',
-    method: 'post',
-    data
-  })
-}
-
-// 编辑客服工单数据
-export function editOrderCustomerService(data) {
-  return request({
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    transformRequest: [function(data) {
-      data = JSON.stringify(data)
-      return data
-    }],
-    url: 'api/order/editorderkf',
-    method: 'post',
-    data
-  })
-}
-
-// 客服审核
-export function checkOrderCustomerService(data) {
-  return request({
-    url: 'api/order/checkorderbykf',
-    method: 'post',
-    data
-  })
-}
-
-
-// 获取库管订单列表
-export function getOrderListCustodian(data) {
-  return request({
-    url: 'api/order/getorderlistbykgpage',
-    method: 'post',
-    data
-  })
-}
-
-// 获取库管订单列表
-export function checkOrderCustodian(data) {
-  return request({
-    url: 'api/order/checkorderbykg',
-    method: 'post',
-    data
-  })
-}

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

@@ -6,12 +6,18 @@
       </el-form-item>
       <el-form-item label="售后类型" prop="F_Type" >
         <el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择合并类型">
-          <el-option v-for="item in mergeType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
+          <el-option label="调换货" value="1"></el-option>
+          <el-option label="退货" value="2"></el-option>
+          <el-option label="部分退货" value="3"></el-option>
+          <el-option label="对发货" value="4"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="变动金额" prop="F_Money">
         <el-input v-model="ruleForm.F_Money" placeholder="-需要退 +用户需补"/>
       </el-form-item>
+      <el-form-item label="已添加商品id" prop="F_DetailList">
+        <el-input v-model="ruleForm.F_DetailList" placeholder="已添加商品id"/>
+      </el-form-item>
       <el-row>
         <el-col :span='8'>
           <el-form-item label="商品分类" prop="parentids" >
@@ -25,14 +31,6 @@
               change-on-select
               @change="commodityTypeChange"
               style="width: 100%;"/>
-            <!-- <el-select v-model="commoditySearchData.className" placeholder="请选择商品分类" class="filter-item" clearable value-key="F_ClassId" @change="commodityTypeChange">
-              <el-option
-                v-for="item in commodityTypeLists"
-                :key="item.F_ClassId"
-                :label="item.F_ClassName"
-                :value="item">
-              </el-option>
-            </el-select> -->
           </el-form-item>
         </el-col>
         <el-col :span='8'>
@@ -60,7 +58,7 @@
       </el-row>
       <el-row>
         <el-col :span='24'>
-          <el-form-item label="已添加商品">
+          <el-form-item label="补发商品">
             <el-table :data="commodityTableData" stripe style="width: 100%">
               <el-table-column type="selection" width="55"></el-table-column>
               <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
@@ -74,6 +72,17 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span='24'>
+          <el-form-item label="退回商品">
+            <el-table :data="oldCommodityTableData" stripe style="width: 100%" @selection-change="handleSelectionChange" ref="oldCommodityTable" >
+              <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
+              <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
+            </el-table>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item label="销售备注" prop="F_Remark">
         <el-input :autosize="{ minRows: 4}" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入销售备注"/>
       </el-form-item>
@@ -90,10 +99,10 @@ import { getDictionaryValueList } from '@/api/commonAPI'
 import { getOrder } from '@/api/orderManagement/orderList'
 import { getCommodityType } from '@/api/commodityManagement/commodityType'
 import { getCommodityList } from '@/api/commodityManagement/commodityList'
-import { addAfterSaleList, editAfterSaleList, getAfterSaleList } from "@/api/afterSaleManagement/afterSaleList";
+import { addAfterSaleList, editAfterSaleList, getAfterSaleList, getAfterSaleOrderCommodityList, } from "@/api/afterSaleManagement/afterSaleList";
 
 export default {
-  name: "AddOrEdit",
+  name: "AfterSale",
   props: {
     rowid: {
       type: String,
@@ -107,7 +116,6 @@ export default {
   data() {
     return {
       parentids: [],
-      mergeType: [],//订单类型
       commodityTypeLists: [], //商品分类下拉数据
       // 自定义菜单下拉数据的key值
       typeDropProps: {
@@ -122,11 +130,14 @@ export default {
         productId: '', //商品id
         num: 1, //商品数量
       },
+      oldCommodityTableData: [], //退回商品列表
+      oldDetailListSelection: [], // 退回商品选中数据
       ruleForm: {
-        F_Id: '',
-        F_OrderList: '', //合并订单
+        F_Id: '', //售后id
+        F_OrderId: '', //订单编号
+        F_DetailList: '', //补发产品列表
+        F_OldDetailList: '', //退回产品列表
         F_Type: '', //合并类型
-        F_Gift: '', //赠送商品
         F_Money: '', //减免金额
         F_Remark: '', //销售备注
         F_state: '', //订单状态
@@ -147,11 +158,6 @@ export default {
           trigger: 'blur',
           message: '请输入订单类型',
         }],
-        F_Gift: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入赠送商品',
-        }],
         F_Money: [{
           required: true,
           trigger: 'blur',
@@ -162,9 +168,7 @@ export default {
     };
   },
   created() {
-    this.getMergeType()
     this.getCommodityTypeSelect()
-    this.getOrderDetail()
     Promise.all([
     ]).then(() => {
       if (this.rowid) {
@@ -179,20 +183,6 @@ export default {
         if (valid) {
           this.loading = true;
           this.ruleForm.F_state = state
-          //添加
-          if (!this.rowid) {
-            addAfterSaleList(this.ruleForm).then(response => {
-              this.loading = false
-              if (response.state.toLowerCase() === 'success') {
-                this.$parent.$layer.close(this.layerid)
-                this.$parent.getList() // 重新加载父级数据
-                this.$message.success('恭喜你，添加成功!')
-              }
-            }).catch(() => {
-              this.loading = false
-            })
-            return
-          }
           // 编辑
           editAfterSaleList(this.ruleForm)
             .then(response => {
@@ -212,20 +202,6 @@ export default {
         }
       });
     },
-    // 获取合并类型
-    getMergeType() {
-      return new Promise(resolve=>{
-        const params={
-          isleaf:true,
-          code:'AFTERSALETYPE'
-        }
-        getDictionaryValueList(params).then(response=>{
-          if(response.state.toLowerCase() === 'success'){
-            this.mergeType = response.data.Rows
-          }
-        })
-      })
-    },
     //获取商品分类
     getCommodityTypeSelect() {
       this.loading = true
@@ -287,50 +263,80 @@ export default {
         })
         return
       }
+      if (this.commodityTableData.length > 0) {
+        for (let i=0; i < this.commodityTableData.length; i++ ) {
+          if (this.commodityTableData[i].F_ProductId === this.commoditySearchData.productId) {
+            this.commodityTableData[i].F_Count = this.commodityTableData[i].F_Count + this.commoditySearchData.num
+            return
+          }
+        }
+      }
       let data = {
         F_ProductId: this.commoditySearchData.productId,
         F_ProductName: this.commoditySearchData.productName,
         F_Count: this.commoditySearchData.num,
       }
       this.commodityTableData.push(data)
+      let ids = []
+      for (let i=0; i<this.commodityTableData.length; i++) {
+        ids.push(this.commodityTableData[i].F_ProductId)
+      }
+      this.ruleForm.F_DetailList = ids.join(',') //补发产品列表
     },
     //删除商品
     btn_deleteCommodity (val) {
       let index = this.commodityTableData.indexOf(val)
       this.commodityTableData.splice(index, 1)
     },
-    // 获取订单详情
-    getDetail(orderId) {
-      this.loading = true;
-      return new Promise(resolve => {
-        const params = {
-          F_State: '-2', //订单状态
-          f_id: orderId,
-        };
-        getAfterSaleList(params).then(response => {
-          this.loading = false;
-          if (response.state.toLowerCase() === "success") {
-            const res = response.data.Rows[0]
-            this.ruleForm.F_OrderList = res.F_OrderList //合并订单
-            this.ruleForm.F_Type = res.F_Type //合并类型
-            this.ruleForm.F_Gift = res.F_Gift //赠送商品
-            this.ruleForm.F_Money = res.F_Money //减免金额
-            this.ruleForm.F_Remark = res.F_Remark //销售备注
-          }
-        });
-        resolve();
-      });
+    //获取售后订单详情
+    getDetail(rid) {
+      const params = {
+        F_CheckStateSH: -2, //售后审核状态
+        F_Type: '', //售后类型
+        F_State: -2, //订单状态
+        F_Id: rid,
+        pageindex: 1, // int 第几页
+        pagesize: 100, // int 每页几条信息
+      }
+      getAfterSaleList(params).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data.Rows[0]
+          this.ruleForm.F_OrderId = res.F_OrderId //订单编号
+          this.ruleForm.F_DetailList = res.F_DetailList //补发产品列表
+          this.ruleForm.F_OldDetailList = res.F_OldDetailList //退回产品列表
+          this.ruleForm.F_Type = res.F_Type + '' //合并类型
+          this.ruleForm.F_Money = res.F_Money //减免金额
+          this.ruleForm.F_Remark = res.F_Remark //销售备注
+          this.getAfterSaleOrderCommodity(this.ruleForm.F_OrderId)
+        }
+      })
     },
-    // 详情
-    getOrderDetail(rid) {
-      getOrder(rid).then(response => {
+    // 售后订单商品列表
+    getAfterSaleOrderCommodity(rid) {
+      const params = {
+        orderid: rid
+      }
+      getAfterSaleOrderCommodityList(params).then(response => {
         if (response.state.toLowerCase() === 'success') {
           const res = response.data
-          this.orderDetailData.OrderDetailList = res.OrderDetailList //订单详情list
-          this.commodityTableData = res.OrderDetailList
+          this.oldCommodityTableData = res
+          this.$nextTick(()=>{
+            this.oldCommodityTableData.forEach((row,index)=>{
+              this.$refs.oldCommodityTable.toggleRowSelection(row)
+            })
+          },1)
         }
       })
     },
+    //选择多个
+    handleSelectionChange(selection) {
+      let ids = []
+      this.oldDetailListSelection = selection
+      for (let i=0; i<this.oldDetailListSelection.length; i++) {
+        ids.push(this.oldDetailListSelection[i].F_Id)
+      }
+      this.ruleForm.F_OldDetailList = ids.join(',')
+    }, 
   }
 };
 </script>

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

@@ -6,19 +6,26 @@
         <el-option label="已提交审核" value="1"></el-option>
       </el-select>
       <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择售后类型">
-        <el-option v-for="item in mergeType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
+          <el-option label="调换货" value="1"></el-option>
+          <el-option label="退货" value="2"></el-option>
+          <el-option label="部分退货" value="3"></el-option>
+          <el-option label="对发货" value="4"></el-option>
       </el-select>
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button v-permission="'HY_add'" type="primary" class="filter-item" @click="btn_add">添加</el-button>
+      <!-- <el-button v-permission="'HY_add'" type="primary" class="filter-item" @click="btn_add">添加</el-button> -->
     </div>
     <el-table v-loading="loading" :data="dataLists" border stripe  @selection-change="handleSelectionChange">
       <el-table-column type="selection"></el-table-column>
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
-      <el-table-column prop="F_OrderList" label="合并订单" align="center" />
-      <el-table-column prop="F_Type" label="合并类型" align="center" />
-      <el-table-column prop="F_Gift" label="赠送商品" align="center" />
+      <el-table-column prop="F_OrderId" label="订单编号" align="center" />
+      <el-table-column label="售后类型" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.F_Type | judgmentStateName }}
+        </template>
+      </el-table-column>
+      <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_AddUserName" 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_detail'" type="text" @click="btn_detail(scope.row.F_Id)">详情</el-button>
@@ -52,6 +59,15 @@ export default {
     Pagination
   },
   filters: {
+    judgmentStateName(status) {
+      const statusMap = {
+        '1': '调换货',
+        '2': '退货',
+        '3': '部门退货',
+        '4': '对发货',
+      }
+      return statusMap[status]
+    },
   },
   data() {
     return {
@@ -69,11 +85,9 @@ export default {
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
-      mergeType: [],//合并类型
     };
   },
   created() {
-    this.getOrderType()
     this.getList()
     document.onkeyup = e => {
       if (e.keyCode === 13) {
@@ -103,20 +117,6 @@ export default {
         resolve();
       });
     },
-    // 获取合并类型
-    getOrderType() {
-      return new Promise(resolve=>{
-        const params={
-          isleaf:true,
-          code:'AFTERSALETYPE'
-        }
-        getDictionaryValueList(params).then(response=>{
-          if(response.state.toLowerCase() === 'success'){
-            this.mergeType = response.data.Rows
-          }
-        })
-      })
-    },
     //添加
     btn_add () {
       this.$layer.iframe({
@@ -150,7 +150,7 @@ export default {
           data: { rowid: editId } // props
         },
         area: ["80%", "90%"],
-        title: "编辑订单"
+        title: "编辑售后"
       });
     },
     btn_delete(id) {

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

@@ -0,0 +1,335 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
+      <el-form-item label="订单编号" prop="F_OrderId" >
+        <el-input v-model="ruleForm.F_OrderId" disabled="false" />
+      </el-form-item>
+      <el-form-item label="售后类型" prop="F_Type" >
+        <el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择合并类型">
+          <el-option label="调换货" value="1"></el-option>
+          <el-option label="退货" value="2"></el-option>
+          <el-option label="部分退货" value="3"></el-option>
+          <el-option label="对发货" value="4"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="变动金额" prop="F_Money">
+        <el-input v-model="ruleForm.F_Money" placeholder="-需要退 +用户需补"/>
+      </el-form-item>
+      <el-row>
+        <el-col :span='8'>
+          <el-form-item label="商品分类" prop="parentids" >
+            <el-cascader
+              v-model="parentids"
+              :options="commodityTypeLists"
+              :props="typeDropProps"
+              placeholder="请选择商品分类"
+              clearable
+              filterable
+              change-on-select
+              @change="commodityTypeChange"
+              style="width: 100%;"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span='8'>
+          <el-form-item label="商品" prop="productName" >
+            <el-select v-model="commoditySearchData.productName" class="filter-item" value-key="F_ProductId" clearable placeholder="请选择订单类型" @change="commodityListChange">
+              <el-option
+                v-for="item in commodityListLists"
+                :key="item.F_ProductId"
+                :label="item.F_ProductName"
+                :value="item">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span='8'>
+          <el-form-item label="商品数量" prop="num" >
+            <el-input-number v-model="commoditySearchData.num" :min="1" label="描述文字"></el-input-number>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-form-item>
+          <el-button type="primary" @click="addCommodity">添加商品</el-button>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-col :span='24'>
+          <el-form-item label="补发商品">
+            <el-table :data="commodityTableData" stripe style="width: 100%">
+              <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
+              <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button type="text" @click="btn_deleteCommodity(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span='24'>
+          <el-form-item label="退回商品">
+            <el-table :data="oldCommodityTableData" stripe style="width: 100%" @selection-change="handleSelectionChange" ref="oldCommodityTable" >
+              <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
+              <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
+            </el-table>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="销售备注" prop="F_Remark">
+        <el-input :autosize="{ minRows: 4}" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入销售备注"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm(0)">保存</el-button>
+        <el-button type="primary" @click="submitForm(1)">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getDictionaryValueList } from '@/api/commonAPI'
+import { getOrder } from '@/api/orderManagement/orderList'
+import { getCommodityType } from '@/api/commodityManagement/commodityType'
+import { getCommodityList } from '@/api/commodityManagement/commodityList'
+import { addAfterSaleList, editAfterSaleList, getAfterSaleList, getAfterSaleOrderCommodityList } from "@/api/afterSaleManagement/afterSaleList";
+
+export default {
+  name: "AfterSale",
+  props: {
+    rowid: {
+      type: String,
+      default: ""
+    },
+    layerid: {
+      type: String,
+      default: ""
+    }
+  },
+  data() {
+    return {
+      parentids: [],
+      commodityTypeLists: [], //商品分类下拉数据
+      // 自定义菜单下拉数据的key值
+      typeDropProps: {
+        value: 'id',
+        label: 'text'
+      },
+      commodityTableData: [], //添加商品
+      commoditySearchData: { //商品搜索数据
+        classId: '', // 商品分类id
+        className: '', // 商品分类名称
+        productName: '', //商品名称
+        productId: '', //商品id
+        num: 1, //商品数量
+      },
+      oldCommodityTableData: [], //退回商品列表
+      oldDetailListSelection: [], // 退回商品选中数据
+      ruleForm: {
+        F_OrderId: '', //订单编号
+        F_DetailList: '', //补发产品列表
+        F_OldDetailList: '', //退回产品列表
+        F_Type: '', //合并类型
+        F_Money: '', //减免金额
+        F_Remark: '', //销售备注
+        F_state: '', //订单状态
+      },
+      rules: {
+        order1: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单编号1',
+        }],
+        order2: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单编号2',
+        }],
+        F_Type: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单类型',
+        }],
+        F_Money: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入减免金额',
+        }],
+      },
+      loading: false
+    };
+  },
+  created() {
+    this.getCommodityTypeSelect()
+    Promise.all([
+    ]).then(() => {
+      if (this.rowid) {
+        this.ruleForm.F_OrderId = this.rowid
+        this.getAfterSaleOrderCommodity(this.rowid)
+      }
+    });
+  },
+  methods: {
+    submitForm(state) {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          this.loading = true;
+          this.ruleForm.F_state = state
+          //添加
+          // if (!this.rowid) {
+            addAfterSaleList(this.ruleForm).then(response => {
+              this.loading = false
+              if (response.state.toLowerCase() === 'success') {
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getList() // 重新加载父级数据
+                this.$message.success('恭喜你，添加成功!')
+              }
+            }).catch(() => {
+              this.loading = false
+            })
+            return
+          // }
+          // 编辑
+          // editAfterSaleList(this.ruleForm)
+          //   .then(response => {
+          //     this.loading = false;
+          //     if (response.state.toLowerCase() === "success") {
+          //       this.$parent.$layer.close(this.layerid);
+          //       this.$parent.getList(); // 重新加载父级数据
+          //       this.$message.success("恭喜你，编辑成功!");
+          //     }
+          //   })
+          //   .catch(() => {
+          //     this.loading = false;
+          //   });
+        } else {
+          this.$message.error("请输入有效的必填项信息!");
+          return false;
+        }
+      });
+    },
+    //获取商品分类
+    getCommodityTypeSelect() {
+      this.loading = true
+      return new Promise(resolve => {
+        const data = {
+          pageindex: 1, // int 第几页
+          pagesize: 300, // int 每页几条信息
+          ParentId: 0,
+        }
+        getCommodityType(data).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.commodityTypeLists = response.data
+          }
+        })
+        resolve()
+      })
+    },
+
+    commodityTypeChange(item) {
+      this.commoditySearchData.classId = this.parentids[this.parentids.length - 1]
+      this.getCommodityListSelect()
+    },
+    commodityListChange(item) {
+      this.commoditySearchData.productId = item.F_ProductId
+      this.commoditySearchData.productName = item.F_ProductName
+    },
+    //获取商品
+    getCommodityListSelect() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: 1, // int 第几页,
+          pagesize: 300, // int 每页几条信息,
+          ProductId: '',
+          ClassId: this.commoditySearchData.classId === '' ? 0 : this.commoditySearchData.classId,
+          ClassName: '',
+          ProductName: '',
+          PinyinShort: '',
+          ProductNumber: '',
+          ProductShortName: '',
+          tag: '',
+          issale: 1,
+        }
+        getCommodityList(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.commodityListLists = response.data.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    addCommodity() {
+      if (this.commoditySearchData.productName === ''){
+        this.$message({
+          message: '请选择商品！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.commodityTableData.length > 0) {
+        for (let i=0; i < this.commodityTableData.length; i++ ) {
+          if (this.commodityTableData[i].F_ProductId === this.commoditySearchData.productId) {
+            this.commodityTableData[i].F_Count = this.commodityTableData[i].F_Count + this.commoditySearchData.num
+            return
+          }
+        }
+      }
+      let data = {
+        F_ProductId: this.commoditySearchData.productId,
+        F_ProductName: this.commoditySearchData.productName,
+        F_Count: this.commoditySearchData.num,
+      }
+      this.commodityTableData.push(data)
+      let ids = []
+      for (let i=0; i<this.commodityTableData.length; i++) {
+        ids.push(this.commodityTableData[i].F_ProductId)
+      }
+      this.ruleForm.F_DetailList = ids.join(',') //补发产品列表
+    },
+    //删除商品
+    btn_deleteCommodity (val) {
+      let index = this.commodityTableData.indexOf(val)
+      this.commodityTableData.splice(index, 1)
+    },
+    // 售后订单商品列表
+    getAfterSaleOrderCommodity(rid) {
+      const params = {
+        orderid: rid
+      }
+      getAfterSaleOrderCommodityList(params).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data
+          this.oldCommodityTableData = res
+          this.$nextTick(()=>{
+            this.oldCommodityTableData.forEach((row,index)=>{
+              this.$refs.oldCommodityTable.toggleRowSelection(row)
+            })
+          },1)
+        }
+      })
+    },
+    //选择多个
+    handleSelectionChange(selection) {
+      let ids = []
+      this.oldDetailListSelection = selection
+      for (let i=0; i<this.oldDetailListSelection.length; i++) {
+        ids.push(this.oldDetailListSelection[i].F_Id)
+      }
+      this.ruleForm.F_OldDetailList = ids.join(',')
+    }, 
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_form .form_select {
+  width: 100%;
+}
+</style>

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

@@ -0,0 +1,343 @@
+<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-input v-model="searchData.adFrom" placeholder="请输入消息/广告媒体来源" class="filter-item" />
+      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
+        <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
+      </el-select>
+      <el-input v-model="searchData.id" placeholder="请输入订单号" class="filter-item" />
+      <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-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
+      <el-button v-permission="'HY_export'" type="primary" class="filter-item" icon="el-icon-upload2" @click="btn_export">导出</el-button>
+      <el-button v-permission="'HY_import'" type="primary" class="filter-item" icon="el-icon-download" @click="btn_import">导入</el-button>
+      <el-button v-permission="'HY_merge'" type="primary" class="filter-item" @click="btn_merge">合并</el-button>
+      <el-button v-permission="'HY_split'" type="primary" class="filter-item" @click="btn_split">拆分</el-button>
+    </div>
+    <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
+      <el-tab-pane label="全部" name="-2"></el-tab-pane>
+      <el-tab-pane label="无效" name="-1"></el-tab-pane>
+      <el-tab-pane label="暂存" name="0"></el-tab-pane>
+      <el-tab-pane label="提交" name="1"></el-tab-pane>
+      <el-tab-pane label="退回" name="2"></el-tab-pane>
+      <el-tab-pane label="通过" name="3"></el-tab-pane>
+      <el-tab-pane label="无货" name="4"></el-tab-pane>
+      <el-tab-pane label="已分拣" name="5"></el-tab-pane>
+      <el-tab-pane label="已发货" name="6"></el-tab-pane>
+    </el-tabs>
+    <el-table v-loading="loading" :data="dataLists" border stripe  @selection-change="handleSelectionChange" row-key="F_Id">
+      <el-table-column type="selection" :reserve-selection="true"></el-table-column>
+      <el-table-column type="index" label="编号" align="center" fixed width="80" />
+      <el-table-column prop="F_Id" label="订单编号" align="center" min-width="150" />
+      <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
+      <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
+      <el-table-column label="订购商品" align="center" min-width>
+        <template slot-scope="scope">
+          {{ scope.row.OrderDetailList | judgmentOrderGoods}}
+        </template>
+      </el-table-column>
+      <el-table-column prop="F_AddTime" label="下单日期" align="center" />
+      <el-table-column label="订单状态" align="center" >
+        <template slot-scope="scope">
+          {{ scope.row.F_State | judgmentStateName }}
+        </template>
+      </el-table-column>
+      <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" />
+      <el-table-column prop="F_Express" 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_detail'" type="text" @click="btn_detail(scope.row.F_Id)">详情</el-button>
+          <el-button v-permission="'HY_apply'" type="text" @click="btn_apply(scope.row.F_Id)">申请</el-button>
+          <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
+          <el-button v-permission="'HY_cancel'" type="text" @click="btn_cancel(scope.row.F_Id)">撤销</el-button>
+          <el-button v-permission="'HY_afterSale'" type="text" @click="btn_afterSale(scope.row.F_Id)">售后</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="pageParams.total > 0"
+      :total="pageParams.total"
+      :pageindex.sync="pageParams.pageindex"
+      :pagesize.sync="pageParams.pagesize"
+      class="pagination"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { getDictionaryValueList } from '@/api/commonAPI'
+import { getAfterSaleOrderList } from "@/api/afterSaleManagement/afterSaleList";
+import { pickerOptions, formatterContent } from "@/utils";
+// import edit from "./edit";
+// import cancel from './cancel';
+// import detail from './detail';
+// import merge from './merge';
+// import apply from './apply';
+// import importAuth from './importAuth';
+import afterSale from './afterSale';
+import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
+
+export default {
+  name: "orderList",
+  components: {
+    Pagination
+  },
+  filters: {
+    judgmentStateName(status) {
+      const statusMap = {
+        '-1': '无效',
+        '0': '暂存',
+        '1': '提交',
+        '2': '退回',
+        '3': '通过',
+        '4': '无货',
+        '5': '已分拣',
+        '6': '已发货'
+      }
+      return statusMap[status]
+    },
+    judgmentOrderGoods(status) {
+      let orderGoodsNameQuantity = ''
+      for (let i = 0; i < status.length; i++) {
+        orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
+      }
+      orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
+      return orderGoodsNameQuantity
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      searchData: {
+        adFrom: '', //消息/广告媒体来源
+        type: '', //订单类型
+        id: '', //订单号
+        customer: '', //客户姓名
+        customerPhone: '', //客户手机号
+        trackingNo: '', //运单号
+        searchTime: '', //订单时间
+      },
+      activeName: "-2", //标签切换首页
+      pickerOptions, // 日期数据
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      dataLists: [], // 列表数据
+      multipleSelection: [], // 选中的数据
+      selectedId: [], // 选中的数据的id
+      orderType: [],//订单类型
+      mergeOrderId: [], //合并订单id
+    };
+  },
+  created() {
+    this.getOrderType()
+    this.getList()
+    document.onkeyup = e => {
+      if (e.keyCode === 13) {
+        this.getList();
+      }
+    };
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      return new Promise(resolve => {
+        const params = {
+          F_State: this.activeName, //订单状态
+          pageindex: this.pageParams.pageindex, // int 第几页
+          pagesize: this.pageParams.pagesize, // int 每页几条信息
+          F_ADFrom: this.searchData.adFrom, //消息/广告来源
+          F_Type: this.searchData.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], //添加结束时间
+        };
+        getAfterSaleOrderList(params).then(response => {
+          this.loading = false;
+          if (response.state.toLowerCase() === "success") {
+            this.pageParams.total = response.data.Totals;
+            this.dataLists = response.data.Rows;
+          }
+        });
+        resolve();
+      });
+    },
+    // 获取订单类型
+    getOrderType() {
+      return new Promise(resolve=>{
+        const params={
+          isleaf:true,
+          code:'ORDERTYPE'
+        }
+        getDictionaryValueList(params).then(response=>{
+          if(response.state.toLowerCase() === 'success'){
+            this.orderType = response.data.Rows
+          }
+        })
+      })
+    },
+    handleTabClick(tab, event) {
+      this.getList()
+    },
+    handle(ordercode){
+       this.$layer.iframe({
+        content: {
+          content: detail, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': ordercode }// props
+        },
+        area: ['80%', '90%'],
+        title: '订单详情'
+      })
+    },
+    btn_detail(ordercode){
+       this.$layer.iframe({
+        content: {
+          content: detail, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': ordercode }// props
+        },
+        area: ['80%', '90%'],
+        title: '订单详情'
+      })
+    },
+
+    btn_search() {
+      this.pageParams.pageindex = 1;
+      this.getList();
+    },
+    btn_edit(editId) {
+      this.$layer.iframe({
+        content: {
+          content: edit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: editId } // props
+        },
+        area: ["80%", "90%"],
+        title: "编辑订单"
+      });
+    },
+    //导出
+    btn_export() {},
+    //导入
+    btn_import(){
+      this.$layer.iframe({
+        content: {
+          content: importAuth, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['40%', '380px'],
+        shadeClose: false,
+        title: '导入订单信息'
+      })
+    },
+    //申请
+    btn_apply(applyId) {
+       this.$layer.iframe({
+        content: {
+          content: apply, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: applyId } // props
+        },
+        area: ["30%", "40%"],
+        title: "申请内容"
+      });
+    },
+    //撤销
+    btn_cancel(orderId) {
+      this.$confirm('您确定要将此工单撤销吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const data = {
+            orderid: orderId,
+            state: 0, //撤销 0
+          }
+          cancelOrder(data).then(response => {
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('撤销成功!')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消撤销'
+          });          
+      });
+    },
+    //售后
+    btn_afterSale(afterSalesId) {
+      this.$layer.iframe({
+        content: {
+          content: afterSale, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: afterSalesId } // props
+        },
+        area: ["80%", "80%"],
+        title: "售后内容"
+      });
+    },
+    //合并
+    btn_merge() {
+      if (this.mergeOrderId.length < 2) {
+        this.$message({
+          message: '最少选择两条订单！',
+          type: 'warning'
+        });
+        return
+      }
+      this.$layer.iframe({
+        content: {
+          content: merge, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: this.mergeOrderId } // props
+        },
+        area: ["80%", "90%"],
+        title: "合并订单"
+      });
+    },
+    //拆分
+    btn_split() {},
+    //选择多个
+    handleSelectionChange(val) {
+      const ids = []
+      this.multipleSelection = val
+      for (let i=0; i<this.multipleSelection.length; i++) {
+        ids.push(this.multipleSelection[i].F_Id)
+      }
+      this.mergeOrderId = ids
+    }, 
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el{
+  cursor: pointer;
+}
+</style>

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/addOrEdit.vue

@@ -8,15 +8,18 @@
           </el-form-item>
         </el-col>
         <el-col :md="12">
-          <el-form-item label="商品类型" prop="ClassName">
-            <el-select v-model="ruleForm.ClassName" placeholder="请选择商品类型" class="form_select" clearable value-key="F_ClassId" @change="commodityTypeChange">
-              <el-option
-                v-for="item in commodityTypeLists"
-                :key="item.F_ClassId"
-                :label="item.F_ClassName"
-                :value="item">
-              </el-option>
-            </el-select>
+          <el-form-item label="商品分类" prop="className">
+            <el-cascader
+              v-model="parentids"
+              :options="commodityTypeLists"
+              :props="typeDropProps"
+              placeholder="请选择商品分类"
+              clearable
+              filterable
+              change-on-select
+              @change="commodityTypeChange"
+              ref="myCascader"
+              style="width: 100%;"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -158,12 +161,13 @@ export default {
   },
   data() {
     return {
-      props: { // 自定义省市下拉数据的key值
-        value: 'code',
-        label: 'name',
-        children: 'entityJson'
-      },
+      parentids:[],
       commodityTypeLists: [], //商品类型下拉
+      // 自定义菜单下拉数据的key值
+      typeDropProps: {
+        value: 'id',
+        label: 'text'
+      },
       commodityLabelLists: [], //商品标签下拉
       ruleForm: {
         ProductId: '', //商品id
@@ -336,7 +340,7 @@ export default {
         getCommodityType(data).then(response => {
           this.loading = false
           if (response.state.toLowerCase() === 'success') {
-            this.commodityTypeLists = response.data.Rows
+            this.commodityTypeLists = response.data
           }
         })
         resolve()
@@ -359,8 +363,8 @@ export default {
       })
     },
     commodityTypeChange(item) {
-      this.ruleForm.ClassId = item.F_ClassId
-      this.ruleForm.ClassName = item.F_ClassName
+      this.ruleForm.ClassId = this.parentids[this.parentids.length - 1]
+      this.ruleForm.ClassName = this.$refs['myCascader'].currentLabels[this.parentids.length - 1]
     },
   }
 }

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

@@ -1,19 +1,7 @@
 <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-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-input v-model="searchData.adFrom" placeholder="请输入消息/广告媒体来源" class="filter-item" />
       <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
         <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
@@ -23,10 +11,8 @@
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
       <el-input v-model="searchData.trackingNo" 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_export'" type="primary" class="filter-item" icon="el-icon-upload2" @click="btn_export">导出</el-button>
-      <el-button v-permission="'HY_import'" type="primary" class="filter-item" icon="el-icon-download" @click="btn_import">导入</el-button>
-      <el-button v-permission="'HY_merge'" type="primary" @click="btn_merge">合并</el-button>
-      <el-button v-permission="'HY_split'" type="primary" @click="btn_split">拆分</el-button>
+      <el-button v-permission="'HY_sorting'" type="primary" class="filter-item" @click="btn_export">批量分拣</el-button>
+      <el-button v-permission="'HY_ship'" type="primary" class="filter-item" @click="btn_export">批量发货</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
       <el-tab-pane label="全部" name="-2"></el-tab-pane>
@@ -45,7 +31,11 @@
       <el-table-column prop="F_Id" label="订单编号" align="center" min-width="150" />
       <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
       <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
-      <el-table-column prop="typename" label="订购商品" align="center" min-width />
+      <el-table-column label="订购商品" align="center" min-width>
+        <template slot-scope="scope">
+          {{ scope.row.OrderDetailList | judgmentOrderGoods}}
+        </template>
+      </el-table-column>
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
       <el-table-column label="订单状态" align="center" >
         <template slot-scope="scope">
@@ -79,12 +69,9 @@
 
 <script>
 import { getDictionaryValueList } from '@/api/commonAPI'
-import { getOrderListCustodian, cancelOrder } from "@/api/orderManagement/orderList";
+import { getOrderListCustodian, checkOrderCustodian } from "@/api/custodianManagement/orderListCustodian";
 import { pickerOptions, formatterContent } from "@/utils";
-import sorting from "./sorting";
-import ship from "./ship";
 // import detail from './detail';
-// import importAuth from './importAuth';
 // import afterSales from './afterSales';
 import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
 
@@ -107,6 +94,14 @@ export default {
       }
       return statusMap[status]
     },
+    judgmentOrderGoods(status) {
+      let orderGoodsNameQuantity = ''
+      for (let i = 0; i < status.length; i++) {
+        orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
+      }
+      orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
+      return orderGoodsNameQuantity
+    },
   },
   data() {
     return {
@@ -213,21 +208,6 @@ export default {
         title: "编辑订单"
       });
     },
-    //导出
-    btn_export() {},
-    //导入
-    btn_import(){
-      this.$layer.iframe({
-        content: {
-          content: importAuth, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
-        },
-        area: ['40%', '380px'],
-        shadeClose: false,
-        title: '导入订单信息'
-      })
-    },
     //售后
     btn_afterSales(afterSalesId) {
       this.$layer.iframe({
@@ -242,32 +222,54 @@ export default {
     },
     //分拣
     btn_sorting(orderid) {
-      this.$layer.iframe({
-        content: {
-          content: sorting, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
-        },
-        area: ["30%", "30%"],
-        title: "分拣"
+      this.$confirm('您确定要分拣吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const data = {
+            orderid: orderid,
+            state: 5, //订单状态 —— 5 分拣
+            remark: '', //备注
+          }
+          checkOrderCustodian(data).then(response => {
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('分拣成功!')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消分拣'
+          });          
       });
     },
     //发货
     btn_ship(orderid) {
-      this.$layer.iframe({
-        content: {
-          content: ship, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
-        },
-        area: ["30%", "30%"],
-        title: "发货"
+      this.$confirm('您确定要发货吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const data = {
+            orderid: orderid,
+            state: 6, //订单状态 —— 6 发货
+            remark: '', //备注
+          }
+          checkOrderCustodian(data).then(response => {
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('发货成功!')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消发货'
+          });          
       });
     },
-    //合并
-    btn_merge() {},
-    //拆分
-    btn_split() {},
     //选择多个
     handleSelectionChange(val) {
       const ids = []

CallCenterWeb.UI/src/views/customerServiceManagement/consolidateOrderListCustomerService/detail.vue

@@ -0,0 +1,153 @@
+<template>
+  <div class="order_detail">
+    <el-row :gutter="20">
+      <el-col :md="24" class="order_detail_body">
+        <el-card shadow="hover">
+          <el-col :md="21">
+            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />订单编号：{{ detailData.F_Id }}</h1>
+            <p class="title_sub"><span class="green">{{ name }}</span> 	河南足力健老人鞋 {{ createtime }}</p>
+          </el-col>
+          <el-col :md="24" class="order_detail_content">
+            <el-col :md="24" class="order_detail_item">
+              合并订单：{{ detailData.F_OrderList }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              合并类型：{{ detailData.F_Type }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              赠送商品：{{ detailData.F_Gift }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              减免金额：{{ detailData.F_Money }}
+            </el-col>
+            <el-col :md="6" class="order_detail_item">
+              销售备注：{{ detailData.F_Remark }}
+            </el-col>
+            <!-- <el-col :md="8" :offset="16"> -->
+              <!-- <el-button type="primary" size="mini" plain @click="edit()">编辑</el-button> -->
+            <!-- </el-col> -->
+          </el-col>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getConsolidateOrderList } from '@/api/orderManagement/consolidateOrderList'
+
+export default {
+  name: 'Detail',
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      detailData: {
+        F_Id: '',
+        F_OrderList: '', //合并订单
+        F_Type: '', //合并类型
+        F_Gift: '', //赠送商品
+        F_Money: '', //减免金额
+        F_Remark: '', //销售备注
+      },
+    }
+  },
+  computed: {
+  },
+  created() {
+    if (this.rowid) {
+      this.getDetail(this.rowid)
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+    },
+    // 获取订单详情
+    getDetail(orderId) {
+      this.loading = true;
+      return new Promise(resolve => {
+        const params = {
+          F_State: '-2', //订单状态
+          f_id: orderId,
+        };
+        getConsolidateOrderList(params).then(response => {
+          this.loading = false;
+          if (response.state.toLowerCase() === "success") {
+            const res = response.data.Rows[0]
+            this.detailData.F_OrderList = res.F_OrderList //合并订单
+            this.detailData.F_Type = res.F_Type //合并类型
+            this.detailData.F_Gift = res.F_Gift //赠送商品
+            this.detailData.F_Money = res.F_Money //减免金额
+            this.detailData.F_Remark = res.F_Remark //销售备注
+          }
+        });
+        resolve();
+      });
+    },
+    // edit(){
+    //   this.$router.push({path:'/edit',query:{id:this.ordercode}})
+    // }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.order_detail{
+    .el-col{
+			margin-bottom: 20px;
+		}
+		.el-icon-time{
+			color: #d81e06;
+		}
+		.order_detail_body{
+			margin-bottom: 20px;
+			.title{
+				font-size: 20px;
+				.title_icon{
+					color: #d81e06;
+					font-size: 16px;
+					margin-right: 20px;
+				}
+			}
+			.title_sub{
+				font-size: 14px;
+				color: #666666;
+			}
+			.order_detail_content{
+				background-color: #F5F5F6;
+				padding-top: 20px;
+				color: #4c4c4c;
+				font-size: 14px;
+				.order_detail_item{
+					margin-bottom: 10px;
+					.order_content{
+						margin-top: 10px;
+					}
+				}
+			}
+		}
+		.green {
+			color: #00c1de;
+		}
+		.done {
+			color: #198120;
+		}
+		.red {
+			color: #d81e06;
+		}
+		.yellow{
+			color: #e6a23c;
+		}
+		.tab_body{
+			padding: 0 20px 20px 20px;
+		}
+	}
+</style>

CallCenterWeb.UI/src/views/customerServiceManagement/consolidateOrderListCustomerService/index.vue

@@ -0,0 +1,221 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input v-model="searchData.id" placeholder="请输入关联订单号" class="filter-item" />
+      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择合并类型">
+        <el-option v-for="item in mergeType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
+      </el-select>
+      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
+    </div>
+    <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
+      <el-tab-pane label="全部" name="-2"></el-tab-pane>
+      <el-tab-pane label="无效" name="-1"></el-tab-pane>
+      <el-tab-pane label="暂存" name="0"></el-tab-pane>
+      <el-tab-pane label="提交" name="1"></el-tab-pane>
+      <el-tab-pane label="退回" name="2"></el-tab-pane>
+      <el-tab-pane label="通过" name="3"></el-tab-pane>
+    </el-tabs>
+    <el-table v-loading="loading" :data="dataLists" border stripe  @selection-change="handleSelectionChange">
+      <el-table-column type="selection"></el-table-column>
+      <el-table-column type="index" label="编号" align="center" fixed width="80" />
+      <el-table-column prop="F_OrderList" label="合并订单" align="center" />
+      <el-table-column prop="F_Type" label="合并类型" align="center" />
+      <el-table-column prop="F_Gift" label="赠送商品" align="center" />
+      <el-table-column prop="F_AddTime" label="下单日期" align="center" />
+      <el-table-column label="订单状态" align="center" >
+        <template slot-scope="scope">
+          {{ scope.row.F_State | judgmentStateName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="F_AddUserName" 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_detail'" type="text" @click="btn_detail(scope.row.F_Id)">详情</el-button>
+          <el-button v-permission="'HY_audit'" type="text" @click="btn_audit(scope.row.F_Id)">审核</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="pageParams.total > 0"
+      :total="pageParams.total"
+      :pageindex.sync="pageParams.pageindex"
+      :pagesize.sync="pageParams.pagesize"
+      class="pagination"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { getDictionaryValueList } from '@/api/commonAPI'
+import { getConsolidateOrderList, deleteConsolidateOrderList } from "@/api/orderManagement/consolidateOrderList";
+import { getConsolidateOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService";
+import { pickerOptions, formatterContent } from "@/utils";
+import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
+import detail from "./detail"
+
+export default {
+  name: "ConsolidateOrderListCustomerService",
+  components: {
+    Pagination
+  },
+  filters: {
+    judgmentStateName(status) {
+      const statusMap = {
+        '-1': '无效',
+        '0': '暂存',
+        '1': '提交',
+        '2': '退回',
+        '3': '通过',
+        '4': '无货',
+        '5': '已分拣',
+        '6': '已发货'
+      }
+      return statusMap[status]
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      searchData: {
+        adFrom: '', //消息/广告媒体来源
+        type: '', //订单类型
+        id: '', //订单号
+      },
+      activeName: "-2", //标签切换首页
+      pickerOptions, // 日期数据
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      dataLists: [], // 列表数据
+      multipleSelection: [], // 选中的数据
+      selectedId: [], // 选中的数据的id
+      mergeType: [],//合并类型
+    };
+  },
+  created() {
+    this.getOrderType()
+    this.getList()
+    document.onkeyup = e => {
+      if (e.keyCode === 13) {
+        this.getList();
+      }
+    };
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      return new Promise(resolve => {
+        const params = {
+          F_State: this.activeName, //订单状态
+          pageindex: this.pageParams.pageindex, // int 第几页
+          pagesize: this.pageParams.pagesize, // int 每页几条信息
+          F_OrderList: this.searchData.id,
+          F_Type: this.searchData.type
+        };
+        getConsolidateOrderListCustomerService(params).then(response => {
+          this.loading = false;
+          if (response.state.toLowerCase() === "success") {
+            this.pageParams.total = response.data.Totals;
+            this.dataLists = response.data.Rows;
+          }
+        });
+        resolve();
+      });
+    },
+    // 获取合并类型
+    getOrderType() {
+      return new Promise(resolve=>{
+        const params={
+          isleaf:true,
+          code:'MERGETYPE'
+        }
+        getDictionaryValueList(params).then(response=>{
+          if(response.state.toLowerCase() === 'success'){
+            this.mergeType = response.data.Rows
+          }
+        })
+      })
+    },
+    handleTabClick(tab, event) {
+      this.getList()
+    },
+    //添加
+    btn_add () {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': '' }// props
+        },
+        area: ['80%', '90%'],
+        title: '添加'
+      })
+    },
+    //详情
+    btn_detail(detailId) {
+      this.$layer.iframe({
+        content: {
+          content: detail, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: detailId } // props
+        },
+        area: ["80%", "90%"],
+        title: "订单详情"
+      });
+    },
+    //编辑
+    btn_edit(editId) {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: editId } // props
+        },
+        area: ["80%", "90%"],
+        title: "编辑订单"
+      });
+    },
+    btn_delete(id) {
+      this.$confirm('您确定要将此工单删除吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const data = {
+          ids: id
+        }
+        deleteConsolidateOrderList(data).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.getList()
+            this.$message.success('删除成功!')
+          }
+        })
+      }).catch(() => {
+        this.$message.info('已取消删除')
+      })
+    },
+    btn_search() {
+      this.pageParams.pageindex = 1;
+      this.getList();
+    },
+    //选择多个
+    handleSelectionChange(val) {
+      const ids = []
+      this.multipleSelection = val
+      for (let i=0; i<this.multipleSelection.length; i++) {
+        ids.push(this.multipleSelection[i].id)
+      }
+      this.selectedPhone = ids;
+    }, 
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el{
+  cursor: pointer;
+}
+</style>

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

@@ -114,12 +114,17 @@
         </el-col>
         <el-col :span='12'>
           <el-form-item label="运费" prop="F_ExpressFee" >
-            <el-input v-model="ruleForm.F_ExpressFee" placeholder="请输入运费"/>
+            <el-select v-model="ruleForm.F_ExpressFee" placeholder="请选择运费" class="form_select" clearable>
+              <el-option label="10" value="10"></el-option>
+              <el-option label="28" value="28"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="支付方式" >
-            <el-input v-model="ruleForm.F_PayType" placeholder="请输入支付方式"/>
+            <el-select v-model="ruleForm.F_PayType" placeholder="请选择支付方式" class="form_select" clearable>
+              <el-option v-for="item in payTypeList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -133,8 +138,17 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="关联会员ID" >
-            <el-input v-model="ruleForm.F_VipId" placeholder="请输入关联会员ID"/>
+          <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">
+              <el-option v-for="item in recommendListOptions" :key="item.F_ID" :label="item.F_Name" :value="item"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="归属人" prop="F_BelongName" >
+            <el-select v-model="ruleForm.F_BelongName" class="form_select" filterable remote reserve-keyword clearable value-key="F_UserId" placeholder="请输入归属人" :remote-method="remoteMethodBelong" :loading="loading" @change="belongChangeSelect">
+              <el-option v-for="item in belongListOptions" :key="item.F_UserId" :label="item.F_UserName" :value="item"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -208,14 +222,15 @@
 
 <script>
 import { getProviceCity, getDictionaryValueList } from '@/api/commonAPI'
-import { getOrder, editOrderCustomerService, getActivityAccount } from "@/api/orderManagement/orderList";
+import { getOrder, getActivityAccount } from "@/api/orderManagement/orderList";
+import { editOrderCustomerService } from "@/api/customerServiceManagement/orderListCustomerService";
 import { validateTel } from '@/utils/validate'
 import { delFiles, filterContent, pickerOptions } from '@/utils'
 import { getCommodityType } from '@/api/commodityManagement/commodityType'
 import { getCommodityList } from '@/api/commodityManagement/commodityList'
 import { getAreaTreeChildNode } from '@/api/systemSetup/roleSetting/areaManagement'
-
-
+import { getOrderLists } from '@/api/memberManagement/memberList'
+import { getUserAccountLists } from '@/api/systemSetup/roleSetting/userManage'
 
 const validateTelRule = (rule, value, callback) => {
   if (!validateTel(value)) {
@@ -257,6 +272,11 @@ export default {
       townDatas: [], //乡镇/下拉数据
       stockList: [], //出库货仓下拉数据
       expressList: [], //快递
+      payTypeList: [], //支付方式
+      recommendList: [], //会员列表数据
+      recommendListOptions: [], //会员列表数据
+      belongList: [], //归属人列表数据
+      belongListOptions: [], //归属人列表数据
       commodityTypeLists: [], //商品分类下拉数据
       commodityListLists: [], //商品下拉数据
       commoditySearchData: { //商品搜索数据
@@ -291,12 +311,15 @@ export default {
         F_Address: '', //否 string 详细地址
         F_PostalCode: '', //否 string 邮编
         F_Express: '', //否 string 选择的快递
-        F_ExpressFee: '', //否 number 运费
+        F_ExpressFee: '10', //否 number 运费
         F_PayType: '', //否 string  支付方式
         F_Stock: '', //否 string 出货仓库
         F_RealPrice: '', //否 number 实收金额
-        F_VipId: '', //否 number 关联会员id
         F_Score: '', //否 number  使用积分
+        F_RecommendId: '',// 否 number 推荐人id
+        F_RecommendName: '', //否 string 推荐人名称
+        F_Belong: 0, //否 number 归属人id
+        F_BelongName: '', //否 string 归属人名称
       },
       rules: {
         F_Customer: [{
@@ -329,10 +352,13 @@ export default {
     };
   },
   created() {
+    this.getRecommendList()
+    this.getBelongList()
     this.getCommodityTypeSelect()
     this.getStock()
     this.getOrderType()
     this.getExpress()
+    this.getPayType()
     this.getProvince()
     Promise.all([
     ]).then(() => {
@@ -351,7 +377,6 @@ export default {
           this.ruleForm.UseActList = []
           this.ruleForm.F_ExpressFee = this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
           this.ruleForm.F_RealPrice = this.ruleForm.F_RealPrice == '' ? 0 : this.ruleForm.F_RealPrice
-          this.ruleForm.F_VipId = this.ruleForm.F_VipId == '' ? 0 : this.ruleForm.F_VipId
           this.ruleForm.F_Score = this.ruleForm.F_Score == '' ? 0 : this.ruleForm.F_Score
           // 编辑
           editOrderCustomerService(this.ruleForm)
@@ -477,6 +502,20 @@ export default {
         })
       })
     },
+    // 获取支付方式
+    getPayType() {
+      return new Promise(resolve=>{
+        const params={
+          isleaf:true,
+          code:'PayType'
+        }
+        getDictionaryValueList(params).then(response=>{
+          if(response.state.toLowerCase() === 'success'){
+            this.payTypeList = response.data.Rows
+          }
+        })
+      })
+    },
     //获取商品分类
     getCommodityTypeSelect() {
       this.loading = true
@@ -495,6 +534,93 @@ export default {
         resolve()
       })
     },
+    //获取推荐人列表
+    getRecommendList() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: '', // int 第几页
+          pagesize: '', // int 每页几条信息
+          name: '', //客户姓名
+          phone: '', //手机号码
+          type: '', //会员类型
+          province: '', //省份
+          city: '', //市
+          area: '', //县区
+          town: '', //乡镇
+          address: '', //详细地址
+          birthday: '', //会员生日
+          recommender: '', //推荐人
+          saleperson: '', //销售负责人
+          contact: '', //联系频次
+        }
+        getOrderLists(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.recommendList = response.rows.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    //获取推荐人
+    remoteMethodRecommend(query) {
+      if (query !== '') {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          this.recommendListOptions = this.recommendList.filter(item => {
+            return (item.F_Phone).toLowerCase()
+              .indexOf(query.toLowerCase()) > -1;
+          });
+        }, 200);
+      } else {
+        this.recommendListOptions = [];
+      }
+    },
+    recommendChangeSelect(item) {
+      this.ruleForm.F_RecommendId = item.F_ID
+      this.ruleForm.F_RecommendName = item.F_Name
+    },
+    //获取归属人列表
+    getBelongList() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: '', // 第几页
+          pagesize: '', // 每页几条信息
+          keyword: '', // 否	string	模糊查询
+          roleid: '', // 否	string	角色id
+          deptid: '', // array  部门id 
+        }
+        getUserAccountLists(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.belongList = response.data.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    //获取归属人
+    remoteMethodBelong(query) {
+      if (query !== '') {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          this.belongListOptions = this.belongList.filter(item => {
+            return (item.F_UserName).toLowerCase()
+              .indexOf(query.toLowerCase()) > -1;
+          });
+        }, 200);
+      } else {
+        this.belongListOptions = [];
+      }
+    },
+    belongChangeSelect(item) {
+      this.ruleForm.F_Belong = item.F_UserId
+      this.ruleForm.F_BelongName = item.F_UserName
+    },
     //获取商品
     getCommodityListSelect() {
       this.loading = true
@@ -600,8 +726,11 @@ export default {
           this.ruleForm.F_PayType = res.F_PayType //支付方式
           this.ruleForm.F_Stock = res.F_Stock //出货仓库
           this.ruleForm.F_RealPrice = res.F_RealPrice == 0 ? '' : res.F_RealPrice //实收金额
-          this.ruleForm.F_VipId = res.F_VipId == 0 ? '' : res.F_VipId //关联会员id
           this.ruleForm.F_Score = res.F_Score ==0 ? '' : res.F_Score //使用积分
+          this.ruleForm.F_RecommendId = res.F_RecommendId//推荐人id
+          this.ruleForm.F_RecommendName = res.F_RecommendName//推荐人名称
+          this.ruleForm.F_Belong = res.F_Belong //归属人id
+          this.ruleForm.F_BelongName = res.F_BelongName //归属人名称
         }
       });
     },

CallCenterWeb.UI/src/views/orderManagement/orderListCustomerService/goback.vue

@@ -12,7 +12,7 @@
 </template>
 <script>
 
-import { checkOrderCustomerService } from '@/api/orderManagement/orderList'
+import { checkOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
 export default {
     props: {
         rowid: {

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

@@ -25,8 +25,8 @@
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" icon="el-icon-upload2" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import'" type="primary" class="filter-item" icon="el-icon-download" @click="btn_import">导入</el-button>
-      <el-button v-permission="'HY_merge'" type="primary" @click="btn_merge">合并</el-button>
-      <el-button v-permission="'HY_split'" type="primary" @click="btn_split">拆分</el-button>
+      <el-button v-permission="'HY_merge'" type="primary" class="filter-item" @click="btn_merge">合并</el-button>
+      <el-button v-permission="'HY_split'" type="primary" class="filter-item" @click="btn_split">拆分</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
       <el-tab-pane label="全部" name="-2"></el-tab-pane>
@@ -39,13 +39,17 @@
       <el-tab-pane label="已分拣" name="5"></el-tab-pane>
       <el-tab-pane label="已发货" name="6"></el-tab-pane>
     </el-tabs>
-    <el-table v-loading="loading" :data="dataLists" border stripe  @selection-change="handleSelectionChange">
-      <el-table-column type="selection"></el-table-column>
+    <el-table v-loading="loading" :data="dataLists" border stripe  @selection-change="handleSelectionChange" row-key="F_Id">
+      <el-table-column type="selection" :reserve-selection="true"></el-table-column>
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <el-table-column prop="F_Id" label="订单编号" align="center" min-width="150" />
       <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
       <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
-      <el-table-column prop="typename" label="订购商品" align="center" min-width />
+      <el-table-column label="订购商品" align="center" min-width>
+      <template slot-scope="scope">
+        {{ scope.row.OrderDetailList | judgmentOrderGoods}}
+      </template>
+      </el-table-column>
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
       <el-table-column label="订单状态" align="center" >
         <template slot-scope="scope">
@@ -61,6 +65,7 @@
           <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
           <el-button v-permission="'HY_return'" type="text" @click="btn_goback(scope.row.F_Id)">退回</el-button>
           <el-button v-permission="'HY_through'" type="text" @click="btn_through(scope.row.F_Id)">通过</el-button>
+          <el-button v-permission="'HY_label'" type="text" @click="btn_label(scope.row.F_Id)">标签</el-button>
           <!-- <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.F_Id)">详情</el-button> -->
         </template>
       </el-table-column>
@@ -78,11 +83,13 @@
 
 <script>
 import { getDictionaryValueList } from '@/api/commonAPI'
-import { getOrderListCustomerService, cancelOrder } from "@/api/orderManagement/orderList";
+import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService";
 import { pickerOptions, formatterContent } from "@/utils";
 import goback from "./goback";
 import through from "./through";
+import label from "./label";
 import edit from "./edit";
+import merge from './merge';
 // import detail from './detail';
 // import importAuth from './importAuth';
 import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
@@ -106,6 +113,14 @@ export default {
       }
       return statusMap[status]
     },
+    judgmentOrderGoods(status) {
+      let orderGoodsNameQuantity = ''
+      for (let i = 0; i < status.length; i++) {
+        orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
+      }
+      orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
+      return orderGoodsNameQuantity
+    },
   },
   data() {
     return {
@@ -130,6 +145,7 @@ export default {
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
       orderType: [],//订单类型
+      mergeOrderId: [], //合并订单id
     };
   },
   created() {
@@ -250,9 +266,37 @@ export default {
         title: "通过订单"
       });
     },
-
+    //标签订单
+    btn_label(orderid) {
+      this.$layer.iframe({
+        content: {
+          content: label, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: orderid } // props
+        },
+        area: ["30%", "30%"],
+        title: "标签"
+      });
+    },
     //合并
-    btn_merge() {},
+    btn_merge() {
+      if (this.mergeOrderId.length < 2) {
+        this.$message({
+          message: '最少选择两条订单！',
+          type: 'warning'
+        });
+        return
+      }
+      this.$layer.iframe({
+        content: {
+          content: merge, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: this.mergeOrderId } // props
+        },
+        area: ["80%", "90%"],
+        title: "合并订单"
+      });
+    },
     //拆分
     btn_split() {},
     //选择多个
@@ -260,9 +304,9 @@ export default {
       const ids = []
       this.multipleSelection = val
       for (let i=0; i<this.multipleSelection.length; i++) {
-        ids.push(this.multipleSelection[i].id)
+        ids.push(this.multipleSelection[i].F_Id)
       }
-      this.selectedPhone = ids;
+      this.mergeOrderId = ids
     }, 
   }
 };

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerService/label.vue

@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <el-form ref="form" :model="form" label-width="80px">
+      <el-form-item label="订单类型" prop="tags">
+        <el-select v-model="ruleForm.tags" class="form_select" multiple filterable clearable placeholder="请选择订单类型">
+          <el-option v-for="item in orderTag" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+          <el-button type="primary" @click="submitForm()">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+
+import { labelOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
+import { getDictionaryValueList } from '@/api/commonAPI'
+export default {
+    props: {
+      rowid: {
+        type: String,
+        default: ''
+      },
+      layerid: {
+        type: String,
+        default: ""
+      }
+    },
+    data(){
+      return{
+        ruleForm: {
+          orderids: '', //订单编号
+          tags: '', //标签内容
+        },
+        orderTag: [],// 标签
+      }
+    },
+    created() {
+      this.getOrderTag()
+      if (this.rowid) {
+          this.ruleForm.orderids = this.rowid
+      }
+    },
+    methods: {
+      submitForm(){
+        this.ruleForm.tags = this.ruleForm.tags.join(',')
+        labelOrderCustomerService(this.ruleForm).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.$parent.$layer.close(this.layerid);
+            this.$parent.getList(); // 重新加载父级数据
+            this.$message.success('恭喜你，工单信息审核成功!')
+          }
+        }).catch(() => {
+          this.loading = false
+        })
+      },
+      // 获取订单类型
+      getOrderTag() {
+        return new Promise(resolve=>{
+          const params={
+            isleaf:true,
+            code:'OrderTag'
+          }
+          getDictionaryValueList(params).then(response=>{
+            if(response.state.toLowerCase() === 'success'){
+              this.orderTag = response.data.Rows
+            }
+          })
+        })
+      },
+    },
+}
+</script>
+<style lang="scss" scoped>
+.form_select{
+  width: 100%
+}
+</style>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerService/merge.vue

@@ -0,0 +1,142 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
+      <el-form-item label="订单编号" prop="F_OrderList" >
+        <el-input v-model="ruleForm.F_OrderList" placeholder="请输入订单编号" disabled="false" />
+      </el-form-item>
+      <el-form-item label="合并类型" prop="F_Type" >
+        <el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择合并类型">
+          <el-option v-for="item in mergeType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="赠送商品" prop="F_Gift">
+        <el-input v-model="ruleForm.F_Gift" placeholder="请输入赠送商品"/>
+      </el-form-item>
+      <el-form-item label="减免金额" prop="F_Money">
+        <el-input v-model="ruleForm.F_Money" placeholder="请输入减免金额"/>
+      </el-form-item>
+      <el-form-item label="销售备注" prop="F_Remark">
+        <el-input :autosize="{ minRows: 4}" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入销售备注"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm(0)">保存</el-button>
+        <el-button type="primary" @click="submitForm(1)">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getDictionaryValueList } from '@/api/commonAPI'
+import { addConsolidateOrderList } from "@/api/orderManagement/consolidateOrderList";
+
+export default {
+  name: "Merge",
+  props: {
+    rowid: {
+      type: Array,
+      default: []
+    },
+    layerid: {
+      type: String,
+      default: ""
+    }
+  },
+  data() {
+    return {
+      mergeType: [],//订单类型
+      ruleForm: {
+        F_Id: '',
+        F_OrderList: '', //合并订单
+        F_Type: '', //合并类型
+        F_Gift: '', //赠送商品
+        F_Money: '', //减免金额
+        F_Remark: '', //销售备注
+        F_state: '', //订单状态
+      },
+      rules: {
+        order1: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单编号1',
+        }],
+        order2: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单编号2',
+        }],
+        F_Type: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单类型',
+        }],
+        F_Gift: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入赠送商品',
+        }],
+        F_Money: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入减免金额',
+        }],
+      },
+      loading: false
+    };
+  },
+  created() {
+    this.getMergeType()
+    Promise.all([
+    ]).then(() => {
+      if (this.rowid) {
+        this.ruleForm.F_OrderList = this.rowid.join(',').replace(/\s+/g, '')
+      }
+    });
+  },
+  methods: {
+    submitForm(state) {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          this.loading = true;
+          this.ruleForm.F_state = state
+          //添加
+          addConsolidateOrderList(this.ruleForm).then(response => {
+            this.loading = false
+            if (response.state.toLowerCase() === 'success') {
+              this.$parent.$layer.close(this.layerid)
+              this.$parent.getList() // 重新加载父级数据
+              this.$message.success('恭喜你，添加成功!')
+            }
+          }).catch(() => {
+            this.loading = false
+          })
+          return
+        } else {
+          this.$message.error("请输入有效的必填项信息!");
+          return false;
+        }
+      });
+    },
+    // 获取合并类型
+    getMergeType() {
+      return new Promise(resolve=>{
+        const params={
+          isleaf:true,
+          code:'MERGETYPE'
+        }
+        getDictionaryValueList(params).then(response=>{
+          if(response.state.toLowerCase() === 'success'){
+            this.mergeType = response.data.Rows
+          }
+        })
+      })
+    },
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_form .form_select {
+  width: 100%;
+}
+</style>

CallCenterWeb.UI/src/views/orderManagement/orderListCustomerService/through.vue

@@ -1,11 +1,6 @@
 <template>
     <div>
         <el-form ref="form" :model="form" label-width="80px">
-            <!-- <el-form-item label="订单编号">
-                <el-col :span='12'>
-                    <span>{{ ruleForm.orderid }}</span>
-                </el-col>
-            </el-form-item> -->
             <el-form-item label="备注">
                 <el-input v-model="ruleForm.remark" type="textarea" placeholder="备注"></el-input>
             </el-form-item>
@@ -17,7 +12,7 @@
 </template>
 <script>
 
-import { checkOrderCustomerService } from '@/api/orderManagement/orderList'
+import { checkOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
 export default {
     props: {
         rowid: {

CallCenterWeb.UI/src/views/dashboard/components/leftContent.vue

@@ -0,0 +1,269 @@
+<template>
+  <el-card class="content" :style="{height:height}">
+    <div class="remind">
+      <div class="remindHeader topLine">
+        <img src="/static/img/remind.png" alt srcset />
+        <span>重要提醒</span>
+        <span >{{nowDate}}</span>
+      </div>
+      <div class="toadyAd">
+        <div>
+          <span>今日广告量</span>
+          <span class="line"></span>
+          <span>{{advertisement}}</span>
+        </div>
+        <div>
+          <span>营销活动量</span>
+          <span class="line"></span>
+          <span>{{marketing}}</span>
+        </div>
+      </div>
+    </div>
+    <div class="remind">
+      <div class="remindHeader">
+        <img src="/static/img/plan.png" alt srcset />
+        <span>计划相关</span>
+        <router-link class="inlineBlock" to="/notice/manage">查看更多>></router-link>
+      </div>
+      <ul class="plan">
+        <li v-for="(item,index) in planData" :key="index">
+          <el-checkbox :checked="item.value==0?false:true" disabled></el-checkbox>{{item.key}}
+        </li>
+      </ul>
+    </div>
+    <div class="remind">
+      <div class="remindHeader">
+        <img src="/static/img/daiban.png" alt srcset />
+        <span>待办事项</span>
+      </div>
+      <div class="order">
+        <div>订单相关</div>
+        <ul class="clearfix">
+          <li>
+            <router-link to="/notice/manage">待审核订单：{{tobeexamine}}</router-link>
+          </li>
+          <li>待分配物流订单：{{tobedistribution}}</li>
+          <li>待回款订单：{{tobecollected}}</li>
+          <li>待理赔订单：{{pendingclaims}}</li>
+          <li>审核退回订单：{{reviewreturn}}</li>
+          <li>售后订单：{{aftersale}}</li>
+          <li>待退回订单：{{toberefunded}}</li>
+        </ul>
+      </div>
+      <div class="order">
+        <div>客户相关</div>
+        <ul>
+          <li>
+            <router-link to="/notice/manage">待联系客户：{{tobecontacted}}</router-link>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </el-card>
+</template>
+<script>
+import { getRemindData,getTodolistData } from '@/api/dashboard/orderDatas'
+export default {
+  props: {
+    height: {
+      type: String,
+      default: "1000px"
+    },
+    nowDate: {
+      type: String,
+      default: ""
+    },
+  },
+  created() {
+      this.getRemindList();
+      this.getTodokist();
+  },
+  data() {
+    return {
+      marketing:'',//营销活动
+      advertisement:'',//广告量
+      tobeexamine:'',//待审核
+      reviewreturn:'',//审核退回
+      tobedistribution:'',//待分配
+      aftersale:'',//售后
+      tobecollected:'',//待回款
+      toberefunded:'',//待退款
+      pendingclaims:'',//待理赔
+      tobecontacted:'',//待联系客户
+      planData:[
+          {
+              key:'备选项1',
+              value:0
+          },
+          {
+              key:'备选项2',
+              value:1
+          },
+          {
+              key:'备选项2',
+              value:1
+          },
+          {
+              key:'备选项2',
+              value:1
+          },
+          {
+              key:'备选项2',
+              value:1
+          },
+          {
+              key:'备选项2',
+              value:1
+          },
+          {
+              key:'备选项2',
+              value:1
+          },
+      ],//计划相关数据
+    };
+  },
+  methods: {
+      getRemindList(){
+          return new Promise(resolve=>{
+              const params={
+                  time:this.nowDate
+              }
+              getRemindData(params).then(response=>{
+                  if(response.state=='success'){
+                      this.advertisement=response.advertisement
+                      this.marketing=response.marketing
+                  }
+              }).catch(resolve=>{
+                  console.log(resolve)
+              })
+          })
+      },
+      //获取待办事项数据
+      getTodokist(){
+          return new Promise(resolve=>{
+              const params={
+                  time:this.nowDate
+              }
+              getTodolistData(params).then(response=>{
+                  if(response.state=='success'){
+                      this.tobeexamine=response.tobeexamine;//待审核
+                      this.reviewreturn=response.reviewreturn;//审核退回
+                      this.tobedistribution=response.tobedistribution;//待分配
+                      this.aftersale=response.aftersale;//售后
+                      this.tobecollected=response.tobecollected;//待回款
+                      this.toberefunded=response.toberefunded;//待退款
+                      this.pendingclaims=response.pendingclaims;//待理赔
+                      this.tobecontacted=response.tobecontacted;//待联系客户
+                  }
+              })
+          })
+      },
+  },
+};
+</script>
+<style lang="scss" scoped>
+ul {
+  li {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+  }
+}
+.clearfix:after {
+  /*伪元素是行内元素 正常浏览器清除浮动方法*/
+  content: "";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+.clearfix {
+  *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
+}
+.content {
+  margin-left: 12px;
+  padding: 0 28px;
+  .remind {
+    padding-bottom: 22px;
+    .remindHeader {
+      height: 60px;
+      line-height: 60px;
+      border-bottom: 1px solid #ccc;
+      border-top: 1px solid #ccc;
+      img {
+        vertical-align: middle;
+      }
+      span:nth-child(3){
+          font-size: 15px;
+          color: #939393;
+          float: right;
+      }
+      .inlineBlock {
+        float: right;
+        font-size: 12px;
+        color: #4cb9ff;
+      }
+    }
+    .plan{
+        height: 200px;
+        overflow: hidden;
+    }
+    .topLine {
+      border-top: none;
+    }
+    ul {
+      padding: 0;
+      li {
+        width: 100%;
+        height: 40px;
+        line-height: 40px;
+        margin: 10px 0;
+        background-color: #ebebeb;
+        .el-checkbox {
+          padding: 0 5px;
+        }
+      }
+    }
+    .order {
+      margin-top: 24px;
+      div {
+        font-size: 18px;
+        color: #000a12;
+        font-weight: 700;
+      }
+      ul {
+        padding: 0;
+        li {
+          float: left;
+          width: 50%;
+          background-color: #fff;
+          font-size: 14px;
+          color: #4e8bc6;
+        }
+      }
+    }
+  }
+  .toadyAd {
+    width: 100%;
+    div {
+      width: 100%;
+      height: 36px;
+      border: 1px solid #ccc;
+      margin-top: 16px;
+      font-size: 20px;
+      color: #858585;
+      border-radius: 7px;
+      line-height: 36px;
+      padding-left: 17px;
+      .line {
+        border-top-right-radius: 7px;
+        border-bottom-right-radius: 7px;
+        display: inline-block;
+        width: 40%;
+        height: 12px;
+        background-image: linear-gradient(to right, #5a8bf6, #4cb9ff);
+      }
+    }
+  }
+}
+</style>

CallCenterWeb.UI/src/views/dashboard/components/mediaData.vue

@@ -0,0 +1,103 @@
+<template>
+  <el-card class="header" :style="{height:height}">
+    <div class="remindHeader topLine">
+      <img src="/static/img/media.png" alt srcset />
+      <span>媒体进线量排名</span>
+    </div>
+    <!-- 折线图 -->
+    <div ref="pieChart" class="chart" :style="{height:'310px'}" />
+  </el-card>
+</template>
+<script>
+import echarts from "echarts";
+export default {
+  props: {
+    height: {
+      type: String,
+      default: "350px"
+    }
+  },
+  data() {
+    return {
+      option: {
+        title: {
+          text: ""
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+            label: {
+              backgroundColor: "#6a7985"
+            }
+          }
+        },
+        legend: {
+          data: [
+            "进线量接通量",
+            "进线未接通量"
+          ]
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true
+        },
+        xAxis: [
+          {
+            type: "category",
+            boundaryGap: false,
+            data: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"]
+          }
+        ],
+        yAxis: [
+          {
+            type: "value"
+          }
+        ],
+        series: [
+          {
+            name: "进线量接通量",
+            type: "line",
+            stack: "总量",
+            areaStyle: {},
+            data: [120, 132, 101, 134, 460, 230, 210]
+          },
+          {
+            name: "进线未接通量",
+            type: "line",
+            stack: "总量",
+            areaStyle: {},
+            data: [220, 182, 191, 234, 290, 330, 310]
+          },
+        ]
+      }
+    };
+  },
+  mounted() {
+    this.initChart();
+  },
+  methods: {
+    // 初始化数据
+    initChart() {
+      this.chart = echarts.init(this.$refs.pieChart, "macarons");
+      this.chart.clear();
+      this.chart.setOption(this.option);
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.header {
+  margin-top: 20px;
+  span {
+    font-size: 16px;
+    font-weight: 700;
+  }
+  img {
+    vertical-align: middle;
+    margin-right: 7px;
+  }
+}
+</style>

CallCenterWeb.UI/src/views/dashboard/components/personalRanking.vue

@@ -0,0 +1,116 @@
+<template>
+     <el-card  :style="{height:height}" shadow="hover" class="header">
+         <div class="remindHeader topLine">
+            <img src="/static/img/ranking.png" alt="" srcset="">
+            <span>个人排行榜</span>
+        </div>
+        <span>
+          <el-select v-model="typeValue" placeholder="请选择" @change="hadleType">
+                <el-option
+                v-for="item in typeData"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                </el-option>
+            </el-select>
+      </span>
+         <el-button type="text" class="btn_more" @click="btn_more">查看更多</el-button>
+    <el-tabs>
+          <el-table  :data="personalData" stripe style="width: 100%">
+            <el-table-column width="80" align="center" label="编号">
+              <template slot-scope="scope">
+                <span  class="sort">{{ scope.row.Serialnumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="名字" align="left" width="">
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单量" align="left" width="">
+              <template slot-scope="scope">
+                <span>{{ scope.row.Orderquantity }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售额" align="left">
+              <template slot-scope="scope">
+                <span>{{ scope.row.Totalsales }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+    </el-tabs>
+  </el-card>
+</template>
+<script>
+import router from '@/router'
+import { getRankingData } from '@/api/dashboard/orderDatas'
+export default {
+    props: {
+        height: {
+        type: String,
+        default: "350px"
+        }
+    },
+    data() {
+        return {
+            personalData: [],
+            typeValue:0,
+            typeData:[
+            {
+            value:0,
+            label:'本月'
+        },{
+            value:1,
+            label:'本日'
+        },
+        ],
+        }
+    },
+    created() {
+      this.getPersonalList()
+    },
+    methods: {
+         btn_more() {
+            router.push({ name: 'callRecord' })
+        },
+        getPersonalList(){
+          return new Promise(resolve=>{
+            const params={
+              type:this.typeValue,
+            }
+            getRankingData(params).then(response=>{
+              if(response.state='success'){
+                this.personalData=response.personalrankings
+              }
+            })
+          })
+        },
+        //选择
+    hadleType(val){
+        this.typeValue=val;
+        this.getPersonalList()
+    },
+    },
+}
+</script>
+<style lang="scss" scoped>
+.header{
+    margin: 20px 0 0 10px;
+    position: relative;
+    img{
+        vertical-align: middle;
+    }
+    .el-select{
+        width: 90px;
+        height: 33px;
+        position: absolute;
+        top: 20px;
+        right: 70px;
+    }
+}
+.btn_more {
+    position: absolute;
+    top: 20px;
+    right: 10px;
+}
+</style>

CallCenterWeb.UI/src/views/dashboard/components/salesData.vue

@@ -0,0 +1,113 @@
+<template>
+  <el-card shadow="always" :style="{height:height}">
+    <div class='header'>
+      <img src="/static/img/sales.png" alt srcset />
+      <span class="header1">实时销售行为分析</span>
+      <span class="header2">更新时间：{{nowDate}}</span>
+    </div>
+    <div>
+      <ul style="width:20%;">
+        <li class="top" style="border-top-left-radius: 10px;border-bottom-left-radius: 10px;">新增客户</li>
+        <li>{{newcustomer}}</li>
+        <li>昨日：{{oldcustomer}}</li>
+      </ul>
+      <ul style="width:20%;">
+        <li class="top">新增订单量</li>
+        <li>0</li>
+        <li>昨日：</li>
+      </ul>
+      <ul style="width:20%;">
+        <li class="top">售后订单量</li>
+        <li>{{newaftersale}}</li>
+        <li>昨日：{{oldaftersale}}</li>
+      </ul>
+      <ul style="width:20%;">
+        <li class="top">新客户下单量</li>
+        <li>{{newcustomers}}</li>
+        <li>昨日：{{oldcustomers}}</li>
+      </ul>
+      <ul style="width:20%;">
+        <li class="top" style="border-top-right-radius: 10px;border-bottom-right-radius: 10px;">老客户下单量</li>
+        <li>{{newcustomerorder}}</li>
+        <li>昨日：{{oldcustomerorder}}</li>
+      </ul>
+    </div>
+  </el-card>
+</template>
+<script>
+import { getSalesData } from '@/api/dashboard/orderDatas'
+export default {
+    props: {
+        height: {
+        type: String,
+        default: ''
+        },
+        nowDate: {
+        type: String,
+        default: ''
+        },
+    },
+  data() {
+    return {
+        newcustomer:'',
+        oldcustomer:'',
+        newaftersale:'',
+        oldaftersale:'',
+        newcustomers:'',
+        oldcustomers:'',
+        newcustomerorder:'',
+        oldcustomerorder:'',
+    };
+  },
+  created() {
+      this.getDataList()
+  },
+  methods: {
+      getDataList(){
+          return new Promise(resolve=>{
+              const params={
+                  time:this.nowDate
+              }
+              getSalesData(params).then(response=>{
+                if(response.state=='success'){
+                    this.newcustomer=response.newcustomer;//新增客户
+                    this.oldcustomer=response.oldcustomer;//昨日新增客户
+                    this.newaftersale=response.newaftersale;//售后订单量
+                    this.oldaftersale=response.oldaftersale;//昨日订单量
+                    this.newcustomers=response.newcustomers;//新客户下单量
+                    this.oldcustomers=response.oldcustomers;//昨日新客户下单量
+                    this.newcustomerorder=response.newcustomerorder;//老客户下单量
+                    this.oldcustomerorder=response.oldcustomerorder;//昨日老客户下单量
+                }
+            })
+          })
+      }
+  },
+};
+</script>
+<style lang="scss" scoped>
+ul{
+    float: left;
+    padding: 0px;
+  li{
+    padding: 0;
+    margin: 0;
+    list-style: none;
+    padding: 4px 0px;
+    text-align: center;
+  }
+}
+.header{
+    .header1{
+            font-size: 17px;
+            color: #666666;
+        }
+    .header2{
+            font-size: 15px;
+            color: #939393;
+        }
+}
+.top{
+    background-color: #e4effb;
+}
+</style>

CallCenterWeb.UI/src/views/dashboard/components/totalTasks.vue

@@ -0,0 +1,186 @@
+<template>
+  <el-card class="header" :style="{height:height}">
+    <el-col :lg="12">
+      <el-col :lg='6'>
+        <img src="/static/img/taskLogo.png" alt srcset />
+      </el-col>
+      <el-col :lg='18'>
+        <span class="taskNum">
+        <div class="mouthTask">当月任务总量</div>
+        <div>
+          <div>{{tasktotal}}</div>
+        </div>
+        <div>已完成：{{taskcurrent}}</div>
+      </span>
+      </el-col>
+    </el-col>
+    <el-col :lg="12">
+      <!-- 环形图 -->
+      <div  ref="pieChart" class="chart"  :style="{height:height}"/>
+    </el-col>
+  </el-card>
+</template>
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+import { getTaskList } from '@/api/dashboard/orderDatas'
+export default {
+  props: {
+    height: {
+      type: String,
+      default: "150px"
+    },
+    nowDate: {
+      type: String,
+      default: ""
+    },
+  },
+  data() {
+    return {
+      taskcurrent:'',//当前任务量
+      tasktotal:'',//任务总量
+      loading: false,
+      chart: null,
+      search_date: "1",
+      option: {
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          left: 'center',
+          bottom: '0',
+          data: [] // 图例数据
+        },
+         textStyle: {　　　　　　　　　
+            fontSize: 14,
+            fontFamily: "Microsoft YaHei",
+
+        },
+        graphic:{       //图形中间文字
+            type:"text",
+            left:"center",
+            top:"center",
+            style:{
+                text:"66",
+                textAlign:"center",
+                fill:"#fff",
+                fontSize:12,
+                color: "#4d4f5c",
+                fontFamily: "Microsoft YaHei"
+            }
+        },
+        calculable: true,
+        series: [{
+          name: '',
+          type: 'pie',
+          radius: [30, 50],
+          center: ['50%', '45%'],
+          labelLine: {
+                show: false
+          },
+          label: {
+                show: false,
+                position: 'center'
+          },
+          data: [
+            {
+              value: 0,
+              name: '已完成'
+            },
+            {
+              value: 0,
+              name: '剩余'
+            },
+          ], // 数据
+          animationEasing: 'cubicInOut',
+          animationDuration: 2600
+        }]
+      }
+    };
+  },
+  created() {
+      this.getTaskData()
+  },
+  mounted() {
+    this.initChart();
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize();
+      }
+    }, 100);
+    window.addEventListener("resize", this.__resizeHandler);
+  },
+  methods: {
+      getTaskData(){
+          this.loading = true
+          return new Promise(resolve=>{
+              const params={
+                  time:this.nowDate
+              }
+               getTaskList(params).then(response=>{
+                if(response.state=='success'){
+                  this.taskcurrent=response.taskcurrent;
+                  this.tasktotal=response.tasktotal;
+                    const sData = []
+                    sData.push({
+                        value:response.taskcurrent,
+                        name:'已完成'
+                    },{
+                        value:response.tasktotal-response.taskcurrent,
+                        name:'剩余'
+                    })
+                    this.option.series[0].data = sData
+                    this.initChart()
+                }
+            })
+          })
+      },
+      // 初始化数据
+    initChart() {
+      this.chart = echarts.init(this.$refs.pieChart, 'macarons')
+      this.chart.clear()
+      this.chart.setOption(this.option)
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.header {
+  margin-left: 10px;
+  img {
+    // float: left;
+    padding-right: 12px;
+    padding-top: 3px;
+  }
+  .taskNum {
+    float: left;
+    div {
+      margin: 8px 0;
+      div {
+        height: 52px;
+        width: 114px;
+        background-color: #468cde;
+        line-height: 52px;
+        text-align: center;
+        border-radius: 10px;
+        color: #fff;
+        font-size: 30px;
+      }
+    }
+  }
+  .mouthTask {
+    font-size: 17px;
+    color: #666666;
+  }
+  .taskNum :nth-child(2) {
+    font-size: 20px;
+    color: #fff;
+  }
+  .taskNum :nth-child(3) {
+    font-size: 15px;
+    color: #939393;
+  }
+}
+</style>

CallCenterWeb.UI/src/views/dashboard/components/traffic.vue

@@ -0,0 +1,115 @@
+<template>
+  <el-card class="header" :style="{height:height}">
+    <div class="remindHeader topLine">
+      <img src="/static/img/zhibiao.png" alt srcset />
+      <span>话务指标</span>
+      <span>
+        <el-select v-model="typeValue" placeholder="请选择" @change="hadleType">
+          <el-option
+            v-for="item in typeData"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </span>
+    </div>
+    <!-- 柱状图 -->
+    <div ref="pieChart" class="chart" :style="{height:'400px'}" />
+  </el-card>
+</template>
+<script>
+import echarts from "echarts";
+export default {
+  props: {
+    height: {
+      type: String,
+      default: "470px"
+    }
+  },
+  data() {
+    return {
+      typeData: [
+        {
+          value: 0,
+          label: "本月"
+        },
+        {
+          value: 1,
+          label: "本日"
+        }
+      ],
+      typeValue: 0,
+      option :{
+    tooltip: {
+        trigger: 'axis',
+        axisPointer: {            // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
+        }
+    },
+    legend: {
+        data: []
+    },
+    grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
+    },
+    xAxis: [
+        {
+            type: 'category',
+            data: ['进线暂存量', '新客户进线量', '老客户进线量', '回访量', '短信进线量']
+        }
+    ],
+    yAxis: [
+        {
+            type: 'value'
+        }
+    ],
+    series: [
+        {
+            name: '数量',
+            type: 'bar',
+            barWidth: 30,
+            data: [620, 732, 701, 734, 1090]
+        },
+    ]
+}
+    };
+  },
+  mounted() {
+      this.initChart()
+  },
+  methods: {
+    //选择
+    hadleType(val) {
+      this.typeValue = val;
+    },
+    // 初始化数据
+    initChart() {
+      this.chart = echarts.init(this.$refs.pieChart, "macarons");
+      this.chart.clear();
+      this.chart.setOption(this.option);
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.header {
+  margin: 20px 0 0 20px;
+  span {
+    font-size: 16px;
+    font-weight: 700;
+    .el-select {
+      width: 90px;
+      height: 33px;
+      float: right;
+    }
+  }
+  img {
+    vertical-align: middle;
+    margin-right: 7px;
+  }
+}
+</style>

CallCenterWeb.UI/src/views/dashboard/components/workCenter.vue

@@ -0,0 +1,149 @@
+<template>
+  <el-card class="header" :style="{height:height}">
+    <div class="remindHeader topLine">
+      <img src="/static/img/workCenter.png" alt srcset />
+      <span>中心工作排行</span>
+      <span>
+        <el-select v-model="typeValue" placeholder="请选择" @change="hadleType">
+          <el-option
+            v-for="item in typeData"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </span>
+    </div>
+    <div ref="pieChart" class="chart" :style="{height:height}" />
+  </el-card>
+</template>
+<script>
+import echarts from "echarts";
+require("echarts/theme/macarons"); // echarts theme
+import { debounce } from "@/utils";
+import { getRankingData } from "@/api/dashboard/orderDatas";
+export default {
+  props: {
+    height: {
+      type: String,
+      default: "470px"
+    }
+  },
+  data() {
+    return {
+      typeData: [
+        {
+          value: 0,
+          label: "本月"
+        },
+        {
+          value: 1,
+          label: "本日"
+        }
+      ],
+      typeValue: 0,
+      loading: false,
+      chart: null,
+      search_date: "1",
+      option: {
+        tooltip: {
+          trigger: "item",
+          formatter: "{a} <br/>{b} : {c} ({d}%)"
+        },
+        legend: {
+          orient: "vertical",
+          left: "left",
+          bottom: "0",
+          data: [] // 图例数据
+        },
+        calculable: true,
+        series: [
+          {
+            name: "",
+            type: "pie",
+            radius: "55%",
+            center: ["50%", "45%"],
+            data: [
+              {
+                value: 0,
+                name: "无数据"
+              }
+            ], // 数据
+            animationEasing: "cubicInOut",
+            animationDuration: 2600
+          }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getDatas();
+  },
+  mounted() {
+    this.initChart();
+    this.__resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize();
+      }
+    }, 100);
+    window.addEventListener("resize", this.__resizeHandler);
+  },
+  methods: {
+    //获取数据
+    getDatas() {
+      return new Promise(resolve => {
+        const params = {
+          type: this.typeValue
+        };
+        getRankingData(params).then(response => {
+          if (response.state.toLowerCase() === "success") {
+            const res = response.totask;
+            if (res && res.length > 0) {
+              const sData = [];
+              res.forEach((v, i) => {
+                sData.push({
+                  value: v.F_RealPrice,
+                  name: v.key
+                });
+              });
+              this.option.series[0].data = sData;
+
+              this.initChart();
+            }
+          }
+        });
+        resolve();
+      });
+    },
+    // 初始化数据
+    initChart() {
+      this.chart = echarts.init(this.$refs.pieChart, "macarons");
+      this.chart.clear();
+      this.chart.setOption(this.option);
+    },
+    //选择
+    hadleType(val) {
+      this.typeValue = val;
+      this.getDatas();
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.header {
+  margin-top: 20px;
+  span {
+    font-size: 16px;
+    font-weight: 700;
+    .el-select {
+      width: 90px;
+      height: 33px;
+      float: right;
+    }
+  }
+  img {
+    vertical-align: middle;
+    margin-right: 7px;
+  }
+}
+</style>

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

@@ -2,6 +2,31 @@
   <!-- 首页 -->
   <div class="dashboard">
     <el-row :gutter="7.5">
+      <el-col :lg="18">
+        <el-col :lg="16" class="mb">
+          <el-col :lg="24">
+            <salesData ref='salesData' :height="height1" :nowDate="nowDate"/>
+          </el-col>
+        </el-col>
+        <el-col :lg="8" class="mb">
+          <totalTasks ref="totalTasks" :height="height1" :nowDate="nowDate"/>
+        </el-col>
+        <el-col :lg="16" class="mb">
+          <mediaData ref="mediaData" :height='height3' />
+        </el-col>
+        <el-col :lg="8" class="mb">
+          <personalRanking ref="personalRanking" :height="height3" />
+        </el-col>
+        <el-col :lg="8" class="mb">
+          <workCenter ref="workCenter" :height='height4' />
+        </el-col>
+        <el-col :lg="16" class="mb">
+          <traffic ref="traffic" :height="height4" />
+        </el-col>
+      </el-col>
+      <el-col :lg="6" class="mb" >
+        <leftContent ref="leftContent" :height="height2" :nowDate="nowDate"/>
+      </el-col>
       <el-col :lg="18" class="mb">
         <!-- 数据统计 -->
         <el-col :lg="24" class="mb">
@@ -54,9 +79,24 @@ import allNotice from './components/allNotice'
 import ranking from './components/ranking'
 import appAds from './components/appAds'
 
+import salesData from './components/salesData'
+import totalTasks from './components/totalTasks'
+import leftContent from './components/leftContent'
+import mediaData from './components/mediaData'
+import personalRanking from './components/personalRanking'
+import workCenter from './components/workCenter'
+import traffic from './components/traffic'
+
 export default {
   name: 'Dashboard',
   components: {
+    salesData,
+    totalTasks,
+    leftContent,
+    personalRanking,
+    workCenter,
+    traffic,
+    mediaData,
     dataStatistics,
     pieChart,
     circularChart,
@@ -68,11 +108,14 @@ export default {
   },
   data() {
     return {
-      height1: '170px',
-      height2: '300px',
+      height1:'150px',
+      height2: '1000px',
       height3: '350px',
+      height4: '470px',
       homeTimer: null, // 定时器
-      isStartTimer: false // 定会器是否开启
+      isStartTimer: false, // 定会器是否开启
+      nowDate: "",    // 当前日期
+      nowTime: "",    // 当前时间
     }
   },
   computed: {
@@ -82,69 +125,55 @@ export default {
     // this.refreshDatas(process.env.homeRefreshInterval) // 刷新 首页数据
     // this.refreshDatas(Number(this.$store.getters.serverConfig.homeRefreshInterval)) // 刷新 首页数据
     this.isStartTimer = true
+    this.getDate()
   },
   beforeDestroy() {
     clearInterval(this.homeTimer) // 停止刷新数据
     this.isStartTimer = false
+     if (this.getDate) {
+          console.log("销毁定时器")
+          clearInterval(this.getDate); // 在Vue实例销毁前，清除时间定时器
+      }
   },
   methods: {
-    /**
-     * 刷新 数据
-     * @mTime 刷新间隔
-     * */
-    refreshDatas(mTime) {
-      const _self = this
-      const objTime = {
-        init: 0,
-        time: function() {
-          objTime.init += 1000
-          // 当页面没有click、keydown、mousewheel 时；每间隔  mTime 刷新数据；
-          if (objTime.init === mTime) {
-            // console.count();
-            _self.$refs.dataStatic.getDatas()
-            _self.$refs.pieChart.getDatas(
-              Number(_self.$refs.pieChart.search_date)
-            )
-            _self.$refs.circularChart.getDatas(
-              Number(_self.$refs.circularChart.search_date)
-            )
-            _self.$refs.lineChart.getDatas(
-              Number(_self.$refs.lineChart.search_date)
-            )
-            _self.$refs.ranking.refreshData(_self.$refs.ranking.activeName)
-
-            objTime.init = 0
-          }
+    currentTime() {
+            setInterval(this.getDate, 600000);
         },
-        eventFun: function() {
-          clearInterval(_self.homeTimer)
-          objTime.init = 0
-          if (_self.isStartTimer) {
-            _self.homeTimer = setInterval(objTime.time, 1000)
-          }
+        getDate: function() {
+            var _this = this;
+            let yy = new Date().getFullYear();
+            let mm = new Date().getMonth() + 1;
+            let dd = new Date().getDate();
+            let hh = new Date().getHours();
+            let mf =
+                new Date().getMinutes() < 10
+                    ? "0" + new Date().getMinutes()
+                    : new Date().getMinutes();
+            let ss =
+                new Date().getSeconds() < 10
+                    ? "0" + new Date().getSeconds()
+                    : new Date().getSeconds();
+            mm = mm < 10 ? "0" + mm : mm;
+            dd = dd < 10 ? "0" + dd : dd;
+            hh = hh < 10 ? "0" + hh : hh;
+            _this.nowTime = hh + ":" + mf+':'+ss;
+            _this.nowDate = yy + "-" + mm + "-" + dd;
         }
-      }
-      this.homeTimer = setInterval(objTime.time, 1000)
-      const body = document.querySelector('html')
-      body.addEventListener('click', objTime.eventFun)
-      body.addEventListener('keydown', objTime.eventFun)
-      body.addEventListener('mousewheel', objTime.eventFun)
-    
-    
-    }
-  
-  }
+  },
+  mounted() {
+     this.currentTime();
+  },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dashboard {
   padding: 15px 10px;
+  background-color: #eaedf1;
   .mb {
     margin-bottom: 6px;
   }
 }
-
 @media only screen and (min-width: 992px) {
 }
 </style>

CallCenterWeb.UI/src/views/memberManagement/memberList/index.vue

@@ -150,14 +150,16 @@ export default {
 					'&phone=' + this.searchDatas.phoneNumber + //手机号码
 					// '&stime=' + this.searchDatas.searchDate && this.searchDatas.searchDate[0] +
 					// '&etime=' + this.searchDatas.searchDate && this.searchDatas.searchDate[1] +
-					// '&province=' + this.searchDatas.provinceCity && this.searchDatas.provinceCity[0] +
-					// '&city=' + this.searchDatas.provinceCity && this.searchDatas.provinceCity[1] +
+					'&province=' + this.searchDatas.provinceCityText && this.searchDatas.provinceCityText[0] +
+					'&city=' + this.searchDatas.provinceCityText[1] && this.searchDatas.provinceCityText[1] +
+					'&area=' + this.searchDatas.provinceCityText[2] && this.searchDatas.provinceCityText[2] +
+					'&town=' + this.searchDatas.provinceCityText[3] && this.searchDatas.provinceCityText[3] +
 					'&type=' + this.searchDatas.memberType + //会员类型
 					'&address=' + this.searchDatas.address + //地址
 					'&recommender=' + this.searchDatas.referrer + //推荐人
 					'&saleperson=' + this.searchDatas.saleperson + //销售负责人
 					'&contact=' + this.searchDatas.contactFrequency + //联系频次
-					// '&token=' + this.token + //联系频次
+					// '&token=' + this.token + 
 					'&birthday=' + this.searchDatas.birthday
     },
     btn_detail(editId) {

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

@@ -115,6 +115,7 @@ export default {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
           F_OrderList: this.searchData.id,
+          F_Type: this.searchData.type
         };
         getConsolidateOrderList(params).then(response => {
           this.loading = false;

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

@@ -122,25 +122,25 @@
               <el-col :span='12'>
                 <el-form-item label="快递" prop="F_Express" >
                   <el-select v-model="ruleForm.F_Express" placeholder="请选择快递" class="form_select" clearable>
-                    <el-option
-                      v-for="item in expressList"
-                      :key="item.F_Value"
-                      :label="item.F_Value"
-                      :value="item.F_Value">
-                    </el-option>
+                    <el-option v-for="item in expressList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span='12'>
                 <el-form-item label="运费" prop="F_ExpressFee" >
-                  <el-input v-model="ruleForm.F_ExpressFee" placeholder="请输入运费"/>
+                  <el-select v-model="ruleForm.F_ExpressFee" placeholder="请选择运费" class="form_select" clearable>
+                    <el-option label="10" value="10"></el-option>
+                    <el-option label="28" value="28"></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span='12'>
                 <el-form-item label="支付方式" prop="F_PayType" >
-                  <el-input v-model="ruleForm.F_PayType" placeholder="请输入支付方式"/>
+                  <el-select v-model="ruleForm.F_PayType" placeholder="请选择支付方式" class="form_select" clearable>
+                    <el-option v-for="item in payTypeList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span='12'>
@@ -156,14 +156,25 @@
                 </el-form-item>
               </el-col>
               <el-col :span='12'>
-                <el-form-item label="关联会员ID" prop="F_VipId" >
-                  <el-input v-model="ruleForm.F_VipId" placeholder="请输入关联会员ID"/>
+                <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">
+                    <el-option v-for="item in recommendListOptions" :key="item.F_ID" :label="item.F_Name" :value="item"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span='12'>
+                <el-form-item label="归属人" prop="F_BelongName" >
+                  <el-select v-model="ruleForm.F_BelongName" class="form_select" filterable remote reserve-keyword clearable value-key="F_UserId" placeholder="请输入归属人" :remote-method="remoteMethodBelong" :loading="loading" @change="belongChangeSelect">
+                    <el-option v-for="item in belongListOptions" :key="item.F_UserId" :label="item.F_UserName" :value="item"></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span='8'>
-                <el-form-item label="商品分类" prop="className" >
+                <el-form-item label="商品分类" prop="className">
                   <el-cascader
                     v-model="parentids"
                     :options="commodityTypeLists"
@@ -204,9 +215,9 @@
               <el-col :span='24'>
                 <el-form-item label="商品">
                   <el-table :data="commodityTableData" stripe style="width: 100%">
-                    <el-table-column prop="F_ProductName" label="商品名称" width="180"></el-table-column>
-                    <el-table-column prop="F_Count" label="商品数量" width="180"></el-table-column>
-                    <el-table-column label="操作">
+                    <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
+                    <el-table-column prop="F_Count" label="商品数量" align="center" ></el-table-column>
+                    <el-table-column label="操作" align="center">
                       <template slot-scope="scope">
                         <el-button type="text" @click="btn_deleteCommodity(scope.row)">删除</el-button>
                       </template>
@@ -222,13 +233,13 @@
                 <el-form-item label="优惠">
                   <el-table :data="activityAccountData" stripe style="width: 100%" @selection-change="activityAccountSelectionChange">
                     <el-table-column type="selection" width="55"></el-table-column>
-                    <el-table-column label="活动类型" width="180">
+                    <el-table-column label="活动类型" align="center">
                       <template slot-scope="scope">
                         {{ scope.row.type | activityAccountTypeFilter }}
                       </template>
                     </el-table-column>
-                    <el-table-column prop="money" label="优惠金额" width="180"></el-table-column>
-                    <el-table-column prop="gift" label="赠品"></el-table-column>
+                    <el-table-column prop="money" label="优惠金额" align="center"></el-table-column>
+                    <el-table-column prop="gift" label="赠品" align="center"></el-table-column>
                   </el-table>
                 </el-form-item>
               </el-col>
@@ -256,7 +267,8 @@ import { delFiles, filterContent, pickerOptions } from '@/utils'
 import { getCommodityType } from '@/api/commodityManagement/commodityType'
 import { getCommodityList } from '@/api/commodityManagement/commodityList'
 import { getAreaTreeChildNode } from '@/api/systemSetup/roleSetting/areaManagement'
-
+import { getOrderLists } from '@/api/memberManagement/memberList'
+import { getUserAccountLists } from '@/api/systemSetup/roleSetting/userManage'
 
 const validateTelRule = (rule, value, callback) => {
   if (!validateTel(value)) {
@@ -281,12 +293,18 @@ export default {
   },
   data() {
     return {
+      parentids: [], 
       provinceDatas: [], // 省下拉数据
       cityDatas: [], //市下拉数据
       areaDatas: [], //区/县下拉数据
       townDatas: [], //乡镇/下拉数据
       stockList: [], //出库货仓下拉数据
       expressList: [], //快递
+      payTypeList: [], //支付方式
+      recommendList: [], //会员列表数据
+      recommendListOptions: [], //会员列表数据
+      belongList: [], //归属人列表数据
+      belongListOptions: [], //归属人列表数据
       commodityTypeLists: [], //商品分类下拉数据
       // 自定义菜单下拉数据的key值
       typeDropProps: {
@@ -311,8 +329,8 @@ export default {
         F_ADFrom: '', //是 string 消息来源
         F_Type: '', //是 sring  订单类型
         F_Id: '', //是 string 订单号
-        OrderDetailList: '', //订单详情list
-        UseActList: '', //活动详情list
+        OrderDetailList: [], //订单详情list
+        UseActList: [], //活动详情list
         F_State: '', //是 string 订单状态
         F_TrackingNo: '', //否 string 快递单号
         F_Addressee: '', //否 string 收件人
@@ -325,12 +343,15 @@ export default {
         F_Address: '', //否 string 详细地址
         F_PostalCode: '', //否 string 邮编
         F_Express: '', //否 string 选择的快递
-        F_ExpressFee: '', //否 number 运费
+        F_ExpressFee: '10', //否 number 运费
         F_PayType: '', //否 string  支付方式
         F_Stock: '', //否 string 出货仓库
         F_RealPrice: '', //否 number 实收金额
-        F_VipId: '', //否 number 关联会员id
         F_Score: '', //否 number  使用积分
+        F_RecommendId: 0, //否 number 推荐人id
+        F_RecommendName: '', //否 string 推荐人名称
+        F_Belong: 0, //否 number 归属人id
+        F_BelongName: '', //否 string 归属人名称
       },
       rules: {
         F_Customer: [{
@@ -364,10 +385,13 @@ export default {
     }
   },
   created() {
+    this.getRecommendList()
+    this.getBelongList()
     this.getCommodityTypeSelect()
     this.getStock()
     this.getOrderType()
     this.getExpress()
+    this.getPayType()
     this.getProvince()
     this.generateId()
   },
@@ -379,7 +403,6 @@ export default {
           this.ruleForm.OrderDetailList = this.commodityTableData
           this.ruleForm.F_ExpressFee = this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
           this.ruleForm.F_RealPrice = this.ruleForm.F_RealPrice == '' ? 0 : this.ruleForm.F_RealPrice
-          this.ruleForm.F_VipId = this.ruleForm.F_VipId == '' ? 0 : this.ruleForm.F_VipId
           this.ruleForm.F_Score = this.ruleForm.F_Score == '' ? 0 : this.ruleForm.F_Score
           this.loading = true
           addOrder(this.ruleForm).then(response => {
@@ -499,7 +522,6 @@ export default {
         })
       })
     },
-
     // 获取快递
     getExpress() {
       return new Promise(resolve=>{
@@ -514,6 +536,20 @@ export default {
         })
       })
     },
+    // 获取支付方式
+    getPayType() {
+      return new Promise(resolve=>{
+        const params={
+          isleaf:true,
+          code:'PayType'
+        }
+        getDictionaryValueList(params).then(response=>{
+          if(response.state.toLowerCase() === 'success'){
+            this.payTypeList = response.data.Rows
+          }
+        })
+      })
+    },
     generateId() {
       let timestamp = new Date().getTime()
       this.ruleForm.F_Id = 'BJ' + this.staffNumber + 'T' + timestamp
@@ -536,6 +572,93 @@ export default {
         resolve()
       })
     },
+    //获取推荐人列表
+    getRecommendList() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: '', // int 第几页
+          pagesize: '', // int 每页几条信息
+          name: '', //客户姓名
+          phone: '', //手机号码
+          type: '', //会员类型
+          province: '', //省份
+          city: '', //市
+          area: '', //县区
+          town: '', //乡镇
+          address: '', //详细地址
+          birthday: '', //会员生日
+          recommender: '', //推荐人
+          saleperson: '', //销售负责人
+          contact: '', //联系频次
+        }
+        getOrderLists(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.recommendList = response.rows.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    //获取推荐人
+    remoteMethodRecommend(query) {
+      if (query !== '') {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          this.recommendListOptions = this.recommendList.filter(item => {
+            return (item.F_Phone).toLowerCase()
+              .indexOf(query.toLowerCase()) > -1;
+          });
+        }, 200);
+      } else {
+        this.recommendListOptions = [];
+      }
+    },
+    recommendChangeSelect(item) {
+      this.ruleForm.F_RecommendId = item.F_ID
+      this.ruleForm.F_RecommendName = item.F_Name
+    },
+    //获取归属人列表
+    getBelongList() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: '', // 第几页
+          pagesize: '', // 每页几条信息
+          keyword: '', // 否	string	模糊查询
+          roleid: '', // 否	string	角色id
+          deptid: '', // array  部门id 
+        }
+        getUserAccountLists(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.belongList = response.data.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    //获取归属人
+    remoteMethodBelong(query) {
+      if (query !== '') {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          this.belongListOptions = this.belongList.filter(item => {
+            return (item.F_UserName).toLowerCase()
+              .indexOf(query.toLowerCase()) > -1;
+          });
+        }, 200);
+      } else {
+        this.belongListOptions = [];
+      }
+    },
+    belongChangeSelect(item) {
+      this.ruleForm.F_Belong = item.F_UserId
+      this.ruleForm.F_BelongName = item.F_UserName
+    },
     //获取商品
     getCommodityListSelect() {
       this.loading = true

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

@@ -6,7 +6,10 @@
       </el-form-item>
       <el-form-item label="售后类型" prop="F_Type" >
         <el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择合并类型">
-          <el-option v-for="item in mergeType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
+          <el-option label="调换货" value="1"></el-option>
+          <el-option label="退货" value="2"></el-option>
+          <el-option label="部分退货" value="3"></el-option>
+          <el-option label="对发货" value="4"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="变动金额" prop="F_Money">
@@ -69,15 +72,10 @@
       <el-row>
         <el-col :span='24'>
           <el-form-item label="退回商品">
-            <el-table :data="oldCommodityTableData" stripe style="width: 100%" @selection-change="handleSelectionChange" >
+            <el-table :data="oldCommodityTableData" stripe style="width: 100%" @selection-change="handleSelectionChange" ref="oldCommodityTable" >
               <el-table-column type="selection" width="55"></el-table-column>
               <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
               <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
-              <el-table-column label="操作" align="center">
-                <template slot-scope="scope">
-                  <el-button type="text" @click="btn_deleteCommodity(scope.row)">删除</el-button>
-                </template>
-              </el-table-column>
             </el-table>
           </el-form-item>
         </el-col>
@@ -101,7 +99,7 @@ import { getCommodityList } from '@/api/commodityManagement/commodityList'
 import { addAfterSaleList, editAfterSaleList, getAfterSaleList, getAfterSaleOrderCommodityList } from "@/api/afterSaleManagement/afterSaleList";
 
 export default {
-  name: "AddOrEdit",
+  name: "AfterSale",
   props: {
     rowid: {
       type: String,
@@ -115,7 +113,6 @@ export default {
   data() {
     return {
       parentids: [],
-      mergeType: [],//订单类型
       commodityTypeLists: [], //商品分类下拉数据
       // 自定义菜单下拉数据的key值
       typeDropProps: {
@@ -131,12 +128,12 @@ export default {
         num: 1, //商品数量
       },
       oldCommodityTableData: [], //退回商品列表
+      oldDetailListSelection: [], // 退回商品选中数据
       ruleForm: {
         F_OrderId: '', //订单编号
-        F_OrderList: '', //补发产品列表
+        F_DetailList: '', //补发产品列表
         F_OldDetailList: '', //退回产品列表
         F_Type: '', //合并类型
-        F_Gift: '', //赠送商品
         F_Money: '', //减免金额
         F_Remark: '', //销售备注
         F_state: '', //订单状态
@@ -157,11 +154,6 @@ export default {
           trigger: 'blur',
           message: '请输入订单类型',
         }],
-        F_Gift: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入赠送商品',
-        }],
         F_Money: [{
           required: true,
           trigger: 'blur',
@@ -172,29 +164,23 @@ export default {
     };
   },
   created() {
-    this.getMergeType()
     this.getCommodityTypeSelect()
     Promise.all([
     ]).then(() => {
       if (this.rowid) {
         this.ruleForm.F_OrderId = this.rowid
-        this.getDetail(this.rowid)
         this.getAfterSaleOrderCommodity(this.rowid)
       }
     });
   },
-  mounted() {
-    this.automaticallyCheck()
-  },
   methods: {
     submitForm(state) {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           this.loading = true;
           this.ruleForm.F_state = state
-          this.ruleForm.F_OrderList = this.commodityTableData //补发产品列表
           //添加
-          if (!this.rowid) {
+          // if (!this.rowid) {
             addAfterSaleList(this.ruleForm).then(response => {
               this.loading = false
               if (response.state.toLowerCase() === 'success') {
@@ -206,40 +192,26 @@ export default {
               this.loading = false
             })
             return
-          }
+          // }
           // 编辑
-          editAfterSaleList(this.ruleForm)
-            .then(response => {
-              this.loading = false;
-              if (response.state.toLowerCase() === "success") {
-                this.$parent.$layer.close(this.layerid);
-                this.$parent.getList(); // 重新加载父级数据
-                this.$message.success("恭喜你，编辑成功!");
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            });
+          // editAfterSaleList(this.ruleForm)
+          //   .then(response => {
+          //     this.loading = false;
+          //     if (response.state.toLowerCase() === "success") {
+          //       this.$parent.$layer.close(this.layerid);
+          //       this.$parent.getList(); // 重新加载父级数据
+          //       this.$message.success("恭喜你，编辑成功!");
+          //     }
+          //   })
+          //   .catch(() => {
+          //     this.loading = false;
+          //   });
         } else {
           this.$message.error("请输入有效的必填项信息!");
           return false;
         }
       });
     },
-    // 获取合并类型
-    getMergeType() {
-      return new Promise(resolve=>{
-        const params={
-          isleaf:true,
-          code:'AFTERSALETYPE'
-        }
-        getDictionaryValueList(params).then(response=>{
-          if(response.state.toLowerCase() === 'success'){
-            this.mergeType = response.data.Rows
-          }
-        })
-      })
-    },
     //获取商品分类
     getCommodityTypeSelect() {
       this.loading = true
@@ -301,67 +273,56 @@ export default {
         })
         return
       }
-      for (let i; i < this.commodityTableData.length; i++ ) {
-        if (this.commodityTableData[i].F_ProductId = this.commoditySearchData.F_ProductId) {
-          this.commodityTableData[i].num = this.commodityTableData[i].num + this.commoditySearchData.num
-        } else {
-          let data = {
-            F_ProductId: this.commoditySearchData.productId,
-            F_ProductName: this.commoditySearchData.productName,
-            F_Count: this.commoditySearchData.num,
+      if (this.commodityTableData.length > 0) {
+        for (let i=0; i < this.commodityTableData.length; i++ ) {
+          if (this.commodityTableData[i].F_ProductId === this.commoditySearchData.productId) {
+            this.commodityTableData[i].F_Count = this.commodityTableData[i].F_Count + this.commoditySearchData.num
+            return
           }
-          this.commodityTableData.push(data)
         }
       }
+      let data = {
+        F_ProductId: this.commoditySearchData.productId,
+        F_ProductName: this.commoditySearchData.productName,
+        F_Count: this.commoditySearchData.num,
+      }
+      this.commodityTableData.push(data)
+      let ids = []
+      for (let i=0; i<this.commodityTableData.length; i++) {
+        ids.push(this.commodityTableData[i].F_ProductId)
+      }
+      this.ruleForm.F_DetailList = ids.join(',') //补发产品列表
     },
     //删除商品
     btn_deleteCommodity (val) {
       let index = this.commodityTableData.indexOf(val)
       this.commodityTableData.splice(index, 1)
     },
-    // 获取订单详情
-    getDetail(orderId) {
-      this.loading = true;
-      return new Promise(resolve => {
-        const params = {
-          F_State: '-2', //订单状态
-          f_id: orderId,
-        };
-        getAfterSaleList(params).then(response => {
-          this.loading = false;
-          if (response.state.toLowerCase() === "success") {
-            const res = response.data.Rows[0]
-            this.ruleForm.F_OrderList = res.F_OrderList //合并订单
-            this.ruleForm.F_Type = res.F_Type //合并类型
-            this.ruleForm.F_Gift = res.F_Gift //赠送商品
-            this.ruleForm.F_Money = res.F_Money //减免金额
-            this.ruleForm.F_Remark = res.F_Remark //销售备注
-          }
-        });
-        resolve();
-      });
-    },
     // 售后订单商品列表
     getAfterSaleOrderCommodity(rid) {
-      getAfterSaleOrderCommodityList(rid).then(response => {
+      const params = {
+        orderid: rid
+      }
+      getAfterSaleOrderCommodityList(params).then(response => {
         if (response.state.toLowerCase() === 'success') {
           const res = response.data
           this.oldCommodityTableData = res
+          this.$nextTick(()=>{
+            this.oldCommodityTableData.forEach((row,index)=>{
+              this.$refs.oldCommodityTable.toggleRowSelection(row)
+            })
+          },1)
         }
       })
     },
-    // 列表自动勾选
-    automaticallyCheck() {
-      this.oldCommodityTableData.forEach((row,index)=>{
-        this.$nextTick(()=>{  
-          this.batchIds.push(row.id)
-          this.$refs.multipleTable.toggleRowSelection(this.tableDataEdit[index])
-        },1)
-      })
-    },
     //选择多个
     handleSelectionChange(selection) {
-      this.ruleForm.F_OldDetailList = selection
+      let ids = []
+      this.oldDetailListSelection = selection
+      for (let i=0; i<this.oldDetailListSelection.length; i++) {
+        ids.push(this.oldDetailListSelection[i].F_Id)
+      }
+      this.ruleForm.F_OldDetailList = ids.join(',')
     }, 
   }
 };

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

@@ -1,57 +0,0 @@
-<template>
-    <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <el-form-item label="备注">
-                <el-input v-model="ruleForm.remark" type="textarea" placeholder="备注"></el-input>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="submitForm()">提交</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
-</template>
-<script>
-
-import { checkOrderCustodian } from '@/api/orderManagement/orderList'
-export default {
-    props: {
-        rowid: {
-            type: String,
-            default: ''
-        },
-        layerid: {
-            type: String,
-            default: ""
-        }
-    },
-    data(){
-        return{
-            ruleForm: {
-                orderid: '', //订单编号
-                state: 0, //订单状态 —— 0 撤回
-                remark: '', //备注
-            },
-        }
-    },
-    created() {
-        if (this.rowid) {
-            this.ruleForm.orderid = this.rowid
-        }
-    },
-    methods: {
-        submitForm(){
-            checkOrderCustodian(this.ruleForm).then(response => {
-                if (response.state.toLowerCase() === 'success') {
-                    this.$parent.$layer.close(this.layerid);
-                    this.$parent.getList(); // 重新加载父级数据
-                    this.$message.success('恭喜你，撤销订单成功!')
-                }
-            }).catch(() => {
-                this.loading = false
-            })
-        },
-    },
-}
-</script>
-<style lang="scss" scoped>
-</style>

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

@@ -114,12 +114,17 @@
         </el-col>
         <el-col :span='12'>
           <el-form-item label="运费" prop="F_ExpressFee" >
-            <el-input v-model="ruleForm.F_ExpressFee" placeholder="请输入运费"/>
+            <el-select v-model="ruleForm.F_ExpressFee" placeholder="请选择运费" class="form_select" clearable>
+              <el-option label="10" value="10"></el-option>
+              <el-option label="28" value="28"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="支付方式" >
-            <el-input v-model="ruleForm.F_PayType" placeholder="请输入支付方式"/>
+            <el-select v-model="ruleForm.F_PayType" placeholder="请选择支付方式" class="form_select" clearable>
+              <el-option v-for="item in payTypeList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -133,22 +138,33 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="关联会员ID" >
-            <el-input v-model="ruleForm.F_VipId" placeholder="请输入关联会员ID"/>
+          <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">
+              <el-option v-for="item in recommendListOptions" :key="item.F_ID" :label="item.F_Name" :value="item"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="归属人" prop="F_BelongName" >
+            <el-select v-model="ruleForm.F_BelongName" class="form_select" filterable remote reserve-keyword clearable value-key="F_UserId" placeholder="请输入归属人" :remote-method="remoteMethodBelong" :loading="loading" @change="belongChangeSelect">
+              <el-option v-for="item in belongListOptions" :key="item.F_UserId" :label="item.F_UserName" :value="item"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span='8'>
-          <el-form-item label="商品分类" >
-            <el-select v-model="commoditySearchData.className" placeholder="请选择商品分类" class="filter-item" clearable value-key="F_ClassId" @change="commodityTypeChange">
-              <el-option
-                v-for="item in commodityTypeLists"
-                :key="item.F_ClassId"
-                :label="item.F_ClassName"
-                :value="item">
-              </el-option>
-            </el-select>
+          <el-form-item label="商品分类" prop="className">
+            <el-cascader
+              v-model="parentids"
+              :options="commodityTypeLists"
+              :props="typeDropProps"
+              placeholder="请选择商品分类"
+              clearable
+              filterable
+              change-on-select
+              @change="commodityTypeChange"
+              style="width: 100%;"/>
           </el-form-item>
         </el-col>
         <el-col :span='8'>
@@ -215,8 +231,8 @@ import { delFiles, filterContent, pickerOptions } from '@/utils'
 import { getCommodityType } from '@/api/commodityManagement/commodityType'
 import { getCommodityList } from '@/api/commodityManagement/commodityList'
 import { getAreaTreeChildNode } from '@/api/systemSetup/roleSetting/areaManagement'
-
-
+import { getOrderLists } from '@/api/memberManagement/memberList'
+import { getUserAccountLists } from '@/api/systemSetup/roleSetting/userManage'
 
 const validateTelRule = (rule, value, callback) => {
   if (!validateTel(value)) {
@@ -226,7 +242,6 @@ const validateTelRule = (rule, value, callback) => {
   }
 }
 
-
 export default {
   name: "AddOrEdit",
   props: {
@@ -252,13 +267,24 @@ export default {
   },
   data() {
     return {
+      parentids:[],
       provinceDatas: [], // 省下拉数据
       cityDatas: [], //市下拉数据
       areaDatas: [], //区/县下拉数据
       townDatas: [], //乡镇/下拉数据
       stockList: [], //出库货仓下拉数据
       expressList: [], //快递
+      payTypeList: [], //支付方式
+      recommendList: [], //会员列表数据
+      recommendListOptions: [], //会员列表数据
+      belongList: [], //归属人列表数据
+      belongListOptions: [], //归属人列表数据
       commodityTypeLists: [], //商品分类下拉数据
+      // 自定义菜单下拉数据的key值
+      typeDropProps: {
+        value: 'id',
+        label: 'text'
+      },
       commodityListLists: [], //商品下拉数据
       commoditySearchData: { //商品搜索数据
         classId: '', // 商品分类id
@@ -292,12 +318,15 @@ export default {
         F_Address: '', //否 string 详细地址
         F_PostalCode: '', //否 string 邮编
         F_Express: '', //否 string 选择的快递
-        F_ExpressFee: '', //否 number 运费
+        F_ExpressFee: '10', //否 number 运费
         F_PayType: '', //否 string  支付方式
         F_Stock: '', //否 string 出货仓库
         F_RealPrice: '', //否 number 实收金额
-        F_VipId: '', //否 number 关联会员id
         F_Score: '', //否 number  使用积分
+        F_RecommendId: '',// 否 number 推荐人id
+        F_RecommendName: '', //否 string 推荐人名称
+        F_Belong: 0, //否 number 归属人id
+        F_BelongName: '', //否 string 归属人名称
       },
       rules: {
         F_Customer: [{
@@ -330,10 +359,13 @@ export default {
     };
   },
   created() {
+    this.getRecommendList()
+    this.getBelongList()
     this.getCommodityTypeSelect()
     this.getStock()
     this.getOrderType()
     this.getExpress()
+    this.getPayType()
     this.getProvince()
     Promise.all([
     ]).then(() => {
@@ -351,7 +383,6 @@ export default {
           this.ruleForm.OrderDetailList = JSON.stringify(this.ruleForm.OrderDetailList) == JSON.stringify(this.commodityTableData) ? [] : this.commodityTableData
           this.ruleForm.F_ExpressFee = this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
           this.ruleForm.F_RealPrice = this.ruleForm.F_RealPrice == '' ? 0 : this.ruleForm.F_RealPrice
-          this.ruleForm.F_VipId = this.ruleForm.F_VipId == '' ? 0 : this.ruleForm.F_VipId
           this.ruleForm.F_Score = this.ruleForm.F_Score == '' ? 0 : this.ruleForm.F_Score
           // 编辑
           editOrder(this.ruleForm)
@@ -477,6 +508,20 @@ export default {
         })
       })
     },
+    // 获取支付方式
+    getPayType() {
+      return new Promise(resolve=>{
+        const params={
+          isleaf:true,
+          code:'PayType'
+        }
+        getDictionaryValueList(params).then(response=>{
+          if(response.state.toLowerCase() === 'success'){
+            this.payTypeList = response.data.Rows
+          }
+        })
+      })
+    },
     //获取商品分类
     getCommodityTypeSelect() {
       this.loading = true
@@ -489,12 +534,99 @@ export default {
         getCommodityType(data).then(response => {
           this.loading = false
           if (response.state.toLowerCase() === 'success') {
-            this.commodityTypeLists = response.data.Rows
+            this.commodityTypeLists = response.data
           }
         })
         resolve()
       })
     },
+    //获取推荐人列表
+    getRecommendList() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: '', // int 第几页
+          pagesize: '', // int 每页几条信息
+          name: '', //客户姓名
+          phone: '', //手机号码
+          type: '', //会员类型
+          province: '', //省份
+          city: '', //市
+          area: '', //县区
+          town: '', //乡镇
+          address: '', //详细地址
+          birthday: '', //会员生日
+          recommender: '', //推荐人
+          saleperson: '', //销售负责人
+          contact: '', //联系频次
+        }
+        getOrderLists(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.recommendList = response.rows.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    //获取推荐人
+    remoteMethodRecommend(query) {
+      if (query !== '') {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          this.recommendListOptions = this.recommendList.filter(item => {
+            return (item.F_Phone).toLowerCase()
+              .indexOf(query.toLowerCase()) > -1;
+          });
+        }, 200);
+      } else {
+        this.recommendListOptions = [];
+      }
+    },
+    recommendChangeSelect(item) {
+      this.ruleForm.F_RecommendId = item.F_ID
+      this.ruleForm.F_RecommendName = item.F_Name
+    },
+    //获取归属人列表
+    getBelongList() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: '', // 第几页
+          pagesize: '', // 每页几条信息
+          keyword: '', // 否	string	模糊查询
+          roleid: '', // 否	string	角色id
+          deptid: '', // array  部门id 
+        }
+        getUserAccountLists(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.belongList = response.data.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    //获取归属人
+    remoteMethodBelong(query) {
+      if (query !== '') {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          this.belongListOptions = this.belongList.filter(item => {
+            return (item.F_UserName).toLowerCase()
+              .indexOf(query.toLowerCase()) > -1;
+          });
+        }, 200);
+      } else {
+        this.belongListOptions = [];
+      }
+    },
+    belongChangeSelect(item) {
+      this.ruleForm.F_Belong = item.F_UserId
+      this.ruleForm.F_BelongName = item.F_UserName
+    },
     //获取商品
     getCommodityListSelect() {
       this.loading = true
@@ -504,7 +636,7 @@ export default {
           pagesize: 300, // int 每页几条信息,
           ProductId: '',
           ClassId: this.commoditySearchData.classId === '' ? 0 : this.commoditySearchData.classId,
-          ClassName: this.commoditySearchData.className,
+          ClassName: '',
           ProductName: '',
           PinyinShort: '',
           ProductNumber: '',
@@ -522,8 +654,7 @@ export default {
       })
     },
     commodityTypeChange(item) {
-      this.commoditySearchData.classId = item.F_ClassId
-      this.commoditySearchData.className = item.F_ClassName
+      this.commoditySearchData.classId = this.parentids[this.parentids.length - 1]
       this.getCommodityListSelect()
     },
     commodityListChange(item) {
@@ -603,8 +734,11 @@ export default {
           this.ruleForm.F_PayType = res.F_PayType //支付方式
           this.ruleForm.F_Stock = res.F_Stock //出货仓库
           this.ruleForm.F_RealPrice = res.F_RealPrice == 0 ? '' : res.F_RealPrice //实收金额
-          this.ruleForm.F_VipId = res.F_VipId == 0 ? '' : res.F_VipId //关联会员id
           this.ruleForm.F_Score = res.F_Score ==0 ? '' : res.F_Score //使用积分
+          this.ruleForm.F_RecommendId = res.F_RecommendId//推荐人id
+          this.ruleForm.F_RecommendName = res.F_RecommendName//推荐人名称
+          this.ruleForm.F_Belong = res.F_Belong //归属人id
+          this.ruleForm.F_BelongName = res.F_BelongName //归属人名称
         }
       });
     },

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

@@ -45,7 +45,11 @@
       <el-table-column prop="F_Id" label="订单编号" align="center" min-width="150" />
       <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
       <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
-      <el-table-column prop="typename" label="订购商品" align="center" min-width />
+      <el-table-column label="订购商品" align="center" min-width>
+      <template slot-scope="scope">
+        {{ scope.row.OrderDetailList | judgmentOrderGoods}}
+      </template>
+      </el-table-column>
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
       <el-table-column label="订单状态" align="center" >
         <template slot-scope="scope">
@@ -82,7 +86,6 @@ import { getDictionaryValueList } from '@/api/commonAPI'
 import { getOrderLists, cancelOrder } from "@/api/orderManagement/orderList";
 import { pickerOptions, formatterContent } from "@/utils";
 import edit from "./edit";
-import cancel from './cancel';
 import detail from './detail';
 import merge from './merge';
 import apply from './apply';
@@ -109,6 +112,14 @@ export default {
       }
       return statusMap[status]
     },
+    judgmentOrderGoods(status) {
+      let orderGoodsNameQuantity = ''
+      for (let i = 0; i < status.length; i++) {
+        orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
+      }
+      orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
+      return orderGoodsNameQuantity
+    },
   },
   data() {
     return {

CallCenterWeb.UI/src/views/orderManagement/orderListCustodian/ship.vue

@@ -1,62 +0,0 @@
-<template>
-    <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <!-- <el-form-item label="订单编号">
-                <el-col :span='12'>
-                    <span>{{ ruleForm.orderid }}</span>
-                </el-col>
-            </el-form-item> -->
-            <el-form-item label="备注">
-                <el-input v-model="ruleForm.remark" type="textarea" placeholder="备注"></el-input>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="submitForm()">提交</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
-</template>
-<script>
-
-import { checkOrderCustodian } from '@/api/orderManagement/orderList'
-export default {
-    props: {
-        rowid: {
-            type: String,
-            default: ''
-        },
-        layerid: {
-            type: String,
-            default: ""
-        }
-    },
-    data(){
-        return{
-            ruleForm: {
-                orderid: '', //订单编号
-                state: 6, //订单状态 —— 6 发货
-                remark: '', //备注
-            },
-        }
-    },
-    created() {
-        if (this.rowid) {
-            this.ruleForm.orderid = this.rowid
-        }
-    },
-    methods: {
-        submitForm(){
-            checkOrderCustodian(this.ruleForm).then(response => {
-                if (response.state.toLowerCase() === 'success') {
-                    this.$parent.$layer.close(this.layerid);
-                    this.$parent.getList(); // 重新加载父级数据
-                    this.$message.success('恭喜你，工单信息审核成功!')
-                }
-            }).catch(() => {
-                this.loading = false
-            })
-        },
-    },
-}
-</script>
-<style lang="scss" scoped>
-</style>

CallCenterWeb.UI/src/views/orderManagement/orderListCustodian/sorting.vue

@@ -1,62 +0,0 @@
-<template>
-    <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <!-- <el-form-item label="订单编号">
-                <el-col :span='12'>
-                    <span>{{ ruleForm.orderid }}</span>
-                </el-col>
-            </el-form-item> -->
-            <el-form-item label="备注">
-                <el-input v-model="ruleForm.remark" type="textarea" placeholder="备注"></el-input>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="submitForm()">提交</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
-</template>
-<script>
-
-import { checkOrderCustodian } from '@/api/orderManagement/orderList'
-export default {
-    props: {
-        rowid: {
-            type: String,
-            default: ''
-        },
-        layerid: {
-            type: String,
-            default: ""
-        }
-    },
-    data(){
-        return{
-            ruleForm: {
-                orderid: '', //订单编号
-                state: 5, //订单状态 —— 5 分拣
-                remark: '', //备注
-            },
-        }
-    },
-    created() {
-        if (this.rowid) {
-            this.ruleForm.orderid = this.rowid
-        }
-    },
-    methods: {
-        submitForm(){
-            checkOrderCustodian(this.ruleForm).then(response => {
-                if (response.state.toLowerCase() === 'success') {
-                    this.$parent.$layer.close(this.layerid);
-                    this.$parent.getList(); // 重新加载父级数据
-                    this.$message.success('恭喜你，工单信息审核成功!')
-                }
-            }).catch(() => {
-                this.loading = false
-            })
-        },
-    },
-}
-</script>
-<style lang="scss" scoped>
-</style>