dd682d5f0c627c22c8ec5524965e25e17c4ea2f7..ef9037a3cb1e7da98e89f6a61da5f25d83ddc0d1
2021-05-12 zhoushiji
活动类型
ef9037 diff | tree
2021-05-12 jyk
ss
de06f1 diff | tree
2021-05-10 jyk
1
2283ae diff | tree
2021-05-12 zhoushiji
sj
682727 diff | tree
14 files modified
513 ■■■■■ changed files
src/views/activityManagement/activityList/ActivityAdd.vue 33 ●●●● patch | view | raw | blame | history
src/views/activityManagement/activityType/ActivityTypeList.vue 2 ●●● patch | view | raw | blame | history
src/views/activityManagement/groupWork/setGroupWork.vue 28 ●●●● patch | view | raw | blame | history
src/views/activityManagement/signupActivity/AddActivity.vue 10 ●●●● patch | view | raw | blame | history
src/views/activityManagement/signupActivity/EditAppletsExtension.vue 29 ●●●●● patch | view | raw | blame | history
src/views/ccCustomerManage/clientList/ConventionalAdd.vue 19 ●●●● patch | view | raw | blame | history
src/views/ccCustomerManage/clientList/FastCustomerAdd.vue 21 ●●●● patch | view | raw | blame | history
src/views/ccCustomerManage/customerPool/CustomerPoolList.vue 292 ●●●● patch | view | raw | blame | history
src/views/cluesManager/cluesList/CluesAdd.vue 19 ●●●● patch | view | raw | blame | history
src/views/cluesManager/cluesList/FastAdd.vue 21 ●●●● patch | view | raw | blame | history
src/views/finance/financeList/Curriculum/CurriculumAdd.vue 2 ●●● patch | view | raw | blame | history
src/views/main/Entry.vue 16 ●●●●● patch | view | raw | blame | history
src/views/myStudents/studentsList/ViewStudents.vue 2 ●●● patch | view | raw | blame | history
src/views/tmkCustomerManagement/customerList/FastCustomerAdd.vue 19 ●●●● patch | view | raw | blame | history
src/views/activityManagement/activityList/ActivityAdd.vue
@@ -285,31 +285,16 @@
                                    status:1
                                }
                                leveloneListList(data).then(res => {
                                     const menusIndex = localStorage.getItem('menusIndex')
                                        if (res.code == 1) {
                                            const cityself = []
                                                res.data.list.forEach((value,i)=>{
                                                if(value.orgId==menusIndex){
                                                    cityself.push(value)
                                                }
                                            })
                                            const cities =cityself.map((value, i) => ({
                                                value: value.id,
                                                label: value.name,
                                                leaf: value.hasChildren == 0 ? true : false,
                                                disabled: value.status == 0 ? true : false,
                                            }));
                                            resolve(cities);
                                    // const menusIndex = localStorage.getItem('menusIndex')
                                    if (res.code == 1) {
                                        const cities = res.data.list.map((value, i) => ({
                                            value: value.id,
                                            label: value.name,
                                            leaf: value.hasChildren == 0 ? true : false,
                                            disabled: value.status == 0 ? true : false,
                                        }));
                                        resolve(cities);
                                    }
                                    // if (res.code == 1) {
                                    //     const cities = res.data.list.map((value, i) => ({
                                    //         value: value.id,
                                    //         label: value.name,
                                    //         leaf: value.hasChildren == 0 ? true : false,
                                    //         disabled: value.status == 0 ? true : false,
                                    //     }));
                                    //     resolve(cities);
                                    // }
                                });
                            }
                            if (node.level == 1) {
src/views/activityManagement/activityType/ActivityTypeList.vue
@@ -258,7 +258,6 @@
                                    </span>
                                    <span class="joption" @click="deleteBtn(scope.row)">删除</span>
                                    <span class="joption" @click="AddSubclass(scope.row)" v-if="scope.row.level != 3">添加子类目</span>
                                </div>
                            </div>
                            <div v-else>
@@ -605,6 +604,7 @@
            },
            // 启用/禁用
            async enableDisable(row) {
                console.log(row)
                let id = row.id;
                let status = row.status;
                postTypestatusSave(id, status);
src/views/activityManagement/groupWork/setGroupWork.vue
@@ -1116,38 +1116,16 @@
                orgId,
              };
              leveloneListList(data).then((res) => {
                /* const menusIndex = null
                if(this.orgId){
                  menusIndex = this.orgId
                }else{
                  menusIndex = localStorage.getItem("menusIndex");
                } */
                const menusIndex = localStorage.getItem('menusIndex')
               if (res.code == 1) {
                  const cityself = []
                    res.data.list.forEach((value,i)=>{
                      if(value.orgId==menusIndex){
                        cityself.push(value)
                      }
                    })
                  const cities = cityself.map((value, i) => ({
                              value: value.id,
                              label: value.name,
                              leaf: value.hasChildren == 0 ? true : false,
                              disabled: value.status == 0 ? true : false,
                      }));
                  resolve(cities);
                }
               /*  if (res.code == 1) {
                // const menusIndex = localStorage.getItem('menusIndex')
                if (res.code == 1) {
                  const cities = res.data.list.map((value, i) => ({
                    value: value.id,
                    label: value.name,
                    leaf: value.hasChildren == 0 ? true : false,
                    disabled: value.status == 0 ? true : false,
                  }));
                  console.log('cities',cities)
                  resolve(cities);
                } */
                }
              });
            }
            if (node.level == 1) {
src/views/activityManagement/signupActivity/AddActivity.vue
@@ -576,15 +576,9 @@
                orgId,
              };
              leveloneListList(data).then((res) => {
                 const menusIndex = localStorage.getItem("menusIndex");
                // const menusIndex = localStorage.getItem('menusIndex')
                  if (res.code == 1) {
                    const cityself = []
                    res.data.list.forEach((value,i)=>{
                      if(value.orgId==menusIndex){
                        cityself.push(value)
                      }
                    })
                    const cities = cityself.map((value, i) => ({
                    const cities = res.data.list.map((value, i) => ({
                      value: value.id,
                      label: value.name,
                      leaf: value.hasChildren == 0 ? true : false,
src/views/activityManagement/signupActivity/EditAppletsExtension.vue
@@ -669,14 +669,18 @@
                orgId,
              };
              leveloneListList(data).then((res) => {
               const menusIndex = this.orgId
                if (res.code == 1) {
                  const cityself = []
                    res.data.list.forEach((value,i)=>{
                      if(value.orgId==menusIndex){
                        cityself.push(value)
                      }
                    })
              // const menusIndex = localStorage.getItem('menusIndex')
                /*  if (res.code == 1) {
                    const cities = res.data.list.map((value, i) => ({
                      value: value.id,
                      label: value.name,
                      leaf: value.hasChildren == 0 ? true : false,
                      disabled: value.orgId != menusIndex ? true : false,
                    }));
                    resolve(cities);
                  } */
                 if (res.code == 1) {
                  const cities = res.data.list.map((value, i) => ({
                    value: value.id,
                    label: value.name,
@@ -685,15 +689,6 @@
                  }));
                  resolve(cities);
                }
                //  if (res.code == 1) {
                //   const cities = res.data.list.map((value, i) => ({
                //     value: value.id,
                //     label: value.name,
                //     leaf: value.hasChildren == 0 ? true : false,
                //     disabled: value.status == 0 ? true : false,
                //   }));
                //   resolve(cities);
                // }
              });
            }
            if (node.level == 1) {
src/views/ccCustomerManage/clientList/ConventionalAdd.vue
@@ -460,23 +460,8 @@
                                }
                                leveloneListList(data).then(
                                    (res) => {
                                     const menusIndex = localStorage.getItem('menusIndex')
                                    // const menusIndex = localStorage.getItem('menusIndex')
                                        if (res.code == 1) {
                                            const cityself = []
                                            res.data.list.forEach((value,i)=>{
                                            if(value.orgId==menusIndex){
                                                cityself.push(value)
                                                }
                                            })
                                            const cities = cityself.map((value, i) => ({
                                                value: value.id,
                                                label: value.name,
                                                leaf: value.hasChildren == 0 ? true : false,
                                                disabled: value.status == 0 ? true : false,
                                            }));
                                            resolve(cities);
                                    }
                                    /*     if (res.code == 1) {
                                            const cities = res.data.list.map((value, i) => ({
                                                value: value.id,
                                                label: value.name,
@@ -484,7 +469,7 @@
                                                disabled: value.status == 0 ? true : false,
                                            }));
                                            resolve(cities);
                                        } */
                                        }
                                    }
                                );
                            }
src/views/ccCustomerManage/clientList/FastCustomerAdd.vue
@@ -294,23 +294,8 @@
                                }
                                leveloneListList(data).then(
                                    (res) => {
                                     const menusIndex = localStorage.getItem('menusIndex')
                                     if (res.code == 1) {
                                         const cityself = []
                                                res.data.list.forEach((value,i)=>{
                                                if(value.orgId==menusIndex){
                                                    cityself.push(value)
                                                }
                                            })
                                        const cities = cityself.map((value, i) => ({
                                            value: value.id,
                                            label: value.name,
                                            leaf: value.hasChildren == 0 ? true : false,
                                            disabled: value.status == 0 ? true : false,
                                        }));
                                        resolve(cities);
                                        }
                                        /* if (res.code == 1) {
                                    // const menusIndex = localStorage.getItem('menusIndex')
                                        if (res.code == 1) {
                                            const cities = res.data.list.map((value, i) => ({
                                                value: value.id,
                                                label: value.name,
@@ -318,7 +303,7 @@
                                                disabled: value.status == 0 ? true : false,
                                            }));
                                            resolve(cities);
                                        } */
                                        }
                                    }
                                );
                            }
src/views/ccCustomerManage/customerPool/CustomerPoolList.vue
@@ -7,26 +7,30 @@
        <!-- 内容 -->
        <div class="v-box">
            <el-tabs v-model="activeName" @tab-click="handleClick">
                <el-tab-pane label="预约客户" name="first" v-if="identityst3=='3'||identityst4=='4' || identityst1 == '1'">
                <el-tab-pane label="预约客户" name="first" v-if="identityst3=='3'||identityst4=='4'||identityst1 == '1'">
                    <span slot="label">
                        <i class="iconfont icon-2"></i>
                        <span class="ml-5 prohibitCopy">预约客户</span>
                    </span>
                    <div class="btnBox">
                        <button v-if="identityst3=='3'||identityst4=='4'" class="common-btn hollow-btn-orange" @click="massTransferPavilion">
                        <button v-if="identityst3=='3'||identityst4=='4'" class="common-btn hollow-btn-orange"
                            @click="massTransferPavilion">
                            <span class="iconfont icon-Fill1"></span>
                            批量分配CC
                        </button>
                        <span class="sp-font">共搜索到{{appointTotal}}条数据</span>
                    </div>
                    <div class="table-warp mt-20">
                        <el-table :data="clueaboutList" ref="multipleTable" style="width: 100%" border id="out-table" :row-key="getRowKeys" @selection-change="handleSelectionChange">
                        <el-table :data="clueaboutList" ref="multipleTable" style="width: 100%" border id="out-table"
                            :row-key="getRowKeys" @selection-change="handleSelectionChange">
                            <el-table-column type="selection" width="46" align="center" :reserve-selection="true">
                            </el-table-column>
                            <el-table-column prop="name" label="姓名/英文名" align="center">
                                <template class="triangle-box" slot-scope="scope">
                                    <el-tooltip class="item" effect="dark" :content="scope.row.nameEnglishname" placement="bottom">
                                        <span class="name cp Alittlebit" @click="viewgo(scope.row)">{{scope.row.name}}/{{scope.row.englishname}}</span>
                                    <el-tooltip class="item" effect="dark" :content="scope.row.nameEnglishname"
                                        placement="bottom">
                                        <span class="name cp Alittlebit"
                                            @click="viewgo(scope.row)">{{scope.row.name}}/{{scope.row.englishname}}</span>
                                    </el-tooltip>
                                </template>
                            </el-table-column>
@@ -44,7 +48,8 @@
                            </el-table-column>
                            <el-table-column label="预约事件" align="center" width="180">
                                <template slot-scope="scope">
                                    <el-tooltip class="item" effect="dark" :content="scope.row.BottomCentermsg" placement="bottom">
                                    <el-tooltip class="item" effect="dark" :content="scope.row.BottomCentermsg"
                                        placement="bottom">
                                        <span class="Alittlebit">{{scope.row.BottomCentermsg}}</span>
                                    </el-tooltip>
                                </template>
@@ -75,9 +80,10 @@
                        </el-table>
                    </div>
                    <div class="pageNumber">
                        <el-pagination background @size-change="appointHandleSizeChange" @current-change="appointHandleCurrentChange"
                         :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50, 100]" :page-size="appointPageSize" layout="total, sizes, prev, pager, next, jumper"
                         :total="appointTotal">
                        <el-pagination background @size-change="appointHandleSizeChange"
                            @current-change="appointHandleCurrentChange" :current-page="currentPage"
                            :page-sizes="[10, 20, 30, 40, 50, 100]" :page-size="appointPageSize"
                            layout="total, sizes, prev, pager, next, jumper" :total="appointTotal">
                        </el-pagination>
                    </div>
                </el-tab-pane>
@@ -87,20 +93,24 @@
                        <span class="ml-5 prohibitCopy">活动订单客户</span>
                    </span>
                    <div class="btnBox">
                        <button v-if="identityst3=='3'||identityst4=='4'" class="common-btn hollow-btn-orange" @click="massTransferPavilion">
                        <button v-if="identityst3=='3'||identityst4=='4'" class="common-btn hollow-btn-orange"
                            @click="massTransferPavilion">
                            <span class="iconfont icon-Fill1"></span>
                            批量分配CC
                        </button>
                        <span class="sp-font">共搜索到{{activityTotal}}条数据</span>
                    </div>
                    <div class="table-warp mt-20">
                        <el-table :data="activityList" ref="multipleTable1" style="width: 100%" border id="out-table" :row-key="getRowKeys" @selection-change="handleSelectionChange">
                        <el-table :data="activityList" ref="multipleTable1" style="width: 100%" border id="out-table"
                            :row-key="getRowKeys" @selection-change="handleSelectionChange">
                            <el-table-column type="selection" width="46" align="center" :reserve-selection="true">
                            </el-table-column>
                            <el-table-column prop="name" label="姓名/英文名" align="center" width="120" fixed>
                                <template class="triangle-box" slot-scope="scope">
                                    <el-tooltip class="item" effect="dark" :content="scope.row.nameEnglishname" placement="bottom">
                                        <span class="name cp Alittlebit" @click="viewgo(scope.row)">{{scope.row.name}}/{{scope.row.englishname}}</span>
                                    <el-tooltip class="item" effect="dark" :content="scope.row.nameEnglishname"
                                        placement="bottom">
                                        <span class="name cp Alittlebit"
                                            @click="viewgo(scope.row)">{{scope.row.name}}/{{scope.row.englishname}}</span>
                                    </el-tooltip>
                                </template>
                            </el-table-column>
@@ -129,14 +139,15 @@
                            <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">
                                        <el-tooltip class="item" effect="dark" :content="scope.row.BottomCentermsg"
                                            placement="bottom">
                                            <span class="Alittlebit">{{scope.row.BottomCentermsg}}</span>
                                        </el-tooltip>
                                    </span>
                                    <span v-else>
                                        <span class="Alittlebit">{{scope.row.BottomCentermsg}}</span>
                                    </span>
                                </template>
                            </el-table-column>
@@ -163,9 +174,10 @@
                        </el-table>
                    </div>
                    <div class="pageNumber">
                        <el-pagination background @size-change="activityHandleSizeChange" @current-change="activityHandleCurrentChange"
                         :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50, 100]" :page-size="activityPageSize" layout="total, sizes, prev, pager, next, jumper"
                         :total="activityTotal">
                        <el-pagination background @size-change="activityHandleSizeChange"
                            @current-change="activityHandleCurrentChange" :current-page="currentPage"
                            :page-sizes="[10, 20, 30, 40, 50, 100]" :page-size="activityPageSize"
                            layout="total, sizes, prev, pager, next, jumper" :total="activityTotal">
                        </el-pagination>
                    </div>
                </el-tab-pane>
@@ -175,20 +187,24 @@
                        <span class="ml-5 prohibitCopy">返回客户</span>
                    </span>
                    <div class="btnBox">
                        <button v-if="identityst3=='3'||identityst4=='4'" class="common-btn hollow-btn-orange" @click="massTransferPavilion">
                        <button v-if="identityst3=='3'||identityst4=='4'" class="common-btn hollow-btn-orange"
                            @click="massTransferPavilion">
                            <span class="iconfont icon-Fill1"></span>
                            批量分配CC
                        </button>
                        <span class="sp-font">共搜索到{{returnTotal}}条数据</span>
                    </div>
                    <div class="table-warp mt-20">
                        <el-table :data="returnList" ref="multipleTable2" style="width: 100%" border id="out-table" :row-key="getRowKeys" @selection-change="handleSelectionChange">
                        <el-table :data="returnList" ref="multipleTable2" style="width: 100%" border id="out-table"
                            :row-key="getRowKeys" @selection-change="handleSelectionChange">
                            <el-table-column type="selection" width="46" align="center" :reserve-selection="true">
                            </el-table-column>
                            <el-table-column prop="name" label="姓名/英文名" align="center" width="120" fixed>
                                <template class="triangle-box" slot-scope="scope">
                                    <el-tooltip class="item" effect="dark" :content="scope.row.nameEnglishname" placement="bottom">
                                        <span class="name cp Alittlebit" @click="viewgo(scope.row)">{{scope.row.name}}/{{scope.row.englishname}}</span>
                                    <el-tooltip class="item" effect="dark" :content="scope.row.nameEnglishname"
                                        placement="bottom">
                                        <span class="name cp Alittlebit"
                                            @click="viewgo(scope.row)">{{scope.row.name}}/{{scope.row.englishname}}</span>
                                    </el-tooltip>
                                </template>
                            </el-table-column>
@@ -212,7 +228,8 @@
                            </el-table-column>
                            <el-table-column label="最近事件内容" align="center" width="130">
                                <template slot-scope="scope">
                                    <el-tooltip class="item" effect="dark" :content="scope.row.eventType" placement="bottom">
                                    <el-tooltip class="item" effect="dark" :content="scope.row.eventType"
                                        placement="bottom">
                                        <span class="Alittlebit">{{scope.row.eventType}}</span>
                                    </el-tooltip>
                                </template>
@@ -241,18 +258,22 @@
                            <el-table-column label="操作" align="center" width="150" fixed="right">
                                <template slot-scope="scope">
                                    <span class="el-dropdown-link prohibitCopy">
                                        <span v-if="identityst3=='3'||identityst4=='4'" class="ff8c cp" @click="distriAppointment(scope.row)">分配CC</span>
                                        <span v-if="identityst3=='3'||identityst4=='4'" class="ff8c cp pl-24" @click="editAppointment(scope.row)">编辑</span>
                                        <span v-if="identityst1=='1'" class="ff8c cp pl-24" @click="flingqu(scope.row)">领取</span>
                                        <span v-if="identityst3=='3'||identityst4=='4'" class="ff8c cp"
                                            @click="distriAppointment(scope.row)">分配CC</span>
                                        <span v-if="identityst3=='3'||identityst4=='4'" class="ff8c cp pl-24"
                                            @click="editAppointment(scope.row)">编辑</span>
                                        <span v-if="identityst1=='1'" class="ff8c cp pl-24"
                                            @click="flingqu(scope.row)">领取</span>
                                    </span>
                                </template>
                            </el-table-column>
                        </el-table>
                    </div>
                    <div class="pageNumber">
                        <el-pagination background @size-change="returnHandleSizeChange" @current-change="returnHandleCurrentChange"
                         :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50, 100]" :page-size="returnPageSize" layout="total, sizes, prev, pager, next, jumper"
                         :total="returnTotal">
                        <el-pagination background @size-change="returnHandleSizeChange"
                            @current-change="returnHandleCurrentChange" :current-page="currentPage"
                            :page-sizes="[10, 20, 30, 40, 50, 100]" :page-size="returnPageSize"
                            layout="total, sizes, prev, pager, next, jumper" :total="returnTotal">
                        </el-pagination>
                    </div>
                </el-tab-pane>
