来电弹屏、号码中转池

CallCenterWeb.UI/src/api/telCall/numberTransferPool.js

@@ -21,7 +21,7 @@ export function addNumberTransferPoolList (params) {
 // 修改号码中转池列表
 export function editNumberTransferPoolList (params) {
   return request({
-    url: 'api/Distribution/add',
+    url: 'api/Distribution/update',
     method: 'post',
     params
   })
@@ -39,7 +39,7 @@ export function deleteNumberTransferPoolList (params) {
 // 分配号码中转池
 export function distributionNumberTransferPoolList (params) {
   return request({
-    url: 'api/Distribution/delete',
+    url: 'api/Distribution/distribution',
     method: 'post',
     params
   })

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-form ref="ruleForm" :model="ruleForm" label-width="80px">
-      <el-form-item label="是否可见">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
+      <el-form-item label="是否可见" prop="F_IsSo">
         <el-select v-model="ruleForm.F_IsSo" class="form_select" filterable clearable placeholder="是否可见" >
           <el-option label="否" value="0"></el-option>
           <el-option label="是" value="1"></el-option>
@@ -42,6 +42,15 @@ export default {
         F_Content: '', // 备注内容
         F_State: 0,
       },
+      rules: {
+        F_IsSo: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择是否可见'
+          }
+        ],
+      }
     };
   },
   created() {
@@ -54,33 +63,40 @@ export default {
   },
   methods: {
     submitForm() {
-      //添加
-      if (!this.ruleForm.F_ID) {
-        addAfterSaleListChatLog(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;
-          });
-        return
-      }
-      //编辑
-      editAfterSaleListChatLog(this.ruleForm)
-        .then((response) => {
-          if (response.state.toLowerCase() === "success") {
-            this.$parent.$layer.close(this.layerid);
-            this.$parent.getDetail(this.ruleForm.F_WoID); // 重新加载父级数据
-            this.$message.success("编辑成功!");
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          //添加
+          if (!this.ruleForm.F_ID) {
+            addAfterSaleListChatLog(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;
+              });
+            return
           }
-        })
-        .catch(() => {
-          this.loading = false;
-        });
+          //编辑
+          editAfterSaleListChatLog(this.ruleForm)
+            .then((response) => {
+              if (response.state.toLowerCase() === "success") {
+                this.$parent.$layer.close(this.layerid);
+                this.$parent.getDetail(this.ruleForm.F_WoID); // 重新加载父级数据
+                this.$message.success("编辑成功!");
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        } else {
+          this.$message.error('请输入有效的必填项信息!')
+          return false
+        }
+      })
     },
   },
 };

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

@@ -132,6 +132,23 @@
           </el-form-item>
         </el-col>
         <el-col :xl="6" :md="8">
+          <el-form-item label="会员分类" prop="F_Class">
+            <el-select
+              v-model="ruleForm.F_Class"
+              clearable
+              placeholder="请选择会员分类"
+              class="form_select"
+            >
+              <el-option
+                v-for="item in memberClass"
+                :key="item.F_ID"
+                :label="item.F_Name"
+                :value="item.F_Name"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :md="8">
           <el-form-item label="会员生日" prop="F_Birthday">
             <el-date-picker
               value-format="yyyy-MM-dd"
