问题修改

CallCenterWeb.UI/src/store/getters.js

@@ -19,6 +19,7 @@ const getters = {
   groupName: state => state.user.groupName, //中心名称
   groupId: state => state.user.groupId, //中心名称
   teamName: state => state.user.teamName, //小组
+  teamId: state => state.user.teamId, //小组id
 
   telIsConnected: state => state.telWebsocket.telIsConnected, // 是否建立话务websocket链接
   telMessageData: state => state.telWebsocket.telMessageData, // 话务 websocket 接收的数据

CallCenterWeb.UI/src/store/modules/user.js

@@ -21,7 +21,8 @@ const user = {
     groupcode: '',
     groupId: 0,
     groupName: '',
-    teamName: ''
+    teamName: '',
+    teamId: '',
   },
 
   mutations: {
@@ -76,9 +77,9 @@ const user = {
     SET_TEAMNAME: (state, teamName) => {
       state.teamName = teamName
     },
-    // SET_TEAMID: (state, teamId) => {
-    //   state.teamId = teamId
-    // },
+    SET_TEAMID: (state, teamId) => {
+      state.teamId = teamId
+    },
   },
 
   actions: {
@@ -120,7 +121,7 @@ const user = {
           commit('SET_AVATAR', data.F_HeadImg) // 用户头像
           commit('SET_MOBILE', data.F_Mobile) // 手机
           commit('SET_TEAMNAME', data.F_Team) // 中心名称
-          // commit('SET_TEAMID', data.F_Team) // 中心id
+          commit('SET_TEAMID', data.F_DeptTeamId) // 中心id
           commit('SET_GROUPNAME', data.F_Group) // 小组名称
           commit('SET_GROUPID', data.F_GroupId) // 小组id
           resolve(response)

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

@@ -1,25 +1,23 @@
 <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-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-input v-model="searchData.submitUser" placeholder="请输入提交员工" class="filter-item" />
+      <el-cascader ref="myCascader" v-model="parentids" class="filter-item" :options="departmentDropDatas" :props="props" @change="handledepartment" placeholder="请选择部门" clearable filterable change-on-select />
+      <el-select v-model="searchData.deptteam" class="filter-item form_select" filterable clearable placeholder="请选择中心" @change="handleteam" @clear="clearTeam">
+        <el-option v-for="item in teamData" :key="item.F_Id" :label="item.F_Name" :value="item.F_Id" />
+      </el-select>
+      <el-select v-model="searchData.group" class="filter-item form_select" filterable clearable placeholder="请选择小组" @change="handlegrop" @clear="clearGroup">
+        <el-option v-for="item in gropData" :key="item.F_Id" :label="item.F_Name" :value="item.F_Id" />
+      </el-select>
+      <el-select v-model="searchData.name" class="filter-item form_select" filterable clearable placeholder="请选择销售">
+        <el-option v-for="item in userAccountDataList" :key="item.F_UserId" :label="item.F_UserName" :value="item.F_UserName" />
+      </el-select>
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" v-if="isSubmit()" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
     </div>
@@ -31,10 +29,10 @@
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
     </div>
-    <el-table v-loading="loading" :data="dataLists" border stripe  @selection-change="handleSelectionChange" row-key="F_Id">
+    <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="180" >
+      <el-table-column prop="F_Id" label="订单编号" align="center" min-width="180">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_Id)">{{ scope.row.F_Id }}</el-button>
         </template>
@@ -47,7 +45,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
-      <el-table-column label="订单状态" align="center" >
+      <el-table-column label="订单状态" align="center">
         <template slot-scope="scope">
           {{ scope.row.F_State | judgmentStateName }}
         </template>
@@ -58,9 +56,10 @@
       </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_SubmitUser" 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="物流状态" align="center" >
+      <el-table-column label="物流状态" align="center">
         <template slot-scope="scope">
           {{ scope.row.F_Status | judgmentStatusName }}
         </template>
@@ -85,49 +84,52 @@
 </template>
 
 <script>
-import { getDictionaryValueList } from '@/api/commonAPI'
-import { getAfterSaleOrderList } from "@/api/afterSaleManagement/afterSaleList";
-import { orderBulkSubmit } from "@/api/orderManagement/orderList";
-import { pickerOptions, formatterContent } from "@/utils";
-import { getOrderLists } from '@/api/orderManagement/orderList'
-import edit from "./edit";
-import addOrEditRemark from "./addOrEditRemark";
+import { getDictionaryValueList } from "@/api/commonAPI"
+import { getAfterSaleOrderList } from "@/api/afterSaleManagement/afterSaleList"
+import { orderBulkSubmit } from "@/api/orderManagement/orderList"
+import { pickerOptions, formatterContent } from "@/utils"
+import { getOrderLists } from "@/api/orderManagement/orderList"
+import { getTreeList } from "@/api/systemSetup/roleSetting/department"
+import { getTeamLists } from "@/api/systemSetup/sysSetting/teamManagement"
+import { getUserAccountLists } from "@/api/systemSetup/roleSetting/userManage"
+import edit from "./edit"
+import addOrEditRemark from "./addOrEditRemark"
 import detail from "@/views/orderManagement/orderList/detail"
-import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
 
 export default {
   name: "orderList",
   components: {
-    Pagination
+    Pagination,
   },
   filters: {
     judgmentStateName(status) {
       const statusMap = {
-        '0': "未提交",
-        '1': "待分仓",
-        '2': "已退回",
-        '3': "已分仓",
-        '4': "无货",
-        '5': "仓库待审核",
-        '6': "已发货",
-        '7': "付款待审核",
-        '8': "待分物流",
-        '9': "物流未通过",
+        0: "未提交",
+        1: "待分仓",
+        2: "已退回",
+        3: "已分仓",
+        4: "无货",
+        5: "仓库待审核",
+        6: "已发货",
+        7: "付款待审核",
+        8: "待分物流",
+        9: "物流未通过",
       }
       return statusMap[status]
     },
     judgmentStatusName(status) {
       const statusMap = {
-        '0': '未发出',
-        '1': '未签收',
-        '2': '签收',
-        '3': '改代收',
-        '4': '拒收',
+        0: "未发出",
+        1: "未签收",
+        2: "签收",
+        3: "改代收",
+        4: "拒收",
       }
       return statusMap[status]
     },
     judgmentOrderGoods(status) {
-      let orderGoodsNameQuantity = ''
+      let orderGoodsNameQuantity = ""
       for (let i = 0; i < status.length; i++) {
         orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
       }
@@ -135,53 +137,71 @@ export default {
       return orderGoodsNameQuantity
     },
     judgmentAddress(data) {
-      const addProvince = data.F_AddProvince === null ? '' : data.F_AddProvince // 省
-      const addCity = data.F_AddCity === null ? '' : data.F_AddCity // 市
-      const addArea = data.F_AddArea === null ? '' : data.F_AddArea // 县/区
-      const addTown = data.F_AddTown === null ? '' : data.F_AddTown // 乡/镇
-      const address = data.F_Address === null ? '' : data.F_Address // 详细地址
+      const addProvince = data.F_AddProvince === null ? "" : data.F_AddProvince // 省
+      const addCity = data.F_AddCity === null ? "" : data.F_AddCity // 市
+      const addArea = data.F_AddArea === null ? "" : data.F_AddArea // 县/区
+      const addTown = data.F_AddTown === null ? "" : data.F_AddTown // 乡/镇
+      const address = data.F_Address === null ? "" : data.F_Address // 详细地址
       const addressStr = addProvince + addCity + addArea + addTown + address // 地址
       return addressStr
-    }
+    },
   },
   data() {
     return {
       loading: false,
       searchData: {
-        adFrom: '', //消息/广告媒体来源
-        type: '', //订单类型
-        id: '', //订单号
-        customer: '', //客户姓名
-        customerPhone: '', //客户手机号
-        trackingNo: '', //运单号
-        submitUser: '', //提交员工
-        searchTime: '', //订单时间
-        F_State: '0',
-        State: ''
+        adFrom: "", //消息/广告媒体来源
+        type: "", //订单类型
+        id: "", //订单号
+        customer: "", //客户姓名
+        customerPhone: "", //客户手机号
+        trackingNo: "", //运单号
+        submitUser: "", //提交员工
+        searchTime: "", //订单时间
+        F_State: "0",
+        State: "",
+        deptid: "", // 所属部门id
+        dept: "", // 部门名称
+        deptteamid: "", // 中心id
+        deptteam: "", // 中心姓名
+        groupid: "", // 小组信息
+        group: "", // 小组名称
+        name: "", // 销售名称
       },
+      parentids: [],
+      departmentDropDatas: [], // 下拉分类
+      // 自定义菜单下拉数据的key值
+      props: {
+        value: "id",
+        label: "text",
+      },
+      teamData: [], // 中心下拉数据
+      gropData: [], // 小组下拉数据
+      userAccountDataList: [], // 用户数据
       activeName: "0", //标签切换首页
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectOrderId: [], //合并订单id
-    };
+    }
   },
   created() {
     this.getList()
-    document.onkeyup = e => {
+    this.getTypeDrop()
+    document.onkeyup = (e) => {
       if (e.keyCode === 13) {
-        this.getList();
+        this.getList()
       }
-    };
+    }
   },
   methods: {
     // 提交权限
-    isSubmit(state){
+    isSubmit(state) {
       if (this.activeName == 0 || this.activeName == 2) {
         return true
       } else {
@@ -189,7 +209,7 @@ export default {
       }
     },
     // 编辑权限
-    isEdit(state){
+    isEdit(state) {
       if (this.activeName == 0 || this.activeName == 2) {
         return true
       } else {
@@ -197,7 +217,7 @@ export default {
       }
     },
     // 备注权限
-    isRemark(state){
+    isRemark(state) {
       if (this.activeName == 0 || this.activeName == 2) {
         return true
       } else {
@@ -205,14 +225,14 @@ export default {
       }
     },
     getList() {
-      this.loading = true;
-      return new Promise(resolve => {
+      this.loading = true
+      return new Promise((resolve) => {
         const params = {
           F_State: this.searchData.F_State, // 订单状态
           pageindex: 1, // int 第几页
           pagesize: 1000000, // int 每页几条信息
           F_ADFrom: this.searchData.adFrom, // 消息/广告来源
-          F_Type: '售后订单', // 订单类型
+          F_Type: "售后订单", // 订单类型
           F_PayType: this.searchData.payType, // 支付方式
           F_Id: this.searchData.id, // 订单号
           F_Customer: this.searchData.customer, // 客户姓名
@@ -223,43 +243,46 @@ export default {
           SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
           SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
           F_PayState: -2,
-          State: this.searchData.State
+          State: this.searchData.State,
+          F_Core: this.searchData.deptteamid, // 中心
+          F_Group: this.searchData.groupid, // 小组
+          F_BelongName: this.searchData.name, // 人员
         }
-        getOrderLists(params).then(response => {
-          this.loading = false;
+        getOrderLists(params).then((response) => {
+          this.loading = false
           if (response.state.toLowerCase() === "success") {
-            this.pageParams.total = response.data.Totals;
-            this.dataLists = response.data.Rows;
+            this.pageParams.total = response.data.Totals
+            this.dataLists = response.data.Rows
           }
-        });
-        resolve();
-      });
+        })
+        resolve()
+      })
     },
     handleTabClick(tab, event) {
       this.pageParams.pageindex = 1
-      if (this.activeName == '1') {
+      if (this.activeName == "1") {
         this.searchData.State = this.activeName
-        this.searchData.F_State = ''
+        this.searchData.F_State = ""
       } else {
         this.searchData.F_State = this.activeName
-        this.searchData.State = ''
+        this.searchData.State = ""
       }
       this.getList()
     },
     btn_search() {
-      this.pageParams.pageindex = 1;
-      this.getList();
+      this.pageParams.pageindex = 1
+      this.getList()
     },
     btn_edit(editId) {
       this.$layer.iframe({
         content: {
           content: edit, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: editId } // props
+          data: { rowid: editId }, // props
         },
         area: ["80%", "90%"],
-        title: "编辑订单"
-      });
+        title: "编辑订单",
+      })
     },
     // 添加备注
     btn_add_remark(id) {
@@ -267,15 +290,15 @@ export default {
         content: {
           content: addOrEditRemark, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: id } // props
+          data: { rowid: id }, // props
         },
         area: ["40%", "50%"],
-        title: "添加备注"
-      });
+        title: "添加备注",
+      })
     },
     // 提交
     btn_submit(orderId) {
-      this.isDisable = true;
+      this.isDisable = true
       setTimeout(() => {
         this.$confirm("您确定提交吗?", "提示", {
           confirmButtonText: "确定",
@@ -283,89 +306,195 @@ export default {
           type: "warning",
         })
           .then(() => {
-            this.isDisable = false;
+            this.isDisable = false
             const data = {
               orderids: orderId,
-            };
+            }
             orderBulkSubmit(data).then((response) => {
               if (response.state.toLowerCase() === "success") {
-                this.getList();
-                this.$message.success("提交成功!");
+                this.getList()
+                this.$message.success("提交成功!")
               }
-            });
+            })
           })
           .catch(() => {
             this.$message({
               type: "info",
               message: "已取消提交",
-            });
-          });
-        this.isDisable = false;
-      }, 300);
+            })
+          })
+        this.isDisable = false
+      }, 300)
     },
     // 批量提交
     btn_bulk_submit() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: '请选择订单！',
