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

CallCenterWeb.UI/src/views/marketingManagement/fullDecrement/components/addOrEdit.vue

@@ -6,33 +6,54 @@
       </el-form-item>
       <el-form-item label="活动时间" prop="activityTime">
         <el-date-picker
-        v-model="ruleForm.activityTime"
-        :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="结束日期"
-      />
+          v-model="ruleForm.activityTime"
+          :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-form-item label="促销方式" prop="promotionMethod">
-         <el-select v-model="ruleForm.promotionMethod" clearable placeholder="请选择促销方式">
+        <el-select v-model="ruleForm.promotionMethod" clearable placeholder="请选择促销方式">
           <el-option label="按总件数" value="按总件数"></el-option>
           <el-option label="按总金额" value="按总金额"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="满减活动" prop="amountRange">
-        <el-button type="primary" @click="addActivity">添加活动</el-button><span class="info">请点击添加活动</span>
+        <el-button type="primary" @click="addActivity">添加活动</el-button>
+        <span class="info">请点击添加活动</span>
       </el-form-item>
       <el-form-item>
-        <span class="money">*</span>消费满<el-input style="width:90px;" onkeyup="value=value.replace(/[^\d.]/g,'')" v-model="ruleForm.amountRange"></el-input>元，减<el-input v-model="ruleForm.reductionAmount" onkeyup="value=value.replace(/[^\d.]/g,'')" style="width:90px;"></el-input>元
+        <span class="money">*</span>消费满
+        <el-input
+          style="width:90px;"
+          onkeyup="value=value.replace(/[^\d.]/g,'')"
+          v-model="ruleForm.amountRange"
+        ></el-input>元，减
+        <el-input
+          v-model="ruleForm.reductionAmount"
+          onkeyup="value=value.replace(/[^\d.]/g,'')"
+          style="width:90px;"
+        ></el-input>元
       </el-form-item>
-      <el-form-item  v-for="(item,index) in addActivityData" :key="index">
-        <span class="money">*</span>消费满<el-input style="width:90px;" onkeyup="value=value.replace(/[^\d.]/g,'')" v-model="item.amountRange"></el-input>元，减<el-input style="width:90px;" onkeyup="value=value.replace(/[^\d.]/g,'')" v-model="item.reductionAmount"></el-input>元
+      <el-form-item v-for="(item,index) in addActivityData" :key="index">
+        <span class="money">*</span>消费满
+        <el-input
+          style="width:90px;"
+          onkeyup="value=value.replace(/[^\d.]/g,'')"
+          v-model="item.amountRange"
+        ></el-input>元，减
+        <el-input
+          style="width:90px;"
+          onkeyup="value=value.replace(/[^\d.]/g,'')"
+          v-model="item.reductionAmount"
+        ></el-input>元
         <el-button type="text" @click="removeActivity(item.key)">删除</el-button>
       </el-form-item>
       <el-form-item label="活动方式" prop="activityMode">
@@ -44,8 +65,8 @@
             v-for="item in shopList"
             :key="item.F_TagName"
             :label="item.F_TagName"
-            :value="item.F_TagName">
-          </el-option>
+            :value="item.F_TagName"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -57,231 +78,258 @@
 </template>
 
 <script>
