问题修改

CallCenterWeb.UI/src/api/commodityManagement/commodityList.js

@@ -43,4 +43,13 @@ export function deleteCommodityList(data) {
   })
 }
 
+// 删除商品列表数据
+export function transferCommodity(params) {
+  return request({
+    url: 'api/Product/allocation',
+    method: 'post',
+    params
+  })
+}
+
 

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

@@ -195,3 +195,12 @@ export function submitChangeCollectionOrderCustomerService(data) {
     data
   })
 }
+
+// 客服提交改代收
+export function agreeChangeCollectionOrderCustomerService(params) {
+  return request({
+    url: 'api/KFOrder/Agree',
+    method: 'post',
+    params
+  })
+}

CallCenterWeb.UI/src/api/memberManagement/memberList.js

@@ -288,4 +288,13 @@ export function getMemberOrderList(params) {
     method: 'get',
     params
   })
+}
+
+// 获取会员订单列表
+export function importMemberErrormsg(params) {
+  return request({
+    url: 'api/ImportOrder/Errormsg',
+    method: 'get',
+    params
+  })
 }

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleEvent/components/detail.vue

@@ -26,6 +26,7 @@
             <el-col :md="6" class="order_detail_item">备用号码：{{ mobile1 | mobileFilter }}</el-col>
             <el-col :md="6" class="order_detail_item">会员标签：{{ type }}</el-col>
             <el-col :md="6" class="order_detail_item">会员类型：{{ F_Membership }}</el-col>
+            <el-col :md="6" class="order_detail_item">会员分类：{{ F_Class }}</el-col>
             <el-col :md="6" class="order_detail_item">会员生日：{{ birthday }}</el-col>
             <el-col :md="6" class="order_detail_item">省份：{{ province }}</el-col>
             <el-col :md="6" class="order_detail_item">市：{{ city }}</el-col>