-          type: 'warning'
+          message: "请选择订单！",
+          type: "warning",
         })
         return
       }
       this.isDisable = true
       setTimeout(() => {
-        this.$confirm('您确定提交吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+        this.$confirm("您确定提交吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
           .then(() => {
             this.isDisable = false
             const data = {
-              orderids: this.selectOrderId.join(',').replace(/\s+/g, '')
+              orderids: this.selectOrderId.join(",").replace(/\s+/g, ""),
             }
             orderBulkSubmit(data).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
+              if (response.state.toLowerCase() === "success") {
                 this.getList()
-                this.$message.success('提交成功!')
+                this.$message.success("提交成功!")
               }
             })
           })
           .catch(() => {
             this.$message({
-              type: 'info',
-              message: '已取消提交'
+              type: "info",
+              message: "已取消提交",
             })
           })
         this.isDisable = false
       }, 300)
     },
-    hadndleOrderCode(ordercode){
+    hadndleOrderCode(ordercode) {
       this.$layer.iframe({
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': ordercode }// props
+          data: { rowid: ordercode }, // props
         },
-        area: ['80%', '90%'],
-        title: '订单详情'
+        area: ["80%", "90%"],
+        title: "订单详情",
       })
     },
     //选择多个
     handleSelectionChange(val) {
       const ids = []
       this.multipleSelection = val
-      for (let i=0; i<this.multipleSelection.length; i++) {
+      for (let i = 0; i < this.multipleSelection.length; i++) {
         ids.push(this.multipleSelection[i].F_Id)
       }
       this.selectOrderId = ids
     },
-  }
-};
+    // 获取部门下拉
+    getTypeDrop() {
+      return new Promise((resolve) => {
+        getTreeList().then((response) => {
+          if (response.state.toLowerCase() === "success") {
+            this.departmentDropDatas = response.data
+          }
+        })
+        resolve()
+      })
+    },
+    // 部门选择信息
+    handledepartment(e) {
+      this.searchData.deptid = e[e.length - 1]
+      this.searchData.deptteamid = ""
+      this.searchData.dept = this.$refs["myCascader"].currentLabels[this.$refs["myCascader"].currentLabels.length - 1] // label
+      this.getTeam()
+    },
+    // 获取中心数据
+    getTeam() {
+      const params = {
+        pageindex: 1, // 第几页
+        pagesize: 500, // 每页几条信息
+        deptid: this.searchData.deptid, // 部门id
+        type: 0,
+      }
+      getTeamLists(params).then((response) => {
+        if (response.state.toLowerCase() === "success") {
+          this.teamData = response.data.Rows
+        }
+      })
+    },
+    // 中心选择
+    handleteam(e) {
+      this.searchData.deptteamid = e
+      var obj = {}
+      obj = this.teamData.find((item) => {
+        // 这里的teamData就是上面遍历的数据源
+        return item.F_Id === e // 筛选出匹配数据，这里的value是你遍历数组每一项的value，如果没有对后台返回的数据做处理，一般为id
+      })
+      this.searchData.deptteam = obj.F_Name //  这里的label就是对应label的
+      this.getteamList()
+      this.searchData.groupid = ""
+    },
+    // 获取小组列表数据
+    getteamList() {
+      this.loading = true
+      return new Promise((resolve) => {
+        const params = {
+          pageindex: 1, // 第几页
+          pagesize: 500, // 每页几条信息
+          type: 1,
+          deptid: this.searchData.deptid, // 部门id
+          parentid: this.searchData.deptteamid,
+        }
+        getTeamLists(params).then((response) => {
+          this.loading = false
+          if (response.state.toLowerCase() === "success") {
+            this.gropData = response.data.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    // 小组选择
+    handlegrop(e) {
+      this.searchData.groupid = e
+      var obj = {}
+      obj = this.gropData.find((item) => {
+        // 这里的teamData就是上面遍历的数据源
+        return item.F_Id === e // 筛选出匹配数据，这里的value是你遍历数组每一项的value，如果没有对后台返回的数据做处理，一般为id
+      })
+      this.searchData.group = obj.F_Name //  这里的label就是对应label的
+      this.getUserAccountListData()
+    },
+    //中心清空
+    clearTeam() {
+      this.teamData = []
+      this.searchData.deptteamid = "" // 中心id
+      this.searchData.deptteam = "" // 中心姓名
+    },
+    //小组清空
+    clearGroup() {
+      this.gropData = []
+      this.searchData.groupid = "" // 小组信息
+      this.searchData.group = "" // 小组名称
+    },
+    // 获取用户
+    getUserAccountListData() {
+      this.loading = true
+      return new Promise((resolve) => {
+        const params = {
+          pageindex: 1, // 第几页
+          pagesize: 10000, // 每页几条信息
+          deptid: "", // 部门id
+          groupid: this.searchData.groupid, // 小组id
+        }
+        getUserAccountLists(params).then((response) => {
+          this.loading = false
+          if (response.state.toLowerCase() === "success") {
+            this.userAccountDataList = response.data.Rows
+          }
+        })
+        resolve()
+      })
+    },
+  },
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.el{
+.el {
   cursor: pointer;
 }
 </style>

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

@@ -13,7 +13,8 @@
       <el-button v-permission="'HY_export'" 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="" />
+      <el-tab-pane label="全部" name="-1" />
+      <el-tab-pane label="未结算" name="0" />
       <el-tab-pane label="已结算" name="1" />
     </el-tabs>
     <div>
@@ -54,7 +55,7 @@
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="'HY_refund'" v-if="isrefund(scope.row.F_State)" type="text" @click="btn_refund(scope.row.F_Id)">退款</el-button>
-          <el-button v-permission="'HY_express'" type="text" @click="btn_express(scope.row.F_Id)">快递信息</el-button>
+          <el-button v-permission="'HY_express'" v-if="isExpress(scope.row.State)" type="text" @click="btn_express(scope.row.F_Id)">快递信息</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -123,9 +124,10 @@ export default {
         type: "", // 订单类型
         id: "", // 订单号
         returnType: "",
+        state: ""
       },
       afterSaleReasonsList: [], // 售后原因类型
-      activeName: "0", // 标签切换首页
+      activeName: "-1", // 标签切换首页
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
@@ -159,7 +161,7 @@ export default {
             return data
           },
         ],
-        url: this.$store.getters.serverConfig.BASE_API + "api/kforder/getaftersalebypage?isdc=2" + "&F_State=" + this.activeName + "&F_Type=" + this.searchData.type + "&F_ReturnType=" + this.searchData.returnType,
+        url: this.$store.getters.serverConfig.BASE_API + "api/kforder/getaftersalebypage?isdc=2" + "&State=" + this.searchData.state + "&F_Type=" + this.searchData.type + "&F_ReturnType=" + this.searchData.returnType,
         method: "post",
         data: this.sendDatas,
         responseType: "blob",
@@ -190,11 +192,12 @@ export default {
       this.loading = true
       return new Promise((resolve) => {
         const params = {
-          F_State: this.activeName, // 订单状态
+          // F_State: "", // 订单状态
           pageindex: 1, // int 第几页
           pagesize: 1000000, // int 每页几条信息
           F_Type: this.searchData.type,
           F_ReturnType: this.searchData.returnType,
+          State: this.searchData.state, //订单状态
         }
         getAfterSaleRefundList(params).then((response) => {
           this.loading = false
@@ -223,6 +226,13 @@ export default {
     },
     handleTabClick(tab, event) {
       this.pageParams.pageindex = 1
+      if (this.activeName === "0") {
+        this.searchData.state = "0"
+      } else if (this.activeName === "1") {
+        this.searchData.state = "1"
+      } else {
+        this.searchData.state = ""
+      }
       this.getList()
     },
     // 设置退款展示
@@ -233,6 +243,14 @@ export default {
         return true
       }
     },
+    //更改物流状态
+    isExpress(state) {
+      if (state === 0) {
+        return true
+      } else {
+        return false
+      }
+    },
     // 合并订单审核
     btn_refund(auditId) {
       this.$layer.iframe({

CallCenterWeb.UI/src/views/mediaCenter/launchManagment/mediaInformation/addPlan.vue

@@ -5,17 +5,17 @@
         <el-col :span="24">
           <el-form-item label="播放计划信息" label-width="110px"></el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4">
           <el-form-item label="播出时间">
-            <el-time-picker
-              value-format="HH:mm:ss"
-              v-model="playPlanForm.BroadcastTime"
-              type="date"
-              placeholder="请选择开始时间"
-            ></el-time-picker>
+            <el-time-picker value-format="HH:mm:ss" v-model="playPlanForm.BroadcastTime" type="date" placeholder="请选择开始时间"></el-time-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="~">
+            <el-time-picker value-format="HH:mm:ss" v-model="playPlanForm.BroadcastEndTime" type="date" placeholder="请选择结束时间"></el-time-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="13">
+        <!-- <el-col :span="13">
           <el-form-item label="播放日期">
             <el-checkbox-group v-model="playPlanForm.week">
               <el-checkbox label="周一" name="type" value="1"></el-checkbox>
@@ -27,6 +27,16 @@
               <el-checkbox label="周日" name="type" value="7"></el-checkbox>
             </el-checkbox-group>
           </el-form-item>
+        </el-col> -->
+        <el-col :span="4">
+          <el-form-item label="播出时长" prop="broadcost">
+            <el-input v-model="playPlanForm.broadcost" onkeyup="value=value.replace(/[^\d.]/g,'')" placeholder="请输入播出时长"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="播出次数">
+            <el-input v-model="playPlanForm.playNumber" onkeyup="value=value.replace(/[^\d.]/g,'')" placeholder="请输入播出次数"></el-input>
+          </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label="状态">
@@ -37,142 +47,138 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8">
           <el-form-item label="计划时间">
-            <el-date-picker
-              v-model="playPlanForm.startDate"
-              :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="playPlanForm.startDate" :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-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4">
           <el-form-item label="广告名称" prop="advertisementName">
             <el-select clearable v-model="playPlanForm.advertisementName" placeholder="请选择广告名称">
-              <el-option
-                v-for="item in advertisementList"
-                :key="item.F_ValueId"
-                :label="item.F_Value"
-                :value="item.F_ValueId"
-              ></el-option>
+              <el-option v-for="item in advertisementList" :key="item.F_ValueId" :label="item.F_Value" :value="item.F_ValueId"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="播出时长">
-            <el-input v-model="playPlanForm.broadcost" onkeyup="value=value.replace(/[^\d.]/g,'')" placeholder="请输入播出时长"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="播出次数">
-            <el-input v-model="playPlanForm.playNumber" onkeyup="value=value.replace(/[^\d.]/g,'')" placeholder="请输入播出次数"></el-input>
+          <el-form-item label="播放说明">
+            <el-input v-model="playPlanForm.explain" placeholder="请输入播放说明"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="播放说明">
-            <el-input v-model="playPlanForm.explain" placeholder="请输入播放说明"></el-input>
+          <el-form-item label="投放类型" prop="Mold">
+            <el-select clearable v-model="playPlanForm.Mold" placeholder="请选择投放类型">
+              <el-option label="正播" value="0"></el-option>
+              <el-option label="赠送" value="1"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-button type="primary" style="margin-left:50%" @click="submit">保存</el-button>
+          <el-button type="primary" style="margin-left: 50%" @click="submit">保存</el-button>
         </el-col>
       </el-form>
     </el-row>
   </div>
 </template>
 <script>
-import { getDictionaryValueList } from "@/api/commonAPI";
-import { pickerOptions } from "@/utils";
-import { saveChange} from '@/api/mediaCenter/mediaInformation'
+import { getDictionaryValueList } from "@/api/commonAPI"
+import { pickerOptions } from "@/utils"
+import { saveChange } from "@/api/mediaCenter/mediaInformation"
 export default {
   props: {
     rowid: {
       type: String,
-      default: ""
+      default: "",
     },
     layerid: {
       type: String,
-      default: ""
-    }
+      default: "",
+    },
   },
   data() {
     return {
       playPlanForm: {
-        startDate: '', //计划时间
+        startDate: "", //计划时间
         BroadcastTime: "", //当天播出时间
+        BroadcastEndTime: "", //当天播出结束时间
         state: "", //状态
         broadcost: "", //播出时长
         playNumber: "", //播放次数
         explain: "", //播放说明
         advertisementName: "", //广告名称
         advertisementNameId: "", //广告名称id
-        week: [] //选中天数
+        week: [], //选中天数
+        Mold: "0", // 投放类型
       },
-      rules:{
-        advertisementName:[
-          { required: true, message: '请选择广告名称', trigger: 'change' }
-        ]
+      rules: {
+        advertisementName: [
+          {
+            required: true,
+            message: "请选择广告名称",
+            trigger: "change"
+          },
+        ],
+        broadcost: [
+          {
+            required: true,
+            message: "请输入播放时长",
+            trigger: "blur"
+          },
+        ],
       },
       advertisementList: [], //广告名称
-      pickerOptions //日期数据
-    };
+      pickerOptions, //日期数据
+    }
   },
   created() {
-    this.getAdvertisement(); //获取广告名称
+    this.getAdvertisement() //获取广告名称
   },
   methods: {
     //获取广告名称
     getAdvertisement() {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: "MTGGMC"
-        };
-        getDictionaryValueList(params).then(response => {
+          code: "MTGGMC",
+        }
+        getDictionaryValueList(params).then((response) => {
           if (response.state.toLowerCase() === "success") {
-            this.advertisementList = response.data.Rows;
+            this.advertisementList = response.data.Rows
           }
-        });
-      });
+        })
+      })
     },
-    submit(){
-      if(!this.playPlanForm.advertisementName){
-        this.$message.error('请选择广告名称')
+    submit() {
+      if (!this.playPlanForm.advertisementName) {
+        this.$message.error("请选择广告名称")
         return
       }
-      return new Promise(resolve=>{
-        const params={
-          id:this.rowid,
-          F_Type:0,
-          F_StartTime:this.playPlanForm.startDate && this.playPlanForm.startDate[0],//开始时间
-          F_EndTime:this.playPlanForm.startDate[1] && this.playPlanForm.startDate[1],//开始时间
-          F_BroadcastTime:this.playPlanForm.BroadcastTime,//播放时间
-          F_PlayDate:this.playPlanForm.week.toString(),//播放时间
-          F_Name:this.playPlanForm.advertisementName,//广告名称
-          F_BroadcastDuration:this.playPlanForm.broadcost-0,//播出时长
-          F_PlayCount:this.playPlanForm.playNumber-0,//播放次数
-          F_State:this.playPlanForm.state,//状态
-          F_Describe:this.playPlanForm.explain,//播放说明
+      return new Promise((resolve) => {
+        const params = {
+          id: this.rowid,
+          F_Type: 0,
+          F_StartTime: this.playPlanForm.startDate && this.playPlanForm.startDate[0], //开始时间
+          F_EndTime: this.playPlanForm.startDate[1] && this.playPlanForm.startDate[1], //开始时间
+          F_BroadcastTime: this.playPlanForm.BroadcastTime, //播放时间
+          F_BroadcastEndTime: this.playPlanForm.BroadcastEndTime, //当天播放结束时间
+          F_PlayDate: this.playPlanForm.week.toString(), //播放时间
+          F_Name: this.playPlanForm.advertisementName, //广告名称
+          F_BroadcastDuration: this.playPlanForm.broadcost - 0, //播出时长
+          F_PlayCount: this.playPlanForm.playNumber - 0, //播放次数
+          F_State: this.playPlanForm.state, //状态
+          F_Describe: this.playPlanForm.explain, //播放说明
+          F_Mold: this.playPlanForm.Mold, //投放类型
         }
-        saveChange(params).then(response=>{
-          if(response.state.toLowerCase()=='success'){
-            this.$message.success('添加计划成功')
+        saveChange(params).then((response) => {
+          if (response.state.toLowerCase() == "success") {
+            this.$message.success("添加计划成功")
             this.$parent.$layer.close(this.layerid)
             this.$parent.getList()
           }
         })
       })
     },
-  }
-};
+  },
+}
 </script>
 <style lang="scss" scoped>
-</style>
+</style>

CallCenterWeb.UI/src/views/mediaCenter/launchManagment/mediaInformation/manage.vue

@@ -48,9 +48,7 @@
         </el-col>
         <el-col :span="5">
           <el-form-item label="播出时间">
-            <!-- <el-time-picker is-range v-model="playPlanForm.BroadcastTime" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围" value-format="HH:mm:ss"></el-time-picker> -->
             <el-time-picker value-format="HH:mm:ss" v-model="playPlanForm.BroadcastTime" type="date" placeholder="请选择开始时间"></el-time-picker>
-            <!-- <el-time-picker value-format="HH:mm:ss" v-model="playPlanForm.BroadcastTime" type="date" placeholder="请选择结束时间"></el-time-picker> -->
           </el-form-item>
         </el-col>
         <el-col :span="3">
@@ -75,7 +73,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="播出时长">
+          <el-form-item label="播出时长" prop="broadcost">
             <el-input v-model="playPlanForm.broadcost" placeholder="请输入播出时长" onkeyup="value=value.replace(/[^\d.]/g,'')"></el-input>
           </el-form-item>
         </el-col>
@@ -335,7 +333,7 @@ export default {
         advertisementName: "", //广告名称
         advertisementNameId: "", //广告名称id
         week: [], //选中天数
-        Mold: "", // 投放类型
+        Mold: "0", // 投放类型
       },
       renderForm: {
         ReminderTime: "", //提醒时间
@@ -388,6 +386,13 @@ export default {
             trigger: "change",
           },
         ],
+        broadcost: [
+          {
+            required: true,
+            message: "请输入播出时长",
+            trigger: "blur",
+          },
+        ],
       },
       rules3: {
         // F_ChangeType: [
@@ -485,6 +490,10 @@ export default {
         this.$message.error("请选择广告名称")
         return
       }
+      if (!this.playPlanForm.broadcost) {
+        this.$message.error("请输入播放时长")
+        return
+      }
       this.addPlayPlanForm.push({
         F_Type: 0,
         F_StartTime: this.playPlanForm.startDate && this.playPlanForm.startDate[0],
@@ -502,17 +511,17 @@ export default {
         F_Mold: this.playPlanForm.Mold, //投放类型
         key: Date.now(),
       })
-      this.playPlanForm = {
-        startDate: "", //计划时间
-        BroadcastTime: "", //当天播出时间
-        BroadcastEndTime: "", //当天播出结束时间
-        state: "", //状态
-        broadcost: "", //播出时长
-        playNumber: "", //播放次数
-        advertisementName: "", //广告名称
-        advertisementNameId: "", //广告名称id
-        week: [], //选中天数
-      }
+      // this.playPlanForm = {
+      //   startDate: "", //计划时间
+      //   BroadcastTime: "", //当天播出时间
+      //   BroadcastEndTime: "", //当天播出结束时间
+      //   state: "", //状态
+      //   broadcost: "", //播出时长
+      //   playNumber: "", //播放次数
+      //   advertisementName: "", //广告名称
+      //   advertisementNameId: "", //广告名称id
+      //   week: [], //选中天数
+      // }
     },
     //删除计划方法
     removePlan(itemId) {

CallCenterWeb.UI/src/views/mediaCenter/mediaReport/returnVisitData/index.vue

@@ -191,7 +191,7 @@ export default {
       this.groupid = "" // 小组信息
       this.group = "" // 小组名称
     },
-    // 获取分派人员
+    // 获取用户
     getUserAccountListData() {
       this.loading = true
       return new Promise((resolve) => {

CallCenterWeb.UI/src/views/telCall/numberTransferPool/distribution.vue

@@ -13,7 +13,20 @@
         </el-select>
       </el-form-item>
       <el-form-item label="部门" prop="F_DeptName">
-        <el-cascader ref="myCascader" v-model="parentids" :options="departmentDropDatas" :props="props" :placeholder="departmentPlaceholder" :class="{ form_cascader: is_form_cascader }" clearable filterable change-on-select style="width: 100%" @change="handledepartment" :disabled="deptNameDisabled" />
+        <el-cascader
+          ref="myCascader"
+          v-model="parentids"
+          :options="departmentDropDatas"
+          :props="props"
+          :placeholder="departmentPlaceholder"
+          :class="{ form_cascader: is_form_cascader }"
+          clearable
+          filterable
+          change-on-select
+          style="width: 100%"
+          @change="handledepartment"
+          :disabled="deptNameDisabled"
+        />
       </el-form-item>
       <el-form-item label="中心" prop="F_TeamName">
         <el-select v-model="ruleForm.F_TeamName" class="form_select" value-key="F_Id" filterable clearable placeholder="请选择中心" @change="handleteam" :disabled="teamNameDisabled">
@@ -83,8 +96,7 @@ export default {
         F_Handler: "", //分派人员
         F_Type: "1",
       },
-      rules: {
-      },
+      rules: {},
       loading: false,
       departmentDropDatas: [], // 下拉分类
       // 自定义菜单下拉数据的key值
@@ -100,7 +112,15 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(["token", "avatar", "usercode", "groupId", "groupName"]),
+    ...mapGetters([
+      "token",
+      "avatar",
+      "usercode",
+      "groupId",
+      "groupName",
+      "teamName",
+      "teamId",
+    ]),
   },
   created() {
     this.getMediaList()
@@ -115,8 +135,8 @@ export default {
       console.log("this.groupName", this.groupName)
       this.deptNameDisabled = true
       this.teamNameDisabled = true
-      this.ruleForm.F_TeamName = this.groupName
-      this.ruleForm.F_Team = this.groupId
+      this.ruleForm.F_TeamName = this.teamName
+      this.ruleForm.F_Team = this.teamId
       this.getteamList()
     }
   },