禅道bug修改

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

@@ -165,3 +165,11 @@ export function getMemberType(params) {
     params
   })
 }
+// 获取销售负责人
+export function getSalesmanData(params) {
+  return request({
+    url: 'api/useraccount/getlistdrop',
+    method: 'get',
+    params
+  })
+}

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

@@ -39,7 +39,7 @@
             <el-input v-model="form.number" placeholder="请输入400号码"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="9">
+        <el-col :span="6">
           <el-form-item label="绑定商品">
             <el-select v-model="form.product"
               multiple
@@ -55,12 +55,12 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="投放日期">
-            <el-date-picker v-model="form.releaseDate" value-format="yyyy-MM-dd" type="date" placeholder="请选择日期"></el-date-picker>
+            <el-date-picker v-model="form.releaseDate" value-format="yyyy-MM-dd" type="date" placeholder="请选择日期" style="width:199px"></el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+        <el-col :span="6">
           <el-form-item label="日费用">
             <el-input v-model="form.dailyExpenses" placeholder="请输入日费用"></el-input>
           </el-form-item>
@@ -68,7 +68,7 @@
       </el-form>
     </el-row>
     <el-row>
-      <el-form ref="playPlanRef" :model="playPlanForm" label-width="70px">
+      <el-form ref="playPlanRef" :model="playPlanForm" label-width="100px">
         <el-col :span="24">
           <el-form-item label="播放计划信息" label-width="110px"></el-form-item>
         </el-col>
@@ -91,12 +91,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="状态">
-            <el-select clearable v-model="playPlanForm.state" placeholder="请选择状态">
-              <el-option label="启动" value="0"></el-option>
-              <el-option label="暂停" value="1"></el-option>
-              <el-option label="终止" value="2"></el-option>
-            </el-select>
+          <el-form-item label="播放说明">
+            <el-input v-model="playPlanForm.playInstructions" placeholder="请输入播放说明" style="width:200px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
@@ -118,10 +114,6 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
             />
-             <!-- <el-time-picker
-              v-model="playPlanForm.BroadcastTime"
-              placeholder="请选择时间">
-            </el-time-picker> -->
           </el-form-item>
         </el-col>
         <el-col :span="4">
@@ -136,25 +128,29 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="4">
           <el-form-item label="播出时长">
             <el-input v-model="playPlanForm.broadcost" placeholder="请输入播出时长"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="4">
           <el-form-item label="播出次数">
             <el-input v-model="playPlanForm.playNumber" placeholder="请输入播出次数"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="播放说明">
-            <el-input v-model="playPlanForm.playInstructions" placeholder="请输入播放说明"></el-input>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select clearable v-model="playPlanForm.state" placeholder="请选择状态">
+              <el-option label="启动" value="0"></el-option>
+              <el-option label="暂停" value="1"></el-option>
+              <el-option label="终止" value="2"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-form>  
     </el-row>
     <el-row v-for="(item,index) in addPlayPlanForm" :key="index">
-      <el-form  label-width="70px" >
+      <el-form  label-width="100px" >
         <el-col :span="5">
           <el-form-item label="播出时间">
             <el-input v-model='item.F_BroadcastTime' disabled></el-input>
@@ -174,15 +170,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="状态">
-            <el-select v-model="item.F_State" placeholder="请选择状态" disabled>
-              <el-option
-                v-for="item in startPlan"
-                :key="item.id"
-                :label="item.label"
-                :value="item.id">
-              </el-option>
-            </el-select>
+          <el-form-item label="播放说明">
+            <el-input v-model="item.F_Describe" placeholder="请输入播放说明" disabled style="width:200px"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
@@ -206,12 +195,6 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
             />
-            <!-- <el-time-picker
-            disabled
-              v-model="item.startDate"
-              placeholder="请选择时间">
-            </el-time-picker> -->
-            <!-- <el-input v-model="item.BroadcastTime" placeholder="请输入播放时间" disabled></el-input> -->
           </el-form-item>
         </el-col>
         <el-col :span="4">
@@ -224,37 +207,43 @@
                 :value="item.F_ValueId">
               </el-option>
             </el-select>
-            <!-- <el-input v-model="item.advertisementName" placeholder="请输入广告名称" disabled></el-input> -->
           </el-form-item>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="4">
           <el-form-item label="播出时长">
             <el-input v-model="item.F_BroadcastDuration" placeholder="请输入播出时长" disabled></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
+        <el-col :span="4">
           <el-form-item label="播出次数">
             <el-input v-model="item.F_PlayCount" placeholder="请输入播出次数" disabled></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="播放说明">
