3dac0836c5d1954f2c5cbacb1f02de3bb8d4453e..dd682d5f0c627c22c8ec5524965e25e17c4ea2f7
2021-05-11 zhoushiji
Merge branch 'master' of https://git.anniekids.com/r/anniekids-crm
dd682d diff | tree
2021-05-11 zhoushiji
页面bug修改
7b083d diff | tree
2021-05-08 jyk
ssss
e41a7f diff | tree
2021-05-08 jyk
111
40f4a5 diff | tree
14 files modified
184 ■■■■■ changed files
src/apis/entry/index.js 8 ●●●●● patch | view | raw | blame | history
src/assets/js/axios.js 2 ●●● patch | view | raw | blame | history
src/views/activityManagement/activityTemplate/GroupWorkTemplate.vue 2 ●●● patch | view | raw | blame | history
src/views/activityManagement/activityType/ActivityTypeList.vue 2 ●●● patch | view | raw | blame | history
src/views/activityManagement/groupWork/BranchLibrary.vue 41 ●●●●● patch | view | raw | blame | history
src/views/activityManagement/groupWork/allOrg.vue 2 ●●● patch | view | raw | blame | history
src/views/ccCustomerManage/clientList/SeeClient.vue 7 ●●●●● patch | view | raw | blame | history
src/views/finance/financeList/FinanceList.vue 6 ●●●●● patch | view | raw | blame | history
src/views/main/Entry.vue 76 ●●●● patch | view | raw | blame | history
src/views/myStudents/studentsList/ViewStudents.vue 3 ●●●● patch | view | raw | blame | history
src/views/tmkCustomerManagement/customerList/CustomerList.vue 16 ●●●●● patch | view | raw | blame | history
src/views/tmkCustomerManagement/customerList/SeeCustomer.vue 1 ●●●● patch | view | raw | blame | history
src/views/tmkCustomerManagement/overdueCustomers/OverdueCustomersList.vue 1 ●●●● patch | view | raw | blame | history
src/views/tmkCustomerManagement/reservation/ReservationList.vue 17 ●●●●● patch | view | raw | blame | history
src/apis/entry/index.js
@@ -29,6 +29,14 @@
let getOtherUrl = '/api/v1/Statisti/Orgother'
export const  getOther = (datetype,startTime,endTime,orgId)=>network.post(getOtherUrl,{datetype,startTime,endTime,orgId})
// cc底部数据
let getCcOrgotherUrl = '/api/v1/Statisti/CcOrgother'
export const  CcOrgother = (datetype,startTime,endTime,orgId,ccId)=>network.post(getCcOrgotherUrl,{datetype,startTime,endTime,orgId,ccId})
// tmk底部数据
let getTmkOrgotherUrl = '/api/v1/Statisti/TmkOrgother'
export const  TmkOrgother = (datetype,startTime,endTime,orgId,tmkId)=>network.post(getTmkOrgotherUrl,{datetype,startTime,endTime,orgId,tmkId})
// cc统计数据
let getCCStatisUrl = '/api/v1/Statisti/CcCommunicate'
src/assets/js/axios.js
@@ -41,7 +41,7 @@
let userId = '';
// POST传参序列化(添加请求拦截器)
axios.interceptors.request.use((config) => {
    // 获取 ANNIEKIDSUSS
    // 获取 ANNIEKIDSUSS
    // let ANNIEKIDSUSS = utils.getCookie("ANNIEKIDSUSS");
    let ANNIEKIDSUSS = cookie.get('ANNIEKIDSUSS');
    ANNIEKIDSUSS ? config.headers['ANNIEKIDSUSS'] = ANNIEKIDSUSS : '';
src/views/activityManagement/activityTemplate/GroupWorkTemplate.vue
@@ -5,7 +5,7 @@
        </div>
        <nav-list :navList="navList"></nav-list>
        <div class="table-box mt-20">
            <el-table :data="tableData" border style="width: 100%">
            <el-table :data="tableData" border :default-sort = "{prop: 'useCount', order: 'descending'}" style="width: 100%">
                <el-table-column label="序号" align="center">
                    <template slot-scope="scope">
                        <div>
src/views/activityManagement/activityType/ActivityTypeList.vue
@@ -481,7 +481,7 @@
                    status: this.form.status, //状态 1 正常 2 禁用
                };
                let res = await leveloneListList(data);
                console.log(res)
                // console.log(res)
                if (Object.is(res.code, 1)) {
                    res.data.list.forEach((item) => {
                        item.stateoption = false;
src/views/activityManagement/groupWork/BranchLibrary.vue
@@ -68,19 +68,19 @@
                    <el-table-column prop="title" label="活动名称" align="center">
                        <template slot-scope="scope">
                            <span class="cp" @click="seeClick(scope.row.id)">{{
                scope.row.title
              }}</span>
                                scope.row.title
                            }}</span>
                        </template>
                    </el-table-column>
                    <el-table-column label="活动起始时间" align="center" width="200">
                    <el-table-column label="活动起始时间" show-overflow-tooltip align="center" width="200">
                        <template slot-scope="scope">
                            <span v-if="scope.row.startTime">{{ scope.row.startTime }}</span>
                        </template>
                    </el-table-column>
                    <el-table-column label="活动结束时间" align="center">
                        <template slot-scope="scope">
                    <el-table-column label="活动结束时间" show-overflow-tooltip align="center">
                        <template slot-scope="scope" >
                            <span v-if="scope.row.endTime">{{ scope.row.endTime }}</span>
                        </template>
                    </el-table-column>
@@ -94,7 +94,7 @@
                    <el-table-column prop="appletsorgcount" label="参与馆数量" align="center">
                    </el-table-column>
                    <el-table-column prop="releaseTime" label="发布时间" align="center">
                    <el-table-column prop="releaseTime" show-overflow-tooltip label="发布时间" align="center">
                    </el-table-column>
                    <el-table-column label="发布状态" align="center">
                        <template slot-scope="scope">
@@ -130,21 +130,21 @@
                                    </span>
                                    <span v-else class="participated"> 设为模板 </span>
                                    <span @click="seeClick(scope.row.id)" v-if="
                      orgId == '43' ||
                      identityst1 == '1' ||
                      identityst2 == '2' ||
                      identityst3 == '3' ||
                      identityst4 == '4'
                    ">
                                        orgId == '43' ||
                                        identityst1 == '1' ||
                                        identityst2 == '2' ||
                                        identityst3 == '3' ||
                                        identityst4 == '4'
                                        ">
                                        <el-dropdown-item>查看</el-dropdown-item>
                                    </span>
                                    <!-- <span @click="applyBtn(scope.row.id)" v-if="orgId == '43' || identityst1 == '1' || identityst2 == '2' || identityst3 == '3' || identityst4 == '4'">
                    <el-dropdown-item>我要参加</el-dropdown-item>
                  </span> -->
                                        <el-dropdown-item>我要参加</el-dropdown-item>
                                    </span> -->
                                    <span v-if="
                      identityst3 == '3' || (identityst4 == '4' && orgId != 43)
                    "
                                            identityst3 == '3' || (identityst4 == '4' && orgId != 43)
                                            "
                                     @click="uploadQrcode(scope.row)">
                                        <el-dropdown-item v-if="!scope.row.secretaryqrcode">上传小秘书二维码</el-dropdown-item>
                                        <el-dropdown-item v-else>修改小秘书二维码</el-dropdown-item>
@@ -869,6 +869,12 @@
                };
                let res = await groupdetailList(data);
                if (Object.is(res.code, 1)) {
                    this.tableData = res.data.list;
                    this.total = res.data.total;
                }
                /* if (Object.is(res.code, 1)) {
                    res.data.list.forEach((item) => {
                        item.BottomCentermsg = item.typename;
                        if (item.startTime) {
@@ -883,8 +889,9 @@
                        }
                    });
                    this.tableData = res.data.list;
                    this.total = res.data.total;
                }
                } */
            },
            packageBtn(guidancefile) {
                location.href = "https://resourcecdn.anniekids.com" + guidancefile;
src/views/activityManagement/groupWork/allOrg.vue
@@ -91,7 +91,7 @@
        OrgName: "",
      };
      let res = await postOrganizeList(data);
      if (Object.is(res.code, 1)) {
        this.orglist = res.data;
      }