-import { getProviceCity, getDictionary } from '@/api/commonAPI'
-import { getFullMarketingDetail, addFullMarketing, editFullMarketing, getMerchandise, getshopping} from '@/api/marketingManagement/fullGiveMarketing'
-import { validateTel } from '@/utils/validate'
-import { filterContent,pickerOptions } from '@/utils'
+import { getProviceCity, getDictionary } from "@/api/commonAPI";
+import {
+  getFullMarketingDetail,
+  addFullMarketing,
+  editFullMarketing,
+  getMerchandise,
+  getshopping,
+} from "@/api/marketingManagement/fullGiveMarketing";
+import { validateTel } from "@/utils/validate";
+import { filterContent, pickerOptions } from "@/utils";
 export default {
-  name: 'AddOrEdit',
+  name: "AddOrEdit",
   props: {
     rowid: {
       type: String,
-      default: ''
+      default: "",
     },
     callid: {
       type: Number,
-      default: 0
+      default: 0,
     },
     layerid: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
-      props: { // 自定义省市下拉数据的key值
-        value: 'code',
-        label: 'name',
-        children: 'entityJson'
+      props: {
+        // 自定义省市下拉数据的key值
+        value: "code",
+        label: "name",
+        children: "entityJson",
       },
-      pickerOptions,//日期数据
+      pickerOptions, //日期数据
       sourceOptions: [], // 工单来源下拉数据
-      shopList:[],//绑定商品数据
-      addActivityData:[],//添加活动的数据
+      shopList: [], //绑定商品数据
+      addActivityData: [], //添加活动的数据
       ruleForm: {
-        unique_id: '', //		否	string	callid
-        ordercode: '',
-        activityName: '', //活动名称
-        activityTime: '', //活动时间
-        promotionMethod: '', //促销方式
-        reductionAmount: '', //满减金额
-        amountRange: '', //金额区间
-        activityMode: '', //活动方式
-        boundGoods: '', //绑定商品
+        unique_id: "", //		否	string	callid
+        ordercode: "",
+        activityName: "", //活动名称
+        activityTime: "", //活动时间
+        promotionMethod: "", //促销方式
+        reductionAmount: "", //满减金额
+        amountRange: "", //金额区间
+        activityMode: "", //活动方式
+        boundGoods: "", //绑定商品
       },
-      reductionAmount:[],//满减金额
-      amountRange:[],//金额区间
+      reductionAmount: [], //满减金额
+      amountRange: [], //金额区间
       rules: {
-        activityName: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入活动名称',
-        }],
-        activityTime: [{
-          required: true,
-          trigger: 'blur',
-          message: '请选择活动时间',
-        }],
-        promotionMethod: [{
-          required: true,
-          trigger: 'blur',
-          message: '请选择促销方式',
-        }],
-        boundGoods: [{
-          required: true,
-          trigger: 'blur',
-          message: '请选择商品标签',
-        }],
+        activityName: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入活动名称",
+          },
+        ],
+        activityTime: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请选择活动时间",
+          },
+        ],
+        promotionMethod: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请选择促销方式",
+          },
+        ],
+        boundGoods: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请选择商品标签",
+          },
+        ],
       },
-      loading: false
-    }
+      loading: false,
+    };
   },
   created() {
-    this.getShopList();//获取绑定商品
+    this.getShopList(); //获取绑定商品
     if (this.callid) {
-      this.ruleForm.unique_id = this.callid
+      this.ruleForm.unique_id = this.callid;
     }
-    Promise.all([])
-      .then(() => {
-        if (this.rowid) {
-          this.ruleForm.ordercode = this.rowid
-          this.getDetail(this.rowid)
-        }
-      })
+    Promise.all([]).then(() => {
+      if (this.rowid) {
+        this.ruleForm.ordercode = this.rowid;
+        this.getDetail(this.rowid);
+      }
+    });
   },
   methods: {
     submitForm() {
-      if(this.addActivityData&&this.addActivityData.length>0){
-          this.addActivityData.map(item=>{
-          this.reductionAmount.push(item.reductionAmount);
-          this.amountRange.push(item.amountRange);
-        })
-      }else{
-        this.$message.error('请输入有效的必填项信息')
-        this.reductionAmount=[];
-        this.amountRange=[];
-        return 
-      }
-      
       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={
-              F_Type:3,
-              F_ID:this.rowid ? this.rowid : '',
-              F_Name:this.ruleForm.activityName,//活动名称
-              F_Describe:this.ruleForm.promotionMethod,//促销方式
-              F_Money:this.reductionAmount.toString(),//满减金额
-              F_AmountRange:this.amountRange.toString(),//金额区间
-              F_StartTime:this.ruleForm.activityTime && this.ruleForm.activityTime[0],//开始时间
-              F_EndTime:this.ruleForm.activityTime && this.ruleForm.activityTime[1],//结束时间
-              F_Commodity:this.ruleForm.boundGoods,//商品ID
-              F_ActivityMode:this.ruleForm.activityMode,//活动金额
-            }
-             // 添加
+          if (this.addActivityData && this.addActivityData.length > 0) {
+            this.addActivityData.map((item) => {
+              this.reductionAmount.push(item.reductionAmount);
+              this.amountRange.push(item.amountRange);
+            });
+          } else {
+            this.$message.error("请输入满减金额!");
+            this.reductionAmount = [];
+            this.amountRange = [];
+            return;
+          }
+          this.ruleForm.content = filterContent.delHtmlTag(
+            this.ruleForm.content
+          ); // 保存内容时去掉 html 标签
+          this.loading = true;
+          return new Promise((response) => {
+            const params = {
+              F_Type: 3,
+              F_ID: this.rowid ? this.rowid : "",
+              F_Name: this.ruleForm.activityName, //活动名称
+              F_Describe: this.ruleForm.promotionMethod, //促销方式
+              F_Money: this.reductionAmount.toString(), //满减金额
+              F_AmountRange: this.amountRange.toString(), //金额区间
+              F_StartTime:
+                this.ruleForm.activityTime && this.ruleForm.activityTime[0], //开始时间
+              F_EndTime:
+                this.ruleForm.activityTime && this.ruleForm.activityTime[1], //结束时间
+              F_Commodity: this.ruleForm.boundGoods, //商品ID
+              F_ActivityMode: this.ruleForm.activityMode, //活动金额
+            };
+            // 添加
             if (!this.rowid) {
-              addFullMarketing(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.btn_search() // 重新加载父级数据
+              addFullMarketing(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.btn_search(); // 重新加载父级数据
+                    }
+                    this.$message.success("恭喜你，添加成功!");
                   }
-                  this.$message.success('恭喜你，添加成功!')
-                }
-              }).catch(() => {
-                this.loading = false
-              })
-              return
+                })
+                .catch(() => {
+                  this.loading = false;
+                });
+              return;
             }
             // 编辑