-            <el-input v-model="item.F_Describe" placeholder="请输入播放说明" disabled></el-input>
+        <el-col :span="4">
+          <el-form-item label="状态">
+            <el-select v-model="item.F_State" placeholder="请选择状态" disabled>
+              <el-option
+                v-for="item in startPlan"
+                :key="item.id"
+                :label="item.label"
+                :value="item.id">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-form>
     </el-row>
     <el-row>
-      <el-form  ref="changeInfoRef" :model="changeInfoForm" label-width="70px">
+      <el-form  ref="changeInfoRef" :model="changeInfoForm" label-width="100px">
         <el-col :span="24">
           <el-form-item label="媒体变更信息" label-width="110px"></el-form-item>
         </el-col>
-         <el-col :span="7">
+         <el-col :span="6">
           <el-form-item label="变更时间">
             <el-date-picker v-model="changeInfoForm.changeDate" value-format="yyyy-MM-dd" type="date" placeholder="请选择变更时间"></el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+        <el-col :span="6">
           <el-form-item label="变更类型">
             <el-select clearable v-model="changeInfoForm.changeType" placeholder="请选择变更类型">
               <el-option
@@ -266,7 +255,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+        <el-col :span="9">
           <el-form-item label="说明">
             <el-input v-model="changeInfoForm.changeExplain" placeholder="请输入说明"></el-input>
           </el-form-item>
@@ -279,13 +268,13 @@
       </el-form>
     </el-row>
     <el-row>
-      <el-form v-for="(item,index) in addChangeForm" :key="index" label-width="70px">
-         <el-col :span="7">
+      <el-form v-for="(item,index) in addChangeForm" :key="index" label-width="100px">
+         <el-col :span="6">
           <el-form-item label="变更时间">
             <el-date-picker disabled v-model="item.F_ChangeTime" type="date" placeholder="请选择变更时间"></el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+        <el-col :span="6">
           <el-form-item label="变更类型">
             <el-select disabled v-model="item.F_ChangeType" placeholder="请选择变更类型">
               <el-option
@@ -297,7 +286,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+        <el-col :span="9">
           <el-form-item label="说明">
             <el-input disabled v-model="item.F_Describe" placeholder="请输入说明"></el-input>
           </el-form-item>
@@ -314,13 +303,13 @@
         <el-col :span="24">
           <el-form-item label="提醒部门设置" label-width='100px'></el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="是否提醒">
              <el-radio v-model="renderForm.reminder" label="0">否</el-radio>
              <el-radio v-model="renderForm.reminder" label="1">是</el-radio>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="提醒部门">
             <el-cascader
               v-model="renderForm.departmentName"
@@ -334,7 +323,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="提醒时间">
              <el-date-picker v-model="renderForm.ReminderTime" value-format="yyyy-MM-dd" type="date" placeholder="请选择提醒时间"></el-date-picker>
           </el-form-item>