@@ -264,6 +281,7 @@ export default {
       vipid: 0,
       sourceOptions: [], // 工单来源下拉数据
       memberType: [], // 会员类型下拉数据
+      memberClass: [], // 会员分类数据
       recommendList: [], // 会员列表数据
       recommendListOptions: [], // 会员列表数据
       placeholderArea: '', // 地区默认值
@@ -305,6 +323,7 @@ export default {
         F_Mobile1: "", //手机号码1
         F_Phone: "", //固定电话
         F_Type: "", //会员类型
+        F_Class: "", //会员分类
         // province: "", //省
         // city: "", //市
         // county: "", //县/区
@@ -365,7 +384,7 @@ export default {
     console.log(this.callinNum + '====' + this.vipid)
     Promise.all([]).then(() => {
       this.getType();
-
+      this.getClass();
       if (this.callinNum) {
         this.ruleForm.F_Phone = this.callinNum
         this.getDetail(this.callinNum);
@@ -400,6 +419,7 @@ export default {
               sex: this.ruleForm.F_Sex, //性别
               age: this.ruleForm.F_Age, //年龄
               label: this.ruleForm.F_Type, //会员类型
+              F_Class: this.ruleForm.F_Class, //会员分类
               address: this.ruleForm.F_Address, // 详细地址
               address1: this.ruleForm.F_Address1, // 备用地址1
               address2: this.ruleForm.F_Address2, // 备用地址2
@@ -524,14 +544,13 @@ export default {
             this.ruleForm = response.rows.Rows[0];
             response.data = response.rows.Rows[0];
             this.ruleForm.id = response.rows.Rows[0].F_ID;
-            this.ruleForm.F_Type = response.rows.Rows[0].F_Label
+            this.ruleForm.F_Class = response.rows.Rows[0].F_Label
             if (response.data.F_Province && response.data.F_City) {
               this.placeholderArea = response.data.F_Province + '/'
             } else {
               if (response.data.F_Province) {
                 this.placeholderArea = '请选择地区'
               }
-
             }
             if (response.data.F_City && response.data.F_Area) {
               this.placeholderArea += response.data.F_City + '/'
@@ -548,7 +567,7 @@ export default {
             }
             this.provinceCityText = this.placeholderArea.split('/')
           }
-
+          this.$emit('cus-info-list', response.rows.Rows)
         }
       });
     },
@@ -590,6 +609,21 @@ export default {
         })
       })
     },