-            editFullMarketing(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
-            })
-          })
-         
+            editFullMarketing(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('请输入有效的必填项信息!')
-          this.reductionAmount=[];
-          this.amountRange=[];
-          return false
+          this.$message.error("请输入有效的必填项信息!");
+          this.reductionAmount = [];
+          this.amountRange = [];
+          return false;
         }
-      })
+      });
     },
     resetForm() {
-      this.$refs.ruleForm.resetFields()
-      this.ruleForm.activityTime = ''
-      this.addActivityData=[]
+      this.$refs.ruleForm.resetFields();
+      this.ruleForm.activityTime = "";
+      this.addActivityData = [];
     },
     // 详情
     getDetail(rid) {
-      getFullMarketingDetail(rid).then(response => {
-        if (response.state.toLowerCase() === 'success') {
-          const res = response.data
+      getFullMarketingDetail(rid).then((response) => {
+        if (response.state.toLowerCase() === "success") {
+          const res = response.data;
           this.ruleForm.activityName = res.F_Name;
           this.ruleForm.promotionMethod = res.F_Describe;
-          this.addActivityData = res.F_Money.split(',').map((reductionAmount,i) => ({reductionAmount, amountRange: res.F_AmountRange.split(',')[i]}));
+          this.addActivityData = res.F_Money.split(
+            ","
+          ).map((reductionAmount, i) => ({
+            reductionAmount,
+            amountRange: res.F_AmountRange.split(",")[i],
+          }));
           // this.ruleForm.reductionAmount = res.F_Money;
           // this.ruleForm.amountRange = res.F_AmountRange;
           this.ruleForm.activityMode = res.F_ActivityMode;
           this.ruleForm.boundGoods = res.F_Commodity;
-          this.ruleForm.activityTime = [res.F_StartTime,res.F_EndTime];
+          this.ruleForm.activityTime = [res.F_StartTime, res.F_EndTime];
         }
-      })
+      });
     },
     //获取绑定商品
-    getShopList(){
-      getshopping({CLass:3}).then(response =>{
-        if(response.state.toLowerCase() == 'success'){
-          this.shopList=response.data
-        }
-      }).catch(result=>{
-        console.log(result)
-      })
+    getShopList() {
+      getshopping({ CLass: 3 })
+        .then((response) => {
+          if (response.state.toLowerCase() == "success") {
+            this.shopList = response.data;
+          }
+        })
+        .catch((result) => {
+          console.log(result);
+        });
     },
     //添加活动方法
     addActivity() {
-      if(!this.ruleForm.amountRange||!this.ruleForm.reductionAmount){
-        this.$message.error('请填写金额数据')
-        return
+      if (!this.ruleForm.amountRange || !this.ruleForm.reductionAmount) {
+        this.$message.error("请填写金额数据");
+        return;
       }
       this.addActivityData.push({
-        amountRange:this.ruleForm.amountRange,//满减区间
-        reductionAmount:this.ruleForm.reductionAmount,//满减金额
-        key: Date.now()
+        amountRange: this.ruleForm.amountRange, //满减区间
+        reductionAmount: this.ruleForm.reductionAmount, //满减金额
+        key: Date.now(),
       });
-      this.ruleForm.amountRange='';
-      this.ruleForm.reductionAmount='';
+      this.ruleForm.amountRange = "";
+      this.ruleForm.reductionAmount = "";
     },
     //删除活动方法
     removeActivity(itemId) {
-      var index = this.addActivityData.findIndex(item=>{
-       return item.key == itemId
-      })
+      var index = this.addActivityData.findIndex((item) => {
+        return item.key == itemId;
+      });
       if (index !== -1) {
-        this.addActivityData.splice(index, 1)
+        this.addActivityData.splice(index, 1);
       }
     },
-  }
-}
+  },
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
 .order_form {
   .form_select {
-  	width: 100%;
+    width: 100%;
   }
   .form_date {
     width: 100%;
   }
 }