@@ -465,6 +466,7 @@ export default {
       mobile1: '', // 手机号码1
       type: '', // 会员类型
       F_Membership: '', // 会员等级
+      F_Class: '', // 会员分类
       postcode: '', // 邮编
       shoesize: '', // 鞋码
       regtime: '', // 会员日期
@@ -585,6 +587,7 @@ export default {
         this.phone = res.F_Phone // 固定电话
         this.type = res.F_Label // 会员标签
         this.F_Membership = res.F_Membership// 会员等级
+        this.F_Class = res.F_Class// 会员分类
         this.postcode = res.F_Postcode // 邮编
         this.shoesize = res.F_ShoeSize // 鞋码
         this.regtime = res.F_RegTime // 会员日期

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

@@ -74,6 +74,12 @@
         width=""
       />
       <el-table-column
+        prop="F_Class"
+        label="会员分类"
+        align="center"
+        width=""
+      />
+      <el-table-column
         prop="F_ShoeSize"
         label="鞋码"
         align="center"

CallCenterWeb.UI/src/views/afterSaleManagement/saleOrderList/components/detail.vue

@@ -26,6 +26,7 @@
             <el-col :md="6" class="order_detail_item">备用号码：{{ mobile1 | mobileFilter }}</el-col>
             <el-col :md="6" class="order_detail_item">会员标签：{{ type }}</el-col>
             <el-col :md="6" class="order_detail_item">会员类型：{{ F_Membership }}</el-col>
+            <el-col :md="6" class="order_detail_item">会员分类：{{ F_Class }}</el-col>
             <el-col :md="6" class="order_detail_item">会员生日：{{ birthday }}</el-col>
             <el-col :md="6" class="order_detail_item">省份：{{ province }}</el-col>
             <el-col :md="6" class="order_detail_item">市：{{ city }}</el-col>
@@ -465,6 +466,7 @@ export default {
       mobile1: '', // 手机号码1
       type: '', // 会员类型
       F_Membership: '', // 会员等级
+      F_Class: '', // 会员分类
       postcode: '', // 邮编
       shoesize: '', // 鞋码
       regtime: '', // 会员日期
@@ -586,6 +588,7 @@ export default {
         this.phone = res.F_Phone // 固定电话
         this.type = res.F_Label // 会员标签
         this.F_Membership = res.F_Membership// 会员等级
+        this.F_Class = res.F_Class// 会员分类
         this.postcode = res.F_Postcode // 邮编
         this.shoesize = res.F_ShoeSize // 鞋码
         this.regtime = res.F_RegTime // 会员日期

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

@@ -75,6 +75,12 @@
         width=""
       />
       <el-table-column
+        prop="F_Class"
+        label="会员分类"
+        align="center"
+        width=""
+      />
+      <el-table-column
         prop="F_ShoeSize"
         label="鞋码"
         align="center"

CallCenterWeb.UI/src/views/commodityManagement/commodityDefectiveInventory/components/transfer.vue

@@ -0,0 +1,102 @@
+<template>
+  <div>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
+      <el-form-item label="调拨" prop="type">
+        <el-select
+          v-model="ruleForm.type"
+          class="form_select"
+          filterable
+          clearable
+          placeholder="请选择调拨"
+        >
+          <el-option label="调拨到正常商品" value="0" />
+          <el-option label="调拨到残次商品" value="1" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="数量" prop="count">
+        <el-input v-model.number="ruleForm.count" 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 { transferCommodity } from '@/api/commodityManagement/commodityList'
+export default {
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      ruleForm: {
+        productId: '', // 商品id
+        count: 0, // 数量 
+        type: '',  
+      },
+      rules: {
+        type: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择调拨'
+          }
+        ],
+        count: [
+          {
+            required: false,
+            trigger: 'blur',
+            message: '请输入使用积分'
+          },
+          {
+            type: 'number',
+            message: '使用积分必须为数字'
+          }
+        ],
+      }
+    }
+  },
+  created() {
+    if (this.rowid) {
+      this.ruleForm.productId = this.rowid
+    }
+  },
+  methods: {
+    submitForm() {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const params = {
+            ProductId: this.ruleForm.productId,
+            Count: this.ruleForm.count,
+            type: this.ruleForm.type
+          }
+          transferCommodity(params)
+            .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>
+.form_select {
+  width: 100%
+}
+</style>

CallCenterWeb.UI/src/views/commodityManagement/commodityDefectiveInventory/index.vue

@@ -8,6 +8,11 @@
       <!-- <el-table-column prop="F_Stock1" label="商品数量（新乡仓）" align="center" fixed width=""></el-table-column>
       <el-table-column prop="F_OnSaleBegin" label="上架时间" align="center" fixed width=""></el-table-column>
       <el-table-column prop="F_OnSaleEnd" label="下架时间" align="center" fixed width=""></el-table-column> -->
+      <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
+        <template slot-scope="scope">
+          <el-button v-permission="'HY_transfer'" type="text" @click="btn_transfer(scope.row.F_ProductId)">调拨</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <pagination
       v-show="pageParams.total > 0"
@@ -25,6 +30,7 @@ import { getCommodityList, deleteCommodityList } from '@/api/commodityManagement
 import { getCommodityType } from '@/api/commodityManagement/commodityType'
 import SearchFilter from './components/searchFilter'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+import transfer from './components/transfer'
 
 export default {
   name: 'CommodityStock',
@@ -124,6 +130,17 @@ export default {
         resolve()
       })
     },
+    btn_transfer(id) {
+      this.$layer.iframe({
+        content: {
+          content: transfer, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: id } // props
+        },
+        area: ['40%', '50%'],
+        title: '调拨'
+      }) 
+    }
   }
 }
 </script>

CallCenterWeb.UI/src/views/customerServiceManagement/customerServiceChangeCollection/agree.vue