@@ -458,11 +447,11 @@ export default {
     //保存功能
     submit(){
       if(!this.form.launchType){
-        this.$message.info('请选择投放类型')
+        this.$message.error('请选择投放类型')
         return
       }
       if(!this.form.mediaName){
-        this.$message.info('请选择媒体名称')
+        this.$message.error('请选择媒体名称')
         return
       }
       return new Promise(resolve=>{

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

@@ -20,8 +20,8 @@
       <el-form-item label="手机号码2" prop="F_Mobile1">
         <el-input v-model="ruleForm.F_Mobile1" placeholder="请输入手机号码2"></el-input>
       </el-form-item>
-      <el-form-item label="固定电话" prop="F_Phone">
-        <el-input v-model="ruleForm.F_Phone" placeholder="请输入固定电话"></el-input>
+      <el-form-item label="联系方式" prop="F_Phone">
+        <el-input v-model="ruleForm.F_Phone" placeholder="请输入联系方式"></el-input>
       </el-form-item>
       <el-form-item label="会员类型" prop="F_Type">
         <el-select v-model="ruleForm.F_Type" placeholder="请选择会员类型" class="form_select">
@@ -80,9 +80,6 @@
       <el-form-item label="推荐人" prop="F_Recommender">
         <el-input v-model="ruleForm.F_Recommender" placeholder="请输入推荐人"></el-input>
       </el-form-item>
-      <el-form-item label="销售负责人" prop="F_Saleperson">
-        <el-input v-model="ruleForm.F_Saleperson" placeholder="请输入销售负责人"></el-input>
-      </el-form-item>
       <el-form-item label="累计消费金额" prop="F_Money">
         <el-input v-model="ruleForm.F_Money" placeholder="请输入累计消费金额" onkeyup="value=value.replace(/[^\d.]/g,'')"></el-input>
       </el-form-item>
@@ -218,7 +215,6 @@ export default {
               name: this.ruleForm.F_Name, //客户姓名
               phone: this.ruleForm.F_Phone, //固定电话
               recommender: this.ruleForm.F_Recommender, //推荐人
-              saleperson: this.ruleForm.F_Saleperson, //销售负责人
               sex: this.ruleForm.F_Sex, //性别
               age: this.ruleForm.F_Age, //年龄
               label: this.ruleForm.F_Type, //会员类型

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

@@ -14,6 +14,7 @@
           :file-list="uploadData.fileList"
           :action= "uploadData.uploadUrl"
           :data = "uploadData.uploaderFiles"
+          :headers="{'Authorization': token}"
           :on-success="uploadSuccess"
           :on-error="uploadError"
           :on-exceed="uploadExceed"
@@ -32,7 +33,7 @@
 </template>
 
 <script>
-
+import { mapGetters } from 'vuex'
 export default {
   name: 'ImportFile',
   props: {
@@ -45,6 +46,11 @@ export default {
       default: ''
     }
   },
+  computed: {
+    ...mapGetters([
+      'token'
+    ])
+  },
   data() {
     return {
       downloadUrl: '/static/xls/huiyuanxinxiTemplate.xlsx',

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

@@ -1,8 +1,29 @@
 <template>
   <div v-loading="loading">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
+      <el-form-item label="部门" prop="depid">
+           <el-cascader
+              v-model="ruleForm.depid"
+              :options="depData"
+              :props="props"
+              @change="handleSalesMan"
+              placeholder="请选择部门"
+              class="form_select"
+              clearable
+              style="width:199px"
+              filterable
+              change-on-select
+            />
+      </el-form-item>
       <el-form-item label="新销售负责人" prop="F_Name">
-        <el-input v-model="ruleForm.F_Name" placeholder="请输入新销售负责人"></el-input>
+        <el-select v-model="ruleForm.F_Name" placeholder="请选择销售负责人">
+          <el-option
+            v-for="item in salesMan"
+            :key="item.F_UserCode"
+            :label="item.F_UserName"
+            :value="item.F_UserCode">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
@@ -12,8 +33,9 @@
 </template>
 
 <script>
+import {getDepartmentTreeList} from '@/api/commonAPI';
 import { formatterContent } from '@/utils'
-import { getTransfer } from '@/api/memberManagement/memberList'
+import { getTransfer,getSalesmanData} from '@/api/memberManagement/memberList'
 export default {
   name: "AddOrEdit",
   props: {
@@ -33,7 +55,8 @@ export default {
   data() {
     return {
       ruleForm: {
-        F_Name: "" //客户姓名
+        F_Name: "" ,//客户姓名
+        depid: [] //部门id
       },
       rules: {
         F_Name: [
@@ -42,8 +65,23 @@ export default {
             trigger: "blur",
             message: "请输入新负责人姓名"
           }
-        ]
+        ],
+        depid: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请选择部门"
+          }
+        ],
+      },
+      props: {
+        // 自定义部门下拉数据的key值
+        value: "id",
+        label: "text",
+        children:'children'
       },
+      depData:[],//部门数据
+      salesMan:[],//销售负责人数据
       loading: false
     };
   },
@@ -53,6 +91,7 @@ export default {
     }
     Promise.all([]).then(() => {
       if (this.rowid) {
+        this.getDepartment()
       }
     });
   },
@@ -88,6 +127,30 @@ export default {
           return false;
         }
       });
+    },
+    //获取部门信息
+    getDepartment(){
+       getDepartmentTreeList().then(response=>{
+        if(response.state.toLowerCase()=='success'){
+          this.depData=response.data
+        }
+      })
+    },
+    //获取销售负责人数据
+    handleSalesMan(){
+      this.ruleForm.F_Name=''
+      return new Promise(resolve=>{
+        const params={
+          deptid:this.ruleForm.depid&&this.ruleForm.depid[this.ruleForm.depid.length-1]
+        }
+        getSalesmanData(params).then(response=>{
+          if(response.state.toLowerCase()=='success'){
+            this.salesMan=response.data
+          }
+        }).catch(result=>{
+          console.log(result)
+        })
+      })
     }
   }
 };

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

@@ -3,14 +3,12 @@
     <search-filter :search-datas.sync="searchDatas"  :selectedId="selectedId" showadd @transfer="btn_transfer" @search="btn_search" @delorders="btn_deletes" @export="btn_export"></search-filter>
     <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 prop="F_VIPCode" label="会员卡编号" align="center"  width="100px"></el-table-column> -->
       <el-table-column prop="F_Name" label="客户姓名" align="center"  width=""></el-table-column>
       <el-table-column prop="F_Sex" label="客户性别" align="center"  width=""></el-table-column>
       <el-table-column prop="F_Age" label="客户年龄" align="center"  width=""></el-table-column>
-      <!-- <el-table-column prop="F_Birthday" label="生日" align="center"  width=""></el-table-column> -->
       <el-table-column prop="F_Mobile" label="手机号码1" align="center"  width=""></el-table-column>
       <el-table-column prop="F_Mobile1" label="手机号码2" align="center"  width=""></el-table-column>
-      <el-table-column prop="F_Phone" label="固定电话" align="center"  width="100px"></el-table-column>
+      <el-table-column prop="F_Phone" label="联系方式" align="center"  width="100px"></el-table-column>
       <el-table-column prop="F_Label" label="会员类型" align="center"  width=""></el-table-column>
       <el-table-column label="详细地址" align="center"  width="100px">
         <template slot-scope="scoped">
@@ -24,8 +22,7 @@
       <el-table-column prop="F_Address1" label="备用地址" align="center"  width=""></el-table-column>
       <el-table-column prop="F_Postcode" label="邮编" align="center"  width=""></el-table-column>
       <el-table-column prop="F_ShoeSize" label="鞋码" align="center"  width=""></el-table-column>
-      <el-table-column prop="F_RegTime" label="会员日期" align="center"  width="200px"></el-table-column>
-      <el-table-column prop="F_Birthday" label="会员生日" align="center"  width="100px"></el-table-column>
+      <el-table-column prop="Birthday" label="会员生日" align="center"  width="100px"></el-table-column>
       <el-table-column prop="F_Score" label="会员积分" align="center"  width=""></el-table-column>
       <el-table-column prop="F_Recommender" label="推荐人" align="center"  width=""></el-table-column>
       <el-table-column prop="F_Saleperson" label="销售负责人" align="center"  width="90px"></el-table-column>
@@ -220,7 +217,7 @@ export default {
             parent: this, // 当前的vue对象
             data: { 'rowid': this.selectedId }// props
           },
-          area: ['25%', '25%'],
+          area: ['40%', '40%'],
           title: '转移档案'
         })
       }