-.money{
-  color: #F56C6C;
+.money {
+  color: #f56c6c;
   margin-left: 4px;
 }
-.info{
-  color: #C0C4CC;
+.info {
+  color: #c0c4cc;
   font-size: 12px;
   margin-left: 5px;
 }

CallCenterWeb.UI/src/views/marketingManagement/fullGiveMarketing/components/addOrEdit.vue

@@ -218,7 +218,7 @@ export default {
           const res = response.data
           this.ruleForm.policyName = res.F_Name;
           this.ruleForm.promotionSpecifications = res.F_PromotionRules;
-          this.ruleForm.bundledGifts = res.F_Gift?res.F_Gift.split(',').map(Number):[];
+          this.ruleForm.bundledGifts = res.F_Gift?res.F_Gift.split(','):[];
           this.ruleForm.policyDescription = res.F_Describe;
           this.ruleForm.boundGoods = res.F_Commodity;
           this.ruleForm.applicableMember = res.F_Member?(res.F_Member-0):'';

CallCenterWeb.UI/src/views/memberManagement/fileTranser/handle.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm"  label-width="150px" class="order_form">
       <el-form-item label="是否同意转移" prop="F_Name">
-           <el-select v-model="ruleForm.value" clearable placeholder="请选择" @change="handle">
+           <el-select v-model="ruleForm.value" placeholder="请选择(默认为同意)" @change="handle">
                 <el-option label="同意" value="0"></el-option>
                 <el-option label="拒绝" value="1"></el-option>
             </el-select>

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

@@ -164,14 +164,14 @@ export default {
           {
             required: true,
             trigger: "blur",
-            message: "请输入客户名称"
+            message: "请输入客户姓名"
           }
         ],
         F_Phone: [
           {
             required: true,
             trigger: "blur",
-            message: "请输入固定电话"
+            message: "请输入联系方式"
           }
         ]
       },

CallCenterWeb.UI/src/views/noteManagement/SMStemplate/index.vue

@@ -11,8 +11,8 @@
     <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
       <el-table-column type="selection" width="40" fixed></el-table-column>
       <el-table-column type="index" label="编号" align="center" fixed width="80"/>
-      <el-table-column prop="F_ModelName" label="名称" align="center" min-width=""/>
-      <el-table-column prop="F_Content" label="内容" align="center" min-width=""/>
+      <el-table-column prop="F_ModelName" label="模板名称" align="center" min-width=""/>
+      <el-table-column prop="F_Content" label="模板内容" align="center" min-width=""/>
       <el-table-column prop="F_Tel" label="400电话" align="center" min-width=""/>
       <el-table-column prop="F_AddUserName" label="添加人" align="center" min-width=""/>
       <el-table-column prop="F_AddTime" label="添加时间" align="center" min-width=""/>

CallCenterWeb.UI/src/views/reportFormManagement/teamPerformance/add.vue

@@ -2,15 +2,22 @@
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
       <el-form-item label="时间" prop="date">
-        <el-date-picker v-model="ruleForm.date" value-format="yyyy-MM" type="month" placeholder="请选择时间"></el-date-picker>
+        <el-date-picker
+          v-model="ruleForm.date"
+          value-format="yyyy-MM"
+          type="month"
+          placeholder="请选择时间"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item label="部门" prop="department">
         <el-cascader
-    v-model="ruleForm.department"
-    placeholder="请选择部门"
-    clearable
-    :props="prop"
-    :options="departmentData"></el-cascader>
+          v-model="ruleForm.department"
+          placeholder="请选择部门"
+          clearable
+          change-on-select
+          :props="prop"
+          :options="departmentData"
+        ></el-cascader>
       </el-form-item>
       <el-form-item label="团队" prop="team">
         <el-select v-model="ruleForm.team" clearable placeholder="请选择团队">
@@ -37,8 +44,10 @@
 </template>
 
 <script>
-import { addTodo, editTodo, getTodo } from "@/api/todoManagement/todoList";
-import { addTeamPerformance,getTeamPerformanceDetail } from "@/api/reportFormManagement/teamPerformance/teamPerformance";
+import {
+  addTeamPerformance,
+  getTeamPerformanceDetail,
+} from "@/api/reportFormManagement/teamPerformance/teamPerformance";
 import { getDepartmentList } from "@/api/systemSetup/roleSetting/department";
 import { getTeamLists } from "@/api/systemSetup/sysSetting/teamManagement";
 import { filterContent } from "@/utils";
@@ -88,10 +97,10 @@ export default {
           },
         ],
       },