src/views/ccCustomerManage/clientList/SeeClient.vue
@@ -80,7 +80,8 @@
                            </div>
                    </div>
                    <!-- 活动信息 -->
                    <div class="v-box mt-10" v-if="form.usercluesaverecordList.length">
                    <!-- <div class="v-box mt-10" v-if="form.usercluesaverecordList.length"> -->
                    <div class="v-box mt-10" >
                        <div class="title">
                            活动信息
                        </div>
@@ -100,7 +101,8 @@
                        </div>
                    </div>
                    <!-- 跟单信息 -->
                    <div class="v-box mt-10" v-if="form.usercluesaverecordList.length">
                    <!-- <div class="v-box mt-10" v-if="form.usercluesaverecordList.length"> -->
                    <div class="v-box mt-10">
                        <div class="title">
                            跟单信息
                        </div>
@@ -377,7 +379,6 @@
                    this.showall(this.city, province, city, county)
                    res.data.birthday = res.data.birthday.split(" ")[0]
                    this.form = res.data;
                    if(res.data.usercluesaverecordList.length){
                        res.data.usercluesaverecordList.forEach(item => {
                            //显示多少个活动类型
src/views/finance/financeList/FinanceList.vue
@@ -213,7 +213,7 @@
                                        </span>
                                        <el-dropdown-menu slot="dropdown">
                                            <div v-if="orgId!=43">
                                                <div v-if="scope.row.isSave==1">
                                                <div>
                                                    <span @click="editadd(scope.row)" >
                                                        <el-dropdown-item>编辑</el-dropdown-item>
                                                    </span>
@@ -222,7 +222,7 @@
                                                    <el-dropdown-item>退费</el-dropdown-item>
                                                </span>
                                            </div>
                                        <!--     <div v-if="orgId!=43">
                                            <!-- <div v-if="orgId!=43">
                                                <div v-if="scope.row.isSave==1">
                                                    <span @click="editadd(scope.row)" v-if="identityst3=='3'||identityst4=='4'||((identityst1=='1'||identityst2=='2')&&scope.row.userId==userId)">
                                                        <el-dropdown-item>编辑</el-dropdown-item>
@@ -250,9 +250,7 @@
                                <div v-else>退费申请中...</div>
                            </div>
                        </template>
                    </el-table-column>
                </el-table>
            </div>
            <br />
src/views/main/Entry.vue
@@ -187,7 +187,7 @@
          <p v-if="RoleId == 3 || orgId == 43">
            CC预约量:{{ bottomData.ccUserclueCount }}个
          </p>
          <p v-if="RoleId == 1 || RoleId == 2">预约:30个</p>
          <!-- <p v-if="RoleId == 1 || RoleId == 2">预约:30个</p> -->
          <p>预约未到:{{ bottomData.notYetappointment }}个</p>
          <p>预约来到:{{ bottomData.Yetappointment }}个</p>
          <p>预约待来到:{{ bottomData.stayYetappointment }}个</p>
@@ -303,6 +303,8 @@
  getTMKOrder,
  getMessageList,
  setMessageStatus,
  CcOrgother,
  TmkOrgother
} from "@/apis/entry/index";
let utils = new Utils();
import cookie from "js-cookie";
@@ -345,6 +347,7 @@
        },
      ],
      orgId: "",
      userId:"",
      moreVisible: false,
      statisData: {},
      number: 0,