@@ -261,7 +282,8 @@
        <!-- 分配TMK弹窗 -->
        <el-dialog title="选择人员" :visible.sync="distributionCC" @close="handleClose">
            <el-select v-model="form.distributionPeople" placeholder="请选择分配的人员">
                <el-option v-for="item in distributionPeople" :key="item.UserId" :label="item.RealCnName" :value="item.UserId">
                <el-option v-for="item in distributionPeople" :key="item.UserId" :label="item.RealCnName"
                    :value="item.UserId">
                </el-option>
            </el-select>
@@ -281,7 +303,9 @@
        userclueinvalidSave,
        cckList,
    } from "@/apis/ccCustomerManage/customerPool";
    import { ccuserclueCollar } from "@/apis/tmkCustomerManagement/customerList";
    import {
        ccuserclueCollar
    } from "@/apis/tmkCustomerManagement/customerList";
    import {
        Utils
    } from "@/assets/js/utils";
@@ -321,16 +345,16 @@
                    // branchName: '', //分馆名称
                    distributionPeople: '', //分配CC
                    userclueId: '', //用户id
                    distributionuer:''
                    distributionuer: ''
                },
                // 分配CC
                distributionPeople: [],
                selection: [],
                roleMaps:[],
                identityst1:'',
                identityst2:'',
                identityst3:'',
                identityst4:''
                roleMaps: [],
                identityst1: '',
                identityst2: '',
                identityst3: '',
                identityst4: ''
            };
        },
        methods: {
@@ -543,23 +567,23 @@
                    this.CcuserclueaboutList();
                }
            },
            flingqu(row){
                this.form.userclueId=row.id;
            flingqu(row) {
                this.form.userclueId = row.id;
                this.ccuserclueCollar();
            },
            async ccuserclueCollar(){
            async ccuserclueCollar() {
                let data = {
                    id: this.form.userclueId, //用户id
                    ccId:this.form.distributionuer, //登录人id
                    id: this.form.userclueId, //用户id
                    ccId: this.form.distributionuer, //登录人id
                }
                let res = await ccuserclueCollar(data)
                if(Object.is(res.code, 1)) {
                    this.$message({
                        message: '领取成功!',
                        type: 'success'
                    });
                if (Object.is(res.code, 1)) {
                    this.$message({
                        message: '领取成功!',
                        type: 'success'
                    });
                    this.CcuserclueaboutList();
                    this.CcusercluebackList();
                    this.CcusercluebackList();
                }
            },
            // 关闭弹窗的方法
@@ -568,77 +592,77 @@
            },
            forYears(str, item) {
            var r = str.match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})/);
            if (r == null) return false;
                var r = str.match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})/);
                if (r == null) return false;
            var d = new Date(r[1], r[3] - 1, r[4]);
            var returnStr = "输入的日期格式错误!";
                var d = new Date(r[1], r[3] - 1, r[4]);
                var returnStr = "输入的日期格式错误!";
            if (
                d.getFullYear() == r[1] &&
                d.getMonth() + 1 == r[3] &&
                d.getDate() == r[4]
            ) {
                var date = new Date();
                var yearNow = date.getFullYear();
                var monthNow = date.getMonth() + 1;
                var dayNow = date.getDate();
                if (
                    d.getFullYear() == r[1] &&
                    d.getMonth() + 1 == r[3] &&
                    d.getDate() == r[4]
                ) {
                    var date = new Date();
                    var yearNow = date.getFullYear();
                    var monthNow = date.getMonth() + 1;
                    var dayNow = date.getDate();
                var largeMonths = [1, 3, 5, 7, 8, 10, 12], //大月, 用于计算天,只在年月都为零时,天数有效
                lastMonth = monthNow - 1 > 0 ? monthNow - 1 : 12, // 上一个月的月份
                isLeapYear = false, // 是否是闰年
                daysOFMonth = 0; // 当前日期的上一个月多少天
                    var largeMonths = [1, 3, 5, 7, 8, 10, 12], //大月, 用于计算天,只在年月都为零时,天数有效
                        lastMonth = monthNow - 1 > 0 ? monthNow - 1 : 12, // 上一个月的月份
                        isLeapYear = false, // 是否是闰年
                        daysOFMonth = 0; // 当前日期的上一个月多少天
                if ((yearNow % 4 === 0 && yearNow % 100 !== 0) || yearNow % 400 === 0) {
                // 是否闰年, 用于计算天,只在年月都为零时,天数有效
                isLeapYear = true;
                }
                    if ((yearNow % 4 === 0 && yearNow % 100 !== 0) || yearNow % 400 === 0) {
                        // 是否闰年, 用于计算天,只在年月都为零时,天数有效
                        isLeapYear = true;
                    }
                if (largeMonths.indexOf(lastMonth) > -1) {
                daysOFMonth = 31;
                } else if (lastMonth === 2) {
                if (isLeapYear) {
                    daysOFMonth = 29;
                } else {
                    daysOFMonth = 28;
                }
                } else {
                daysOFMonth = 30;
                }
                    if (largeMonths.indexOf(lastMonth) > -1) {
                        daysOFMonth = 31;
                    } else if (lastMonth === 2) {
                        if (isLeapYear) {
                            daysOFMonth = 29;
                        } else {
                            daysOFMonth = 28;
                        }
                    } else {
                        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--;
                }
                if (M < 0) {
                // 借一年 12个月
                Y--;
                M = M + 12; //
                }
                    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--;
                    }
                if (Y < 0) {
                returnStr = "出生日期有误!";
                } else if (Y === 0) {
                    // debugger
                if (M === 0) {
                    returnStr = M + "岁";
                } else {
                    returnStr = M + "个月";
                    if (M < 0) {
                        // 借一年 12个月
                        Y--;
                        M = M + 12; //
                    }
                    if (Y < 0) {
                        returnStr = "出生日期有误!";
                    } else if (Y === 0) {
                        // debugger
                        if (M === 0) {
                            returnStr = M + "岁";
                        } else {
                            returnStr = M + "个月";
                        }
                    } else {
                        if (M === 0) {
                            returnStr = Y + "岁";
                        } else {
                            returnStr = Y + "岁" + M + "个月";
                        }
                    }
                }
                } else {
                if (M === 0) {
                    returnStr = Y + "岁";
                } else {
                    returnStr = Y + "岁" + M + "个月";
                }
                }
            }
            item.age = returnStr;
                item.age = returnStr;
            },
            // 编辑客户
            editAppointment(items) {
@@ -714,9 +738,9 @@
            },
        },
        created() {
            this.roleMaps=JSON.parse(utils.decrypt(localStorage.getItem("annieCRMUser"))).roleMaps;
            this.form.distributionuer=JSON.parse(utils.decrypt(localStorage.getItem("annieCRMUser"))).userId;
            this.identityst='';
            this.roleMaps = JSON.parse(utils.decrypt(localStorage.getItem("annieCRMUser"))).roleMaps;
            this.form.distributionuer = JSON.parse(utils.decrypt(localStorage.getItem("annieCRMUser"))).userId;
            this.identityst = '';
            /* if(localStorage.getItem('identity')=='2017'){
                this.identityst1='1';
            }else if(localStorage.getItem('identity')=='2016'){
@@ -726,32 +750,32 @@
            }else if(localStorage.getItem('identity')=='2026'){
                this.identityst4='4';
            } */
            this.roleMaps.forEach(item=>{
                if(item.RoleId==2017){//cc
                    this.identityst1='1';
                    this.activeName='first'
            this.roleMaps.forEach(item => {
                if (item.RoleId == 2017) { //cc
                    this.identityst1 = '1';
                    this.activeName = 'first'
                }
                if(item.RoleId==2016){//tmk
                    this.identityst2='2';
                if (item.RoleId == 2016) { //tmk
                    this.identityst2 = '2';
                }
                if(item.RoleId==2028){//销售主管
                    this.identityst3='3';
                    this.activeName='first'
                if (item.RoleId == 2028) { //销售主管
                    this.identityst3 = '3';
                    this.activeName = 'first'
                }
                if(item.RoleId==2026){//馆长
                    this.identityst4='4';
                    this.activeName='first'
                if (item.RoleId == 2026) { //馆长
                    this.identityst4 = '4';
                    this.activeName = 'first'
                }
            })
            if(this.identityst1=='1'){
                this.identityst2='';
            if (this.identityst1 == '1') {
                this.identityst2 = '';
            }
            if(this.orgId==43){
                    this.identityst1='1';
                    this.identityst2='2';
                    this.identityst3='3';
                    this.identityst4='4';
            if (this.orgId == 43) {
                this.identityst1 = '1';
                this.identityst2 = '2';
                this.identityst3 = '3';
                this.identityst4 = '4';
            }
            this.CcuserclueaboutList()
            // this.CcuserclueactivityList()
src/views/cluesManager/cluesList/CluesAdd.vue
@@ -450,23 +450,8 @@
                status: 1,
              };
              leveloneListList(data).then((res) => {
                 const menusIndex = localStorage.getItem('menusIndex')
              //  const menusIndex = localStorage.getItem('menusIndex')
                if (res.code == 1) {
                    const cityself = []
                        res.data.list.forEach((value,i)=>{
                          if(value.orgId==menusIndex){
                            cityself.push(value)
                        }
                    })
                    const cities = cityself.map((value, i) => ({
                      value: value.id,
                      label: value.name,
                      leaf: value.hasChildren == 0 ? true : false,
                      disabled: value.status == 0 ? true : false,
                    }));
                    resolve(cities);
                }
                /* if (res.code == 1) {
                  const cities = res.data.list.map((value, i) => ({
                    value: value.id,
                    label: value.name,
@@ -474,7 +459,7 @@
                    disabled: value.status == 0 ? true : false,
                  }));
                  resolve(cities);
                } */
                }
              });
            }
            if (node.level == 1) {
src/views/cluesManager/cluesList/FastAdd.vue
@@ -376,23 +376,8 @@
                status: 1,
              };
              leveloneListList(data).then((res) => {
                const menusIndex = localStorage.getItem('menusIndex')
                  if (res.code == 1) {
                    const cityself = []
                                            res.data.list.forEach((value,i)=>{
                        if(value.orgId==menusIndex){
                          cityself.push(value)
                          }
                                            })
                    const cities = cityself.map((value, i) => ({
                        value: value.id,
                        label: value.name,
                        leaf: value.hasChildren == 0 ? true : false,
                        disabled: value.status == 0 ? true : false,
                    }));
                    resolve(cities);
                }
              /*   if (res.code == 1) {
              // const menusIndex = localStorage.getItem('menusIndex')
                if (res.code == 1) {
                  const cities = res.data.list.map((value, i) => ({
                    value: value.id,
                    label: value.name,
@@ -400,7 +385,7 @@
                    disabled: value.status == 0 ? true : false,
                  }));
                  resolve(cities);
                } */
                }
              });
            }
            if (node.level == 1) {
src/views/finance/financeList/Curriculum/CurriculumAdd.vue
@@ -1043,7 +1043,7 @@
            async userList() {
                let data = {
                    page: 1, //页码
                    pageSize: 200, //每页多少条
                    pageSize: 300, //每页多少条
                    orgId: this.orgId
                };
                /* this.$message({
src/views/main/Entry.vue
@@ -487,6 +487,20 @@
            this.$message.error(msg);
          }
      }
      if(this.identityst4=='4'||this.identityst3=='3'){
                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,
                    this.userId
                );
                if (code == 1) {
                  this.bottomData = data;
                } else {
                  this.$message.error(msg);
                }
      }
    },
    // 获取区域或馆
@@ -833,7 +847,7 @@
  justify-content: space-between;
}
.dataText p {
  width: 18%;
  width: 20%;
  line-height: 40px;
}
.filter_box {
src/views/myStudents/studentsList/ViewStudents.vue
@@ -210,7 +210,6 @@
                            </div>
                            <div class="communication-box" style="padding-top: 0px;">
                                <div class="communication-con">
                                    <div class="communicationcon-box" style="padding-top: 0;" v-for="(items, index) in recordLists.list" :key="index">
                                        <div class="mt-10">预约内容:{{items.eventtypename}}<span v-if="items.eventtypetwoname">/{{items.eventtypetwoname}}</span></div>
@@ -357,6 +356,7 @@
            }
            let res = await userclueInfo(data);
            if (Object.is(res.code, 1)) {
                res.data.birthday = res.data.birthday.substring(0,10)
                // let classListArr = []
                res.data.classList.forEach(item => {
                    item.classListArr = [
src/views/tmkCustomerManagement/customerList/FastCustomerAdd.vue
@@ -294,23 +294,8 @@
                                }
                                leveloneListList(data).then(
                                    (res) => {
                                        const menusIndex = localStorage.getItem('menusIndex')
                                    // const menusIndex = localStorage.getItem('menusIndex')
                                        if (res.code == 1) {
                                            const cityself = []
                                                res.data.list.forEach((value,i)=>{
                                                if(value.orgId==menusIndex){
                                                    cityself.push(value)
                                                }
                                            })
                                            const cities = cityself.map((value, i) => ({
                                                value: value.id,
                                                label: value.name,
                                                leaf: value.hasChildren == 0 ? true : false,
                                                disabled: value.status == 0 ? true : false,
                                            }));
                                            resolve(cities);
                                        }
                                        /* if (res.code == 1) {
                                            const cities = res.data.list.map((value, i) => ({
                                                value: value.id,
                                                label: value.name,
@@ -318,7 +303,7 @@
                                                disabled: value.status == 0 ? true : false,
                                            }));
                                            resolve(cities);
                                        } */
                                        }
                                    }
                                );
                            }