+    // 获取会员分类
+    getClass () {
+      return new Promise(resolve => {
+        const params = {
+          pageindex: 1,
+          pagesize: 100,
+          type: 1
+        }
+        getLabelLists(params).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.memberClass = response.rows.Rows
+          }
+        })
+      })
+    },
     // 获取推荐人列表
     getRecommendList() {
       this.loading = true

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

@@ -84,9 +84,9 @@
             </el-col>
             <el-col :md="5" :lg="6">
               <div class="callin_btns">
-                <!-- <el-tooltip content="点击创建订单" placement="top">
+                <el-tooltip content="点击创建订单" placement="top">
                   <i class="callin_btn callinorder" v-show="orderTrue" @click="btn_orderAdd" />
-                </el-tooltip> -->
+                </el-tooltip>
                 <!-- <el-tooltip content="点击创建客户项目" placement="top">
                   <i class="callin_btn callinpro" @click="btn_customerProAdd" />
                 </el-tooltip> !dropoff && !isBlack-->
@@ -103,7 +103,6 @@
             </el-col>
           </el-row>
         </el-card>
-
         <!-- 客户资料 -->
         <el-card v-show="orderTrue" shadow="hover" class="customer_info">
           <h5 class="customer_title">会员资料</h5>
@@ -111,9 +110,9 @@
             :callin-num="callinNum"
             :vipid="vipid"
             @getCusProLists="getCusProList"
+            @cus-info-list="getCusInfosDetail"
           />
         </el-card>
-
         <!-- 切换列表 -->
         <el-card shadow="hover" class="records">
           <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -263,7 +262,6 @@ export default {
     },
     // 获取客户信息
     getCusInfos () {
-      console.log(this.callinNum)
       getCusUser(this.callinNum).then(response => {
         if (response.state.toLowerCase() === 'success') {
           const res = response.rows.Rows[0]
@@ -276,16 +274,26 @@ export default {
         }
       })
     },
+    getCusInfosDetail (data) {
+      this.vipid = data.F_ID
+    },
     // 添加工单
     btn_orderAdd () {
+      if (this.vipid == 0) {
+        this.$message({
+          message: '请先添加会员信息!',
+          type: 'error'
+        })
+        return
+      }
       this.$layer.iframe({
         content: {
           content: addOrder, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: {
-            rowid: '',
-            callid: this.callinCallid,
-            callinNum: this.callinNum
+            rowid: this.vipid,
+            // callid: this.callinCallid,
+            // callinNum: this.callinNum
           } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
         area: ['80%', '90%'],

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

@@ -244,22 +244,22 @@ export default {
           type: 'number',
           message: '市场价格必须为数字'
         }],
-        MemberPrice: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入会员价格',
-        },{
-          type: 'number',
-          message: '会员价格必须为数字'
-        }],
-        SpecialPrice: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入特惠价格',
-        },{
-          type: 'number',
-          message: '特惠价格必须为数字'
-        }],
+        // MemberPrice: [{
+        //   required: true,
+        //   trigger: 'blur',
+        //   message: '请输入会员价格',
+        // },{
+        //   type: 'number',
+        //   message: '会员价格必须为数字'
+        // }],
+        // SpecialPrice: [{
+        //   required: true,
+        //   trigger: 'blur',
+        //   message: '请输入特惠价格',
+        // },{
+        //   type: 'number',
+        //   message: '特惠价格必须为数字'
+        // }],
         PinyinShort: [{
           required: true,
           trigger: 'blur',

CallCenterWeb.UI/src/views/memberManagement/memberClassification/addOrEdit.vue

@@ -0,0 +1,168 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
+      <el-form-item label="预览结果">
+        <el-tag :color=ruleForm.labelColor :style="{'color':ruleForm.fontSizeColor}">{{ruleForm.labelName}}</el-tag>
+      </el-form-item>
+      <el-form-item label="分类名称" prop="labelName">
+        <el-input v-model="ruleForm.labelName" placeholder="请输入分类名称"></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="labelDescription">
+        <el-input v-model="ruleForm.labelDescription" placeholder="请输入备注"></el-input>
+      </el-form-item>
+      <el-form-item label="分类颜色" prop="labelColor">
+        <el-color-picker v-model="ruleForm.labelColor" @change='handleColor'></el-color-picker>
+      </el-form-item>
+      <el-form-item label="分类字体颜色" prop="fontSizeColor">
+        <el-color-picker v-model="ruleForm.fontSizeColor" @change='handleFontSizeColor'></el-color-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+        <el-button @click="resetForm">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getProviceCity, getDictionary } from '@/api/commonAPI'
+import { addLable , editLable,getLableDetail} from '@/api/memberManagement/memberList'
+import { validateTel } from '@/utils/validate'
+import { filterContent } from '@/utils'
+
+export default {
+  name: 'AddOrEdit',
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    callid: {
+      type: Number,
+      default: 0
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      props: { // 自定义省市下拉数据的key值
+        value: 'code',
+        label: 'name',
+        children: 'entityJson'
+      },
+      sourceOptions: [], // 工单来源下拉数据
+      ruleForm: {
+        unique_id: '', //		否	string	callid
+        id: '',
+        fontSizeColor: '',//分类字体颜色
+        labelName: '',//分类名称
+        labelColor: '#fff',//分类颜色
+        labelDescription: '',//分类描述
+        type: 1, // 0-标签 1-分类
+      },
+      rules: {
+        labelName: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入分类名称',
+        }]
+      },
+      loading: false
+    }
+  },
+  created() {
+    if (this.callid) {
+      this.ruleForm.unique_id = this.callid
+    }
+    Promise.all([])
+      .then(() => {
+        if (this.rowid) {
+          this.ruleForm.id = this.rowid
+          this.getDetail(this.rowid)
+        }
+      })
+  },
+  methods: {
+    submitForm() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.ruleForm.content = filterContent.delHtmlTag(this.ruleForm.content)// 保存内容时去掉 html 分类
+          this.loading = true
+          return new Promise(response=>{
+            const params={
+              id:this.rowid ? this.rowid : '',//修改id值
+              state:1,
+              name:this.ruleForm.labelName,//分类名称
+              labelcolor:this.ruleForm.labelColor,//分类颜色
+              note:this.ruleForm.labelDescription,//分类描述
+              fontcolor:this.ruleForm.fontSizeColor,//分类字体颜色
+              type: this.ruleForm.type, // 0-标签 1-分类
+            }
+              // 添加
+            if (!this.rowid) {
+              addLable(params).then(response => {
+                this.loading = false
+                if (response.state.toLowerCase() === 'success') {
+                  this.$parent.$layer.close(this.layerid)
+                  if (this.callid) {
+                    this.$parent.getOrderRecord() // 重新加载来电弹屏工单记录
+                  } else {
+                    this.$parent.getList() // 重新加载父级数据
+                  }
+                  this.$message.success('恭喜你，添加成功!')
+                }
+              }).catch(() => {
+                this.loading = false
+              })
+              return
+            }
+            // 编辑
+            editLable(params).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
+        }
+      })
+    },
+    resetForm() {
+      this.$refs.ruleForm.resetFields()
+    },
+    // 详情
+    getDetail(rid) {
+      getLableDetail(rid).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          this.ruleForm.labelName = response.data.F_Name;
+          this.ruleForm.labelColor = response.data.F_LabelColor;
+          this.ruleForm.labelDescription = response.data.F_Note;
+          this.ruleForm.fontSizeColor = response.data.F_FontColor;
+        }
+      })
+    },
+    handleColor(val){
+      this.ruleForm.labelColor=val
+    },
+    handleFontSizeColor(val){
+      this.ruleForm.fontSizeColor=val
+    },
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_form .form_select{
+	width: 100%;
+}
+</style>

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