-      prop:{
-        label:'F_DeptName',
-        value:'F_DeptId',
-        children:'children'
+      prop: {
+        label: "F_DeptName",
+        value: "F_DeptId",
+        children: "children",
       },
       teamData: [], //团队数据
       loading: false,
@@ -113,7 +122,9 @@ export default {
           const datas = {
             date: this.ruleForm.date,
             teamid: this.ruleForm.team,
-            deptid: this.ruleForm.department[this.ruleForm.department.length-1],
+            deptid: this.ruleForm.department[
+              this.ruleForm.department.length - 1
+            ],
             isstrong: this.ruleForm.isUpdate,
           };
 
@@ -133,19 +144,6 @@ export default {
               });
             return;
           }
-          // 编辑
-          editTodo(datas)
-            .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;
@@ -167,9 +165,9 @@ export default {
     //获取部门信息
     getDepartment() {
       getDepartmentList().then((response) => {
-        response.map(item=>{
-          if(item.F_DeptName=="销售"){
-            this.departmentData.push(item)
+        response.map((item) => {
+          if (item.F_DeptId == "1") {
+            this.departmentData.push(item);
           }
         });
         this.departmentData.unshift(
@@ -189,6 +187,7 @@ export default {
       const params = {
         pageindex: 1,
         pagesize: 100,
+        deptid:'1'
       };
       getTeamLists(params).then((response) => {
         if (response.state == "success") {

CallCenterWeb.UI/src/views/reportFormManagement/teamPerformance/index.vue

@@ -18,6 +18,8 @@
         v-model="department"
         placeholder="请选择部门"
         clearable
+        change-on-select
+        @change="handleTeam"
         :props="prop"
         :options="departmentData"
       ></el-cascader>
@@ -50,10 +52,11 @@
       <!-- <el-table-column type="selection" width="40" fixed></el-table-column> -->
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <el-table-column prop="F_Dept" label="部门" align="center" min-width />
-      <el-table-column prop="F_Post" label="职务" align="center" min-width />
-      <el-table-column prop="F_Type" label="销售类型" align="center" min-width />
+      <el-table-column prop="F_Team" label="团队" align="center" min-width />
+      <!-- <el-table-column prop="F_Post" label="职务" align="center" min-width /> -->
+      <!-- <el-table-column prop="F_Type" label="销售类型" align="center" min-width /> -->
       <el-table-column prop="F_TaskRate" label="任务完成比例" align="center" min-width />
-      <el-table-column prop="F_CallTotleNumber" label="总单线" align="center" min-width />
+      <!-- <el-table-column prop="F_CallTotleNumber" label="总单线" align="center" min-width /> -->
       <el-table-column prop="F_SendTotleNumber" label="发货总单数" align="center" min-width />
       <el-table-column prop="F_TotleMoney" label="发货总金额" align="center" min-width />
       <el-table-column prop="F_SignNumber" label="签收总单数" align="center" min-width />
@@ -63,21 +66,21 @@
       <el-table-column prop="F_RefuseNumber" label="拒收单数" align="center" min-width />
       <el-table-column prop="F_RefuseMoney" label="拒收金额" align="center" min-width />
       <el-table-column prop="F_SignRate" label="签收率" align="center" min-width />
-      <el-table-column prop="F_ErrorNumber" label="录错单数" align="center" min-width />
+      <!-- <el-table-column prop="F_ErrorNumber" label="录错单数" align="center" min-width /> -->
       <el-table-column prop="F_ErrorMoney" label="录错金额" align="center" min-width />
-      <el-table-column prop="F_AfterNumber" label="售后单数" align="center" min-width />
+      <!-- <el-table-column prop="F_AfterNumber" label="售后单数" align="center" min-width /> -->
       <el-table-column prop="F_AfterMoney" label="售后金额" align="center" min-width />
       <el-table-column prop="F_AlongMoney" label="鞋垫/袜子金额" align="center" min-width />
       <!-- <el-table-column prop="F_CreateTime" label="创建时间" align="center" min-width=""/> -->
       <el-table-column label="操作" width="170" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             v-permission="'HY_edit'"
             size="mini"
             plain
             type="primary"
             @click="btn_edit(scope.row.F_Id)"
-          >编辑</el-button>
+          >编辑</el-button> -->
           <!-- <el-button
             v-permission="'HY_detail'"
             size="mini"
@@ -127,6 +130,7 @@ export default {
       searchTime: "",
       team: "",
       department: [],
+      valNum: [],
       departmentData: [], //部门数据
       teamData: [], //团队数据
       searchDate: "",
@@ -272,7 +276,7 @@ export default {
     getDepartment() {
       getDepartmentList().then((response) => {
         response.map((item) => {
-          if (item.F_DeptName == "销售") {
+          if (item.F_DeptId == "1") {
             this.departmentData.push(item);
           }
         });
@@ -288,16 +292,26 @@ export default {
         );
       });
     },
+    handleTeam(val){
+      if(val.toString()==0||val.toString()==-1){
+         this.valNum=[1]
+      }else{
+         this.valNum=val
+      }
+      this.getTeam()
+    },
     //获取团队信息
     getTeam() {
       const params = {
         pageindex: 1,
         pagesize: 100,
+        deptid:this.valNum.length>0?this.valNum[this.valNum.length-1]:'1'
       };
       getTeamLists(params).then((response) => {
         if (response.state == "success") {
           this.teamData = response.data.Rows;
-          this.teamData.unshift(
+          if(response.data.Rows.length>0){
+            this.teamData.unshift(
             {
               F_Id: 0,
               F_Name: "全部",
@@ -307,6 +321,7 @@ export default {
               F_Name: "不更新",
             }
           );
+          }
         }
       });
     },

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

@@ -36,7 +36,7 @@
       <el-table-column prop="F_Group" label="组别" align="center" min-width=""/>
       <el-table-column prop="F_Remark" label="说明" align="center" min-width=""/>
       <el-table-column prop="F_ZBTime" label="值班时间" align="center" min-width=""/>
-      <el-table-column prop="F_LastModifyOn" label="最后呼入时间" align="center" min-width=""/>
+      <el-table-column prop="F_LastModifyOn" label="最后修改时间" align="center" min-width=""/>
       <el-table-column prop="F_CreateBy" label="创建人" align="center" min-width=""/>
       <el-table-column prop="F_CreateOn" label="创建时间" align="center" min-width=""/>
       <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">

CallCenterWeb.UI/src/views/todoManagement/todoList/addOrEdit.vue

@@ -243,6 +243,7 @@ export default {
             this.showSchedule=false;
             this.showContacts=true;
           }
+          this.ruleForm.type=res.F_Type;
           this.ruleForm.state=res.F_State;
           this.ruleForm.isRemind=res.F_IsRemind.toString();
           this.ruleForm.remindDate=res.F_Remindertime;

CallCenterWeb.UI/src/views/todoManagement/todoList/index.vue

@@ -28,7 +28,7 @@
     <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
       <el-table-column type="selection" width="40" fixed></el-table-column>
       <el-table-column type="index" label="编号" align="center" fixed width="80"/>
-      <el-table-column label="分类" align="center" min-width="">
+      <el-table-column label="类型" align="center" min-width="">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.F_Type==0">日程</el-tag>
           <el-tag v-else>待联系人</el-tag>