@@ -0,0 +1,82 @@
+<template>
+  <div>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
+      <el-form-item label="是否同意" prop="state">
+        <el-select
+          v-model="ruleForm.state"
+          class="form_select"
+          filterable
+          clearable
+          placeholder="请选择是否同意"
+        >
+          <el-option label="同意" value="0" />
+          <el-option label="退回" value="1" />
+        </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 { agreeChangeCollectionOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
+export default {
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      ruleForm: {
+        orderids: '', // 订单编号
+        state: '0', // 0同意；1退回
+      },
+      rules: {
+        state: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择是否同意'
+          }
+        ]
+      }
+    }
+  },
+  created() {
+    if (this.rowid) {
+      this.ruleForm.orderids = this.rowid
+    }
+  },
+  methods: {
+    submitForm() {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          agreeChangeCollectionOrderCustomerService(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>
+.form_select {
+  width: 100%
+}
+</style>

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

@@ -7,23 +7,24 @@
         <el-option label="审核通过" value="1"/>
         <el-option label="审核未通过" value="2"/>
       </el-select>
-      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择售后类型">
+      <!-- <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择售后类型">
         <el-option label="调换" value="1"/>
         <el-option label="退货" value="2"/>
-        <!-- <el-option label="部分退货" value="3"/> -->
+        <el-option label="部分退货" value="3"/>
         <el-option label="对发货" value="4"/>
         <el-option label="补发货" value="5"/>
-        <!-- <el-option label="补差额" value="6"/> -->
+        <el-option label="补差额" value="6"/>
         <el-option label="错发" value="7"/>
-        <!-- <el-option label="漏发" value="8"/> -->
-      </el-select>
+        <el-option label="漏发" value="8"/>
+      </el-select> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_batch_signfor'" type="primary" class="filter-item" @click="btn_batch_signfor">批量签收</el-button>
       <el-button v-permission="'HY_batch_rejection'" type="primary" class="filter-item" @click="btn_batch_rejection">批量拒收</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
-      <el-tab-pane label="未签收" name="0"/>
+      <el-tab-pane label="未处理" name="-1"/>
+      <el-tab-pane label="已处理" name="0"/>
       <el-tab-pane label="已签收" name="1"/>
       <el-tab-pane label="已拒收" name="2"/>
     </el-tabs>
@@ -61,6 +62,12 @@
         <template slot-scope="scope">
           <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
           <el-button
+            v-permission="'HY_agree'"
+            v-if="authority_agree()"
+            type="text"
+            @click="btn_agree(scope.row.F_OrderId)"
+          >同意</el-button>
+          <el-button
             v-permission="'HY_signfor'"
             v-if="authority_signfor(scope.row.F_IsSignfor)"
             type="text"
@@ -94,15 +101,16 @@
 
 <script>
 import { getDictionaryValueList } from '@/api/commonAPI'
-import { signforChangeCollectionOrderCustomerService, submitChangeCollectionOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
+import { signforChangeCollectionOrderCustomerService, submitChangeCollectionOrderCustomerService, agreeChangeCollectionOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
 import { getAfterSaleList, deleteAfterSaleList } from '@/api/afterSaleManagement/afterSaleList'
 import { pickerOptions, formatterContent } from '@/utils'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
 import detail from '@/views/orderManagement/orderList/detail'
 import afterSaleDetail from '@/views/afterSaleManagement/afterSaleList/afterSaleDetail'
+import agree from './agree'
 
 export default {
-  name: 'ConsolidateOrderList',
+  name: 'CustomerServiceChangeCollection',
   components: {
     Pagination
   },
@@ -143,9 +151,11 @@ export default {
       loading: false,
       searchData: {
         checkState: '-2', // 售后审核状态
-        type: '' // 售后类型
+        type: '', // 售后类型
+        woState: '-1', // -1未处理 0已处理
+        isSignfor: '',
       },
-      activeName: '0',
+      activeName: '-1',
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
@@ -179,7 +189,8 @@ export default {
           pagesize: 1000000, // int 每页几条信息
           F_PayState: '-2',
           F_ReturnType: '改代收',
-          IsSignfor: this.activeName
+          IsSignfor: this.searchData.isSignfor,
+          F_WoState: this.searchData.woState,
         }
         getAfterSaleList(params).then(response => {
           this.loading = false
@@ -273,6 +284,17 @@ export default {
           })
         })
     },
+    btn_agree(id) {
+      this.$layer.iframe({
+        content: {
+          content: agree, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: id } // props
+        },
+        area: ["30%", "30%"],
+        title: "是否同意"
+      });
+    },
     // 签收
     btn_signfor(id, orderId) {
       this.$confirm('确定签收吗?', '提示', {
@@ -405,9 +427,17 @@ export default {
         title: '售后列表详情'
       })
     },
+    //同意
+    authority_agree() {
+      if (this.activeName == '-1') {
+        return true
+      } else {
+        return false
+      }
+    },
     // 签收
     authority_signfor(state) {
-      if (state == 0) {
+      if (this.activeName == '0') {
         return true
       } else {
         return false
@@ -423,6 +453,19 @@ export default {
     },
     handleTabClick(tab, event) {
       this.pageParams.pageindex = 1
+      if (this.activeName == '-1') {
+        this.searchData.woState = '-1'
+        this.searchData.isSignfor = ''
+      } else if (this.activeName == '0') {
+        this.searchData.woState = '0'
+        this.searchData.isSignfor = ''
+      } else if (this.activeName == '1') {
+        this.searchData.woState = ''
+        this.searchData.isSignfor = '1'
+      } else if (this.activeName == '2') {
+        this.searchData.woState = ''
+        this.searchData.isSignfor = '2'
+      }
       this.getList()
     },
     btn_search() {

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

@@ -26,6 +26,7 @@
             <el-col :md="6" class="order_detail_item">备用号码：{{ mobile1 | mobileFilter }}</el-col>
             <el-col :md="6" class="order_detail_item">会员标签：{{ type }}</el-col>
             <el-col :md="6" class="order_detail_item">会员类型：{{ F_Membership }}</el-col>
+            <el-col :md="6" class="order_detail_item">会员分类：{{ F_Class }}</el-col>
             <el-col :md="6" class="order_detail_item">会员生日：{{ birthday }}</el-col>
             <el-col :md="6" class="order_detail_item">省份：{{ province }}</el-col>
             <el-col :md="6" class="order_detail_item">市：{{ city }}</el-col>
@@ -466,6 +467,7 @@ export default {
       mobile1: '', // 手机号码1
       type: '', // 会员类型
       F_Membership: '', // 会员等级
+      F_Class: '', // 会员分类
       postcode: '', // 邮编
       shoesize: '', // 鞋码
       regtime: '', // 会员日期
@@ -587,6 +589,7 @@ export default {
         this.phone = res.F_Phone // 固定电话
         this.type = res.F_Label // 会员标签
         this.F_Membership = res.F_Membership// 会员等级
+        this.F_Class = res.F_Class// 会员分类
         this.postcode = res.F_Postcode // 邮编
         this.shoesize = res.F_ShoeSize // 鞋码
         this.regtime = res.F_RegTime // 会员日期

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

@@ -79,6 +79,12 @@
         width=""
       />
       <el-table-column
+        prop="F_Class"
+        label="会员分类"
+        align="center"
+        width=""
+      />
+      <el-table-column
         prop="F_ShoeSize"
         label="鞋码"
         align="center"

CallCenterWeb.UI/src/views/systemSetup/roleSetting/department/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="8">
+      <el-col :span="6">
         <div class="filter-container">
           <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add()">添加</el-button>
           <el-button type="primary" class="filter-item" icon="el-icon-edit" @click="btn_edit()">编辑</el-button>
@@ -13,17 +13,7 @@
           >删除</el-button>
         </div>
         <el-alert :closable="false" title="部门分类" type="success" />
-        <el-table
-          v-loading="loading"
-          :data="departmentDataLists"
-          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-          highlight-current-row
-          border
-          row-key="F_DeptId"
-          default-expand-all
-          @current-change="handleCurrentChange"
-          @row-click="openEdit"
-        >
+        <el-table v-loading="loading" :data="departmentDataLists" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" highlight-current-row border row-key="F_DeptId" default-expand-all @current-change="handleCurrentChange" @row-click="openEdit">
           <el-table-column prop="F_DeptName" label="部门名称" align="center" min-width />
           <!-- <el-table-column prop="F_Lock" label="锁定" align="center" min-width="">
             <template slot-scope="scope">
@@ -54,7 +44,7 @@
             >添加</el-button>
           </div>
           <el-alert :closable="false" title="中心分类" type="success" />
-          <el-table v-loading="loading" :data="dataLists" border stripe @row-click="handleTableClick">
+          <el-table v-loading="loading" :data="dataLists" border stripe @row-click="handleTableClick" highlight-current-row>
             <el-table-column type="index" label="编号" align="center" fixed width="60" />
             <el-table-column prop="F_DeptName" label="部门名称" align="center" min-width />
             <el-table-column prop="F_Name" label="中心名称" align="center" min-width />
@@ -97,7 +87,7 @@
           />
         </div>
       </el-col>
-      <el-col :span="8">
+      <el-col :span="10">
         <div>
           <div class="filter-container search">
             <el-input v-model="teamkeyword" placeholder="请输入关键字" class="filter-item" />
@@ -116,7 +106,7 @@
             >添加</el-button>
           </div>
           <el-alert :closable="false" title="小组分类" type="success" />
-          <el-table v-loading="loading" :data="teamLists" border stripe>
+          <el-table v-loading="loading" :data="teamLists" border stripe highlight-current-row>
             <el-table-column type="index" label="编号" align="center" fixed width="50" />
             <el-table-column prop="F_DeptName" label="部门名称" align="center" min-width />
             <el-table-column prop="F_Name" label="小组名称" align="center" min-width />
@@ -341,6 +331,7 @@ export default {
       } else {
         this.depId = 0
       }
+      this.teamLists = []
     },
 
     // 获取中心列表数据
@@ -434,7 +425,7 @@ export default {
         const params = {
           pageindex: this.pageParamsGrop.pageindex, // 第几页
           pagesize: this.pageParamsGrop.pagesize, // 每页几条信息
-          praentid: this.clickId,
+          parentid: this.clickId,
           key: this.teamkeyword.trim(),
           deptid: this.depId,
           type: 1

CallCenterWeb.UI/src/views/systemSetup/roleSetting/userManage/addOrEdit.vue

@@ -513,12 +513,11 @@ export default {
           const res = response.data
           // headimg: '', // 头像大图
           // head_small_img: '', // 头像缩略图
-
           this.ruleForm.usercode = res.F_UserCode // 工号
           this.ruleForm.username = res.F_UserName // 姓名
           this.ruleForm.extensionnumber = res.F_ExtensionNumber // 分机号
           this.ruleForm.roleid = res.F_RoleId // 角色
-          this.ruleForm.dutyid = res.F_DutyId.toString() // 职位
+          this.ruleForm.dutyid = res.F_DutyId && res.F_DutyId + '' // 职位
           this.ruleForm.deptid = res.F_DeptId // 所属部门
           this.ruleForm.dept = res.F_Dept
           this.ruleForm.deptteamid = res.F_DeptTeamId // 团队
@@ -529,8 +528,8 @@ export default {
           this.ruleForm.fulldate = res.F_FullDate // 转正日期
           this.ruleForm.termdate = res.F_TermDate // 离职日期
           this.ruleForm.seatlevel = res.F_SeatLevel // 坐席等级
-          this.ruleForm.sexflag = res.F_SexFlag && res.F_SexFlag.toString() //
-          this.ruleForm.remindflag = res.F_RemindFlag.toString() // 提醒标志
+          this.ruleForm.sexflag = res.F_SexFlag && res.F_SexFlag + '' //
+          this.ruleForm.remindflag = res.F_RemindFlag && res.F_RemindFlag + '' // 提醒标志
           this.ruleForm.telephone = res.F_Telephone // 电话
           this.ruleForm.mobile = res.F_Mobile // 手机号码
           this.ruleForm.homephone = res.F_HomePhone // 家庭电话
@@ -541,10 +540,10 @@ export default {
           this.ruleForm.remark = res.F_Remark
           this.departmentPlaceholder = res.F_Dept
           // 话务相关
-          this.ruleForm.seatflag = res.F_SeatFlag.toString() // 话务标志
+          this.ruleForm.seatflag = res.F_SeatFlag && res.F_SeatFlag + '' // 话务标志
           this.seatFlag = res.F_SeatFlag
           this.ruleForm.seartgroupiD = res.F_SeartGroupID // 坐席组id
-          this.ruleForm.seatright = res.F_SeatRight === null ? res.F_SeatRight : res.F_SeatRight.toString() // 坐席类型 默认普通坐席
+          this.ruleForm.seatright = res.F_SeatRight === null ? res.F_SeatRight : res.F_SeatRight + '' // 坐席类型 默认普通坐席
         }
         // if (this.ruleForm.deptid) {
         //   this.getTeam(this.ruleForm.deptid)

CallCenterWeb.UI/src/views/systemSetup/roleSetting/userManage/importUser.vue

@@ -0,0 +1,129 @@
+<template>
+  <div class="importFile">
+    <el-alert title="选取的EXCEL文件需要严格按照下载的EXCEL模板进行填写！选择好文件后点击导入即可！" type="warning" class="md" show-icon/>
+    <el-row>
+      <el-col :lg="7" class="md">
+        <a :href="downloadUrl" download="用户导入模板.xlsx" class="download_btn" title="点击下载EXCEL模板" rel="nofollow">
+          下载EXCEL模板
+        </a>
+      </el-col>
+      <el-col :lg="17" class="md">
+        <el-upload
+          ref="upload"
+          :limit="1"
+          :file-list="uploadData.fileList"
+          :action= "uploadData.uploadUrl"
+          :data = "uploadData.uploaderFiles"
+          :on-success="uploadSuccess"
+          :on-error="uploadError"
+          :on-exceed="uploadExceed"
+          :auto-upload="false"
+          :headers = "uploadData.uploadHeader"
+          class="uploadFiles"
+          list-type="text"
+          name="upFile"
+          accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel">
+          <el-button slot="trigger" size="small" type="primary">选取EXCEL文件</el-button>
+          <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">导入</el-button>
+          <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
+        </el-upload>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+
+export default {
+  name: 'ImportFile',
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      downloadUrl: '/static/xls/importUser.xlsx',
+      uploadData: {// 文件上传数据
+        uploadHeader: {
+          Authorization: getToken(),
+        },
+        uploadUrl: this.$store.getters.serverConfig.BASE_API + 'api/UserAccount/importexcel',
+        uploaderFiles: {// 上传文件的参数
+        
+        },
+        fileList: [], // 展示文件的数据
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    submitUpload() {
+      this.$refs.upload.submit()
+    },
+    // 文件上传
+    uploadSuccess(response, file, fileList) {
+      if (response.state.toLowerCase() === 'success') {
+        this.$parent.$layer.close(this.layerid)
+        this.$parent.getList() // 重新加载父级数据
+        this.$message.success('恭喜你，导入成功!')
+      } else {
+        this.$message.error(response.message)
+      }
+    },
+    uploadExceed(file, fileList) {
+      this.$message.warning('只能选择一个文件!')
+    },
+    uploadError(err, file, fileList) {
+      this.$message.error(err)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.importFile{
+		.md{
+			margin-bottom: 20px;
+		}
+		.download_btn{
+			display: inline-block;
+			line-height: 1;
+			white-space: nowrap;
+			cursor: pointer;
+			border: 1px solid #dcdfe6;
+			-webkit-appearance: none;
+			text-align: center;
+			-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+			outline: 0;
+			margin: 0;
+			-webkit-transition: .1s;
+			transition: .1s;
+			font-weight: 500;
+			padding: 9px 15px;
+			font-size: 12px;
+			border-radius: 4px;
+			color: #fff;
+			background-color: #409EFF;
+			border-color: #409EFF;
+			&:hover{
+				background: #66b1ff;
+				border-color: #66b1ff;
+				color: #fff;
+			}
+			&:active{
+				background: #66b1ff;
+				border-color: #66b1ff;
+				color: #fff;
+			}
+		}
+	}
+</style>

CallCenterWeb.UI/src/views/systemSetup/roleSetting/userManage/index.vue

@@ -19,6 +19,7 @@
       <el-input v-model="keyword" 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_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
+      <el-button v-permission="'HY_import'" type="primary" class="filter-item" @click="btn_import">导入</el-button>
       <el-button v-permission="'HY_deletes'" type="primary" class="filter-item" icon="el-icon-delete" @click="btn_deletes">批量删除</el-button>
     </div>
 
@@ -27,6 +28,8 @@
       <el-table-column prop="F_UserCode" label="工号" align="center" min-width=""/>
       <el-table-column prop="F_UserName" label="姓名" align="center" min-width=""/>
       <el-table-column prop="F_Dept" label="部门" align="center" min-width=""/>
+      <el-table-column prop="F_DeptTeam" label="中心" align="center" min-width=""/>
+      <el-table-column prop="F_Group" label="小组" align="center" min-width=""/>
       <el-table-column prop="F_Role" label="角色" align="center" min-width=""/>
       <el-table-column prop="F_SeartGroup" label="坐席组" align="center" min-width=""/>
       <el-table-column label="标志" align="center" min-width="">
@@ -43,8 +46,6 @@
       <el-table-column prop="F_Telephone" label="电话" align="center" min-width=""/>
       <el-table-column prop="F_Mobile" label="手机" align="center" min-width=""/>
       <el-table-column prop="F_Duty" label="职位" align="center" min-width=""/>
-      <el-table-column prop="F_DeptTeam" label="团队" align="center" min-width=""/>
-      <el-table-column prop="F_Group" label="团队" align="center" min-width=""/>
       <el-table-column prop="F_EntryDate" label="入职日期" align="center" min-width=""/>
       <el-table-column prop="F_FullDate" label="转正日期" align="center" min-width=""/>
       <el-table-column prop="F_TermDate" label="离职日期" align="center" min-width=""/>
@@ -75,6 +76,7 @@ import { getRoleSelect } from '@/api/commonAPI'
 import { getTreeList } from '@/api/systemSetup/roleSetting/department'
 import addOrEdit from './addOrEdit'
 import modifyPass from './modifyPass'
+import importUser from './importUser'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
 
 export default {
@@ -230,6 +232,18 @@ export default {
       }
       this.btn_delete(ids)
     },
+    // 导入
+    btn_import() {
+      this.$layer.iframe({
+        content: {
+          content: importUser, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: '' } // props
+        },
+        area: ['30%', '30%'],
+        title: '导入'
+      })
+    },
     // 获取角色下拉
     getRoleSelects() {
       getRoleSelect().then(response => {