@@ -0,0 +1,136 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input v-model="label_name" placeholder="请输入分类名称" class="filter-item"></el-input>
+      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
+      <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
+    </div>
+    <el-table v-loading="loading" :data="dataLists" border stripe>
+      <el-table-column type="index" label="编号" align="center" fixed width=""></el-table-column>
+      <el-table-column label="分类名称" align="center" fixed width="">
+        <template slot-scope="scope">
+            <el-tag :color=scope.row.F_LabelColor :style="{'color':scope.row.F_FontColor}">{{scope.row.F_Name}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="F_Note" label="备注" align="center">
+      </el-table-column>
+      <el-table-column label="操作" width="220" align="center" class-name="oparate_btn" fixed="right">
+        <template slot-scope="scope">
+          <el-button  type="text" @click="btn_edit(scope.row.F_ID.toString())">编辑</el-button>
+          <el-button  type="text" @click="btn_delete(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 { getLabelLists,deleteLable } from '@/api/memberManagement/memberList'
+import addOrEdit from './addOrEdit'
+import { formatterContent } from '@/utils'
+import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+
+export default {
+  name: 'memberLabel',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      loading: false,
+      label_name: '',//分类名
+      label_note: '',//分类描述
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      dataLists: [] // 列表数据
+    }
+  },
+  created() {
+    this.getList()
+    document.onkeyup = (e) => {
+      if (e.keyCode === 13) {
+        this.getList()
+      }
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: this.pageParams.pageindex, // int 第几页
+          pagesize: this.pageParams.pagesize, // int 每页几条信息
+          keyword: this.label_name.trim(),//搜索分类名
+          type: 1, // 0-标签 1-分类
+        }
+        getLabelLists(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            console.log(response)
+            this.pageParams.total = response.rows.Totals
+            this.dataLists = response.rows.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    btn_search() {
+      this.pageParams.pageindex = 1
+      this.getList()
+    },
+    btn_add() {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        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(editId) {
+      this.$confirm('您确定要将此分类删除吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteLable(editId).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.getList()
+            this.$message.success('删除成功!')
+          }
+        })
+      }).catch(() => {
+        this.$message.info('已取消删除')
+      })
+    },
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>

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

@@ -5,7 +5,6 @@
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
     </div>
-
     <el-table v-loading="loading" :data="dataLists" border stripe>
       <el-table-column type="index" label="编号" align="center" fixed width=""></el-table-column>
       <el-table-column label="标签名称" align="center" fixed width="">

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

@@ -57,6 +57,15 @@
             :value="item.F_Name"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="会员分类" prop="F_Class">
+        <el-select v-model="ruleForm.F_Class" clearable placeholder="请选择会员分类" class="form_select">
+          <el-option
+            v-for="item in memberClass"
+            :key="item.F_ID"
+            :label="item.F_Name"
+            :value="item.F_Name"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="默认地区" prop="provinceCity">
         <el-cascader
           ref="myCascader"