CallCenterWeb.UI/src/views/systemSetup/roleSetting/department/component/addOrEditTeam.vue

@@ -7,7 +7,7 @@
       <el-form-item label="团队名称:" prop="position">
         <el-input v-model="ruleForm.position" type="text" autosize placeholder="请输入团队名称"/>
       </el-form-item>
-      <el-form-item label="说明:" prop="des">
+      <el-form-item label="描述说明:" prop="des">
         <el-input v-model="ruleForm.des" type="textarea" autosize placeholder="请输入屏蔽说明"/>
       </el-form-item>
       <el-form-item>

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

@@ -269,7 +269,7 @@ export default {
     },
     //右边删除功能
     btn_deleteR(editId) {
-      this.$confirm('您确定要将此职位信息删除吗?', '提示', {
+      this.$confirm('您确定要将此团队信息删除吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

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

@@ -15,7 +15,7 @@
       <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="'HY_edit'" size="mini" plain type="primary" @click="btn_edit(scope.row.F_Id.toString())">编辑</el-button>
-          <el-button v-permission="'HY_delete'" size="mini" plain type="danger" @click="btn_delete(scope.row.F_Id.toString.toString())">删除</el-button>
+          <el-button v-permission="'HY_delete'" size="mini" plain type="danger" @click="btn_delete(scope.row.F_Id.toString())">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -70,7 +70,7 @@ export default {
         const params = {
           pageindex: this.pageParams.pageindex, // 第几页
           pagesize: this.pageParams.pagesize, // 每页几条信息
-          key: this.keyword,
+          key: this.keyword.trim(),
         }
         getPositionLists(params).then(response => {
           this.loading = false

CallCenterWeb.UI/src/views/taskManagement/taskList/index.vue

@@ -45,8 +45,9 @@
        <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_DeptName" label="部门名称" align="center" min-width=""/>
+      <el-table-column prop="F_ParentName" label="父级任务名称" align="center" min-width=""/>
       <el-table-column prop="F_Name" label="任务名称" align="center" min-width=""/>
-      <el-table-column prop="F_Tasker" label="任务人" align="center" min-width=""/>
+      <el-table-column prop="F_TaskerName" label="任务人" align="center" min-width=""/>
       <el-table-column prop="F_Money" label="目标金额" align="center" min-width=""/>
       <el-table-column label="任务进度" align="center" >
           <template slot-scope="scope">