@@ -355,6 +358,10 @@
        myDate1: "",
      },
      topData: {},
      identityst1:'',
      identityst2:'',
      identityst3:'',
      identityst4:''
    };
  },
  computed: {
@@ -452,18 +459,34 @@
    // 获取其他数据
    async getOther() {
      let { code, data, msg } = await getOther(
        this.search.date1,
        this.search.date1 == 99 ? this.search.myDate1[0] : "",
        this.search.date1 == 99 ? this.search.myDate1[1] : "",
        this.orgId
      );
      if (code == 1) {
        this.bottomData = data;
      } else {
        this.$message.error(msg);
      }
      if(this.identityst1=='1'){
          let { code, data, msg } = await CcOrgother(
            this.search.date1,
            this.search.date1 == 99 ? this.search.myDate1[0] : "",
            this.search.date1 == 99 ? this.search.myDate1[1] : "",
            this.orgId,
            this.userId
          );
          if (code == 1) {
            this.bottomData = data;
          } else {
            this.$message.error(msg);
          }
      }
      if(this.identityst2=='2'){
          let { code, data, msg } = await TmkOrgother(
            this.search.date1,
            this.search.date1 == 99 ? this.search.myDate1[0] : "",
            this.search.date1 == 99 ? this.search.myDate1[1] : "",
            this.orgId,
              this.userId
          );
          if (code == 1) {
            this.bottomData = data;
          } else {
            this.$message.error(msg);
          }
      }
    },
    // 获取区域或馆
@@ -703,10 +726,17 @@
    let arr = JSON.parse(utils.decrypt(localStorage.getItem("annieCRMUser")))
      .roleMaps;
    arr.forEach((item) => {
      if (item.RoleId == 2017) {
        //cc
        this.RoleId = 1;
      if(item.RoleId==2017){//cc
          this.identityst1='1';
      }
      if(item.RoleId==2016){//tmk
          this.identityst2='2';
      }
      if(item.RoleId==2028){//销售主管
          this.identityst3='3';
      }
      if(item.RoleId==2026){//馆长
          this.identityst4='4';
      }
      if (item.RoleId == 2016) {
        //tmk
@@ -720,7 +750,15 @@
        //馆长
        this.RoleId = 4;
      }
      if (item.RoleId == 2017) {
        //cc
        this.RoleId = 1;
      }
    });
    if(this.identityst1=='1'){
        this.identityst2='';
    }
    console.log(this.RoleId)
    if (this.orgId == 43) {
      this.getEntryOrder();
      this.getTableData();
@@ -733,11 +771,11 @@
      this.getOther();
    }
    if (this.RoleId == 1 || this.RoleId == 2) {
      if (this.RoleId == 1) {
      if (this.identityst1 == '1') {
        this.getCCStatis();
        this.getCCOrder();
      }
      if (this.RoleId == 2) {
      if (this.identityst2 == '2') {
        this.getTMKStatis();
        this.getTMKOrder();
      }
src/views/myStudents/studentsList/ViewStudents.vue
@@ -53,7 +53,7 @@
                <!-- 内容 -->
                <div class="activityAdd-box">
                    <div class="select-box mt-10">
                        <div class="select-title"><span class="mandatory">*</span>姓名:{{user.name}}</div>
                        <div class="select-title"><span class="mandatory">*</span>姓名:{{user.name}}{{user.username}}</div>
                        <div class="select-title"><span class="mandatory">*</span>英文名:{{user.englishName}}</div>
                    </div>
@@ -367,7 +367,6 @@
                    ]
                })
                this.user = res.data;
            } 
        },
         // 沟通记录