@@ -184,6 +193,7 @@ export default {
       aa: '',
       sourceOptions: [], // 工单来源下拉数据
       memberType: [], // 会员类型下拉数据
+      memberClass: [], // 会员分类数据
       recommendList: [], // 会员列表数据
       recommendListOptions: [], // 会员列表数据
       provinceCityDatas: [], // 省市下拉数据
@@ -224,6 +234,7 @@ export default {
         backupMobile: '', // 备用号码
         F_Phone: '', // 主号码
         F_Type: '', // 会员类型
+        F_Class: '', // 会员分类
         // province: "", //省
         // city: "", //市
         // county: "", //县/区
@@ -279,6 +290,7 @@ export default {
     }
     Promise.all([]).then(() => {
       this.getType()
+      this.getClass()
       if (this.rowid) {
         this.ruleForm.id = this.rowid
         this.getDetail(this.rowid)
@@ -315,6 +327,7 @@ export default {
               sex: this.ruleForm.F_Sex, // 性别
               age: this.ruleForm.F_Age, // 年龄
               label: this.ruleForm.F_Type, // 会员类型
+              F_Class: this.ruleForm.F_Class, // 会员分类
               address: this.ruleForm.F_Address, // 详细地址
               address1: this.ruleForm.F_Address1, // 备用地址1
               address2: this.ruleForm.F_Address2, // 备用地址2
@@ -389,6 +402,7 @@ export default {
         const res = response.model
         this.ruleForm = response.model
         this.ruleForm.F_Type = res.F_Label
+        // this.ruleForm.F_Class = res.F_Class
         this.ruleForm.F_RecommenderID = res.F_RecommenderID + ''
         this.recommendNameRemind = res.F_Recommender
         this.ruleForm.F_Recommender = res.F_Recommender
@@ -489,6 +503,21 @@ export default {
         })
       })
     },
+    // 获取会员分类
+    getClass() {
+      return new Promise(resolve => {
+        const params = {
+          pageindex: 1,
+          pagesize: 100,
+          type: 1
+        }
+        getLabelLists(params).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.memberClass = response.rows.Rows
+          }
+        })
+      })
+    },
     addMobile() {
       if (this.ruleForm.backupMobile.length !== 11) {
         this.$message({

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-form ref="ruleForm" :model="ruleForm" label-width="80px">
-      <el-form-item label="是否可见">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
+      <el-form-item label="是否可见" prop="F_IsSo">
         <el-select v-model="ruleForm.F_IsSo" class="form_select" filterable clearable placeholder="是否可见" >
           <el-option label="否" value="0"></el-option>
           <el-option label="是" value="1"></el-option>
@@ -42,6 +42,15 @@ export default {
         F_Content: '', // 备注内容
         F_State: 0, // 0-工单 1-会员
       },
+      rules: {
+        F_IsSo: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择是否可见'
+          }
+        ],
+      }
     };
   },
   created() {
@@ -54,33 +63,40 @@ export default {
   },
   methods: {
     submitForm() {
-      //添加
-      if (!this.ruleForm.F_ID) {
-        addAfterSaleListChatLog(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;
-          });
-        return
-      }
-      //编辑
-      editAfterSaleListChatLog(this.ruleForm)
-        .then((response) => {
-          if (response.state.toLowerCase() === "success") {
-            this.$parent.$layer.close(this.layerid);
-            this.$parent.getDetail(this.ruleForm.F_WoID); // 重新加载父级数据
-            this.$message.success("编辑成功!");
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          //添加
+          if (!this.ruleForm.F_ID) {
+            addAfterSaleListChatLog(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;
+              });
+            return
           }
-        })
-        .catch(() => {
-          this.loading = false;
-        });
+          //编辑
+          editAfterSaleListChatLog(this.ruleForm)
+            .then((response) => {
+              if (response.state.toLowerCase() === "success") {
+                this.$parent.$layer.close(this.layerid);
+                this.$parent.getDetail(this.ruleForm.F_WoID); // 重新加载父级数据
+                this.$message.success("编辑成功!");
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        } else {
+          this.$message.error('请输入有效的必填项信息!')
+          return false
+        }
+      })
     },
   },
 };

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

@@ -44,8 +44,8 @@
             :value="item"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="分派人员" prop="F_OperationHandler">
-        <el-select v-model="ruleForm.F_OperationHandler" class="form_select" filterable clearable placeholder="请选择分派人员">
+      <el-form-item label="分派人员" prop="F_Handler">
+        <el-select v-model="ruleForm.F_Handler" class="form_select" filterable clearable placeholder="请选择分派人员">
           <el-option
             v-for="item in userAccountDataList"
             :key="item.F_UserId"
@@ -104,8 +104,8 @@ export default {
         F_TeamName: '', //中心名称
         F_Group: '', //小组id
         F_GroupName: '', //小组
-        F_OperationHandler: '', //分派人员
-        F_Type: '1',
+        F_Handler: '', //分派人员
+        F_Type: '0', // 未接通中转池传0媒体中转池传1
       },
       rules: {
         F_Tel: [{
@@ -138,14 +138,14 @@ export default {
     ])
   },
   created() {
-    Promise.all([this.getMediaList(), this.getTypeDrop(), this.getSeatGroupSelects()])
-      .then(() => {
-        if (this.rowid) {
-          this.ruleForm.F_ID = this.rowid
-          this.is_form_cascader = true
-          this.getDetail(this.rowid)
-        }
-      })
+    this.getMediaList()
+    this.getTypeDrop()
+    this.getSeatGroupSelects()
+    if (this.rowid) {
+      this.ruleForm.F_ID = this.rowid
+      this.is_form_cascader = true
+      this.getDetail(this.rowid)
+    }
   },
   methods: {
     // 添加编辑
@@ -186,7 +186,10 @@ export default {
     },
     // 详情
     getDetail(rid) {
-      getNumberTransferPoolDetail(rid).then(response => {
+      const params = {
+        id: rid
+      }
+      getNumberTransferPoolDetail(params).then(response => {
         if (response.state.toLowerCase() === 'success') {
           const res = response.data
           this.ruleForm.F_Tel = res.F_Tel //待分派号码
@@ -195,11 +198,12 @@ export default {
           this.ruleForm.F_MediaName = res.F_MediaName //媒体id
           this.ruleForm.F_Dept = res.F_Dept //部门id
           this.ruleForm.F_DeptName = res.F_DeptName //部门
+          this.departmentPlaceholder = res.F_DeptName //部门
           this.ruleForm.F_Team = res.F_Team //中心id
           this.ruleForm.F_TeamName = res.F_TeamName //中心
           this.ruleForm.F_Group = res.F_Group // 小组id
           this.ruleForm.F_GroupName = res.F_GroupName // 小组
-          this.ruleForm.F_OperationHandler = res.F_OperationHandler // 分派人员
+          this.ruleForm.F_Handler = res.F_Handler // 分派人员
         }
       })
     },

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

@@ -44,8 +44,8 @@
             :value="item"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="分派人员" prop="F_OperationHandler">
-        <el-select v-model="ruleForm.F_OperationHandler" class="form_select" filterable clearable placeholder="请选择分派人员">
+      <el-form-item label="分派人员" prop="F_Handler">
+        <el-select v-model="ruleForm.F_Handler" class="form_select" filterable clearable placeholder="请选择分派人员">
           <el-option
             v-for="item in userAccountDataList"
             :key="item.F_UserId"
@@ -104,7 +104,7 @@ export default {
         F_TeamName: '', //中心名称
         F_Group: '', //小组id
         F_GroupName: '', //小组
-        F_OperationHandler: '', //分派人员
+        F_Handler: '', //分派人员
         F_Type: '1',
       },
       rules: {
@@ -138,14 +138,14 @@ export default {
     ])
   },
   created() {
-    Promise.all([this.getMediaList(), this.getTypeDrop(), this.getSeatGroupSelects()])
-      .then(() => {
-        if (this.rowid) {
-          this.ruleForm.F_ID = this.rowid
-          this.is_form_cascader = true
-          this.getDetail(this.rowid)
-        }
-      })
+    this.getMediaList()
+    this.getTypeDrop()
+    this.getSeatGroupSelects()
+    if (this.rowid) {
+      this.ruleForm.F_ID = this.rowid
+      this.is_form_cascader = true
+      this.getDetail(this.rowid)
+    }
   },
   methods: {
     // 添加编辑
@@ -172,6 +172,9 @@ export default {
     },
     // 详情
     getDetail(rid) {
+      const params = {
+        id: rid
+      }
       getNumberTransferPoolDetail(rid).then(response => {
         if (response.state.toLowerCase() === 'success') {
           const res = response.data
@@ -181,11 +184,12 @@ export default {
           this.ruleForm.F_MediaName = res.F_MediaName //媒体id
           this.ruleForm.F_Dept = res.F_Dept //部门id
           this.ruleForm.F_DeptName = res.F_DeptName //部门
+          this.departmentPlaceholder = res.F_DeptName //部门
           this.ruleForm.F_Team = res.F_Team //中心id
           this.ruleForm.F_TeamName = res.F_TeamName //中心
           this.ruleForm.F_Group = res.F_Group // 小组id
           this.ruleForm.F_GroupName = res.F_GroupName // 小组
-          this.ruleForm.F_OperationHandler = res.F_OperationHandler // 分派人员
+          this.ruleForm.F_Handler = res.F_Handler // 分派人员
         }
       })
     },

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

@@ -5,15 +5,13 @@
       <el-input v-model="searchData.dept" placeholder="请输入部门" class="filter-item"/>
       <el-input v-model="searchData.team" placeholder="请输入中心" class="filter-item"/>
       <el-input v-model="searchData.group" placeholder="请输入小组" class="filter-item"/>
-      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择角色">
-        <el-option label="媒体中转池" value="0"></el-option>
-        <el-option label="未接通中转池" value="1"></el-option>
-      </el-select>
-      <el-input v-model="searchData.type" 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>
     </div>
-
+    <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
+      <el-tab-pane label="媒体中转池" name="0" />
+      <el-tab-pane label="未接通中转池" name="1" />
+    </el-tabs>
     <el-table v-loading="loading" :data="dataLists" border stripe>
       <el-table-column prop="F_Tel" label="待分配号码" align="center" min-width=""/>
       <el-table-column prop="F_Name" label="姓名" align="center" min-width=""/>
@@ -21,7 +19,7 @@
       <el-table-column prop="F_DeptName" label="部门" align="center" min-width=""/>
       <el-table-column prop="F_TeamName" label="中心" align="center" min-width=""/>
       <el-table-column prop="F_GroupName" label="小组" align="center" min-width=""/>
-      <el-table-column prop="F_OperationHandler" label="分派人员" align="center" min-width=""/>、
+      <el-table-column prop="F_Handler" label="分派人员" align="center" min-width=""/>、
       <!-- <el-table-column label="状态" align="center" min-width="">
         <template slot-scope="scope">
           {{ scope.row.type | typeFilter }}
@@ -69,6 +67,7 @@ export default {
   data() {
     return {
       loading: false,
+      activeName: '0',
       searchData: {
         name: '', //媒体名称
         dept: '', //部门
@@ -104,7 +103,7 @@ export default {
           dept: this.searchData.dept.replace(/\s+/g, ''), //部门
           team: this.searchData.team.replace(/\s+/g, ''), //中心
           group: this.searchData.group.replace(/\s+/g, ''), //小组
-          type: this.searchData.type.replace(/\s+/g, ''), //媒体中转
+          type: this.activeName, //媒体中转
         }
         getNumberTransferPoolList(params).then(response => {
           this.loading = false
@@ -153,13 +152,16 @@ export default {
         title: '分配'
       })
     },
-    btn_delete(editId) {
+    btn_delete(id) {
+      const params = {
+          ids: id
+      }
       this.$confirm('确定删除吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteUserAccount(editId).then(response => {
+        deleteNumberTransferPoolList(params).then(response => {
           if (response.state.toLowerCase() === 'success') {
             this.getList()
             this.$message.success('删除成功!')
@@ -180,6 +182,10 @@ export default {
       }
       this.btn_delete(ids)
     },
+    handleTabClick(tab, event) {
+      this.pageParams.pageindex = 1
+      this.getList()
+    },
   }
 }
 </script>