src/views/tmkCustomerManagement/customerList/CustomerList.vue
@@ -64,22 +64,6 @@
                    <el-input v-model="form.tmkName" placeholder="请输入TMK" class="j-right-border1"></el-input>
                </div>
                <div class="matr20">
                    <el-select v-model="form.date" placeholder="请选择最近沟通时间">
                        <el-option v-for="item in date" :key="item.value" :label="item.label" :value="item.value">
src/views/tmkCustomerManagement/customerList/SeeCustomer.vue
@@ -382,6 +382,7 @@
                    let city = res.data.city;
                    let county = res.data.county;
                    this.showall(this.city, province, city, county)
                    res.data.birthday=res.data.birthday.substring(0,10)
                    this.form = res.data;
                    if(res.data.usercluesaverecordList.length){
                        res.data.usercluesaverecordList.forEach(item => {
src/views/tmkCustomerManagement/overdueCustomers/OverdueCustomersList.vue
@@ -656,6 +656,7 @@
                this.form.activityType = ''; //活动类型
                this.form.activityName = ''; //活动名称
                this.form.orgname = ''; //分馆名称
                this.form.customDate = [] //自行选择时间
                this.$refs.cascader.$refs.panel.clearCheckedNodes()
                this.page = 1;
                this.pageSize = 10;
src/views/tmkCustomerManagement/reservation/ReservationList.vue
@@ -41,7 +41,7 @@
                        <el-option v-for="item in eventdata" :key="item.value" :label="item.label" :value="item.value">
                        </el-option>
                    </el-select>
                    <el-cascader v-if="form.eventids == '1'" ref="cascader" :props="propss" @change="handleChange" placeholder="请选择事件内容"></el-cascader>
                    <el-cascader v-if="form.eventids == '1'" ref="cascader" :props="propss" @change="handleChange" placeholder="请选择预约内容"></el-cascader>
                    <el-select v-model="form.statusIdea" @change="statusIdeafu" v-if="form.eventids == '2'">
                        <el-option v-for="item in statusIdeaArr" :key="item.value" :label="item.label" :value="item.value">
                        </el-option>
@@ -109,7 +109,7 @@
                    </el-table-column>
                    <el-table-column prop="age" label="年龄" width="100" align="center">
                    </el-table-column>
                    </el-table-column>
                    <el-table-column prop="birthday" label="出生日期" align="center">
                    </el-table-column>
@@ -137,7 +137,8 @@
                            </el-tooltip>
                        </template>
                    </el-table-column> -->
                    <el-table-column label="预约事件" align="center" width="180">
                    <el-table-column label="预约内容" align="center" width="180">
                        <template slot-scope="scope">
                            <span v-if="scope.row.BottomCentermsg.length > 9">
                                <el-tooltip class="item" effect="dark" :content="scope.row.BottomCentermsg" placement="bottom">
@@ -285,7 +286,7 @@
                ],
                eventdata: [{
                        value: "1",
                        label: "按事件",
                        label: "按预约内容",
                    },
                    {
                        value: "2",
@@ -518,15 +519,15 @@
                    daysOFMonth = 28;
                }
                } else {
                daysOFMonth = 30;
                    daysOFMonth = 30;
                }
                var Y = yearNow - parseInt(r[1]);
                var M = monthNow - parseInt(r[3]);
                var D = dayNow - parseInt(r[4]);
                if (D < 0) {
                D = D + daysOFMonth; //借一个月
                M--;
                    D = D + daysOFMonth; //借一个月
                    M--;
                }
            
                if (M < 0) {
@@ -587,6 +588,7 @@
                    pageSize: this.pageSize,
                };
                let res = await appointmentlist(data);
                // console.log(res)
                res.data.list.forEach((item) => {
                    // 获取当前年份
                    if(item.birthday){
@@ -624,6 +626,7 @@
            "form.customDate"(newVal) {
                if (newVal == null) {
                    this.form.customDate = [];
                }
            },
        },