小更新

backup_master_20231211
飘泊客 11 months ago
parent aeba0a5793
commit 28f81ff73c

@ -3,13 +3,13 @@
# @Autor: 飘泊客 # @Autor: 飘泊客
# @Date: 2023-05-05 16:18:03 # @Date: 2023-05-05 16:18:03
# @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git # @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
# @LastEditTime: 2023-10-09 15:31:18 # @LastEditTime: 2023-10-16 12:57:34
### ###
ENV = 'production' ENV = 'production'
# 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇Nginx 配置 # 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇Nginx 配置
# 接口地址,注意协议,如果你没有配置 ssl需要将 https 改为 http # 接口地址,注意协议,如果你没有配置 ssl需要将 https 改为 http
VUE_APP_BASE_API = 'http://39.100.77.21:8013' VUE_APP_BASE_API = 'https://baiyee.vip'
VUE_APP_BASE_IMG = 'http://39.100.77.21:8013' VUE_APP_BASE_IMG = 'https://baiyee.vip'
# 如果接口是 http 形式, wss 需要改为 ws # 如果接口是 http 形式, wss 需要改为 ws
VUE_APP_WS_API = 'wss://baiyee.vip' VUE_APP_WS_API = 'wss://baiyee.vip'

@ -3,7 +3,7 @@
* @Autor: 飘泊客 * @Autor: 飘泊客
* @Date: 2021-12-02 16:54:53 * @Date: 2021-12-02 16:54:53
* @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
* @LastEditTime: 2023-07-12 15:58:49 * @LastEditTime: 2023-10-16 19:32:17
--> -->
<template> <template>
<div> <div>
@ -1482,18 +1482,6 @@ export default {
this.agreementDialog = this.user.companyStatus !== 1 this.agreementDialog = this.user.companyStatus !== 1
} }
this.updateUrl = this.$store.getters.picturesUpload this.updateUrl = this.$store.getters.picturesUpload
// var isrem = localStorage.getItem('isRemind')
// if (everydayRemind() && isrem !== 1 && this.user.companyStatus === 1) {
// this.$alert(
// `<i style='color:red'></i>`,
// '',
// {
// confirmButtonText: '',
// dangerouslyUseHTMLString: true
// }
// )
// localStorage.setItem('isRemind', 1)
// }
} else if (!this.user.isManager && !this.user.isAdmin) { } else if (!this.user.isManager && !this.user.isAdmin) {
this.Statistics.usrNum = 0 this.Statistics.usrNum = 0
this.Statistics.turnOnNum = 0 this.Statistics.turnOnNum = 0
@ -1517,6 +1505,18 @@ export default {
} }
this.getTurnover() this.getTurnover()
} }
//
// var isrem = Number(localStorage.getItem('isRemind'))
// if (isrem !== 1) {
// this.$alert(
// `<i><i style='color:red'></i>10168CRM线</i>`,
// '',
// {
// confirmButtonText: '',
// dangerouslyUseHTMLString: true
// }
// )
// }
}, },
methods: { methods: {
handleSetLineChartData(type) { handleSetLineChartData(type) {

@ -108,7 +108,7 @@
inactive-text="是否开启" inactive-text="是否开启"
/> />
</div> </div>
<el-table ref="multipleTable" :data="userOptionsAll" tooltip-effect="dark" style="height: 400px;overflow-y: auto;" @selection-change="handleUserSelectionChange"> <el-table ref="multipleTable" :data="userOptionsAll" :header-cell-style="{'text-align':'left'}" tooltip-effect="dark" style="height: 400px;overflow-y: auto;" @selection-change="handleUserSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column width="100" property="label" label="组员名" /> <el-table-column width="100" property="label" label="组员名" />
<el-table-column label="分配比"> <el-table-column label="分配比">

@ -3,7 +3,7 @@
* @Autor: 飘泊客 * @Autor: 飘泊客
* @Date: 2022-01-13 15:43:13 * @Date: 2022-01-13 15:43:13
* @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
* @LastEditTime: 2023-10-13 11:29:17 * @LastEditTime: 2023-10-13 16:27:05
--> -->
<template> <template>
<div class="app-container"> <div class="app-container">
@ -34,7 +34,7 @@
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column
label="操作" label="操作"
width="300" width="140"
align="center" align="center"
fixed="right" fixed="right"
> >

@ -213,6 +213,7 @@
:data="crud.data" :data="crud.data"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
row-key="id" row-key="id"
:header-cell-style="{'text-align':'left'}"
@select="crud.selectChange" @select="crud.selectChange"
@select-all="crud.selectAllChange" @select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler" @selection-change="crud.selectionChangeHandler"

@ -21,7 +21,7 @@
</div> </div>
</div> </div>
<!--表格渲染--> <!--表格渲染-->
<el-table v-loading="loading" :data="data" style="width: 100%;margin-top: -10px;"> <el-table v-loading="loading" :data="data" style="width: 100%;margin-top: -10px;" :header-cell-style="{'text-align':'left'}">
<el-table-column :show-overflow-tooltip="true" prop="jobName" label="任务名称" /> <el-table-column :show-overflow-tooltip="true" prop="jobName" label="任务名称" />
<el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称" /> <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称" />
<el-table-column :show-overflow-tooltip="true" prop="methodName" label="执行方法" /> <el-table-column :show-overflow-tooltip="true" prop="methodName" label="执行方法" />

@ -223,6 +223,7 @@
ref="multipleTable" ref="multipleTable"
v-loading="approvalLoading" v-loading="approvalLoading"
:data="item.list" :data="item.list"
:header-cell-style="{'text-align':'left'}"
style="width: 100%" style="width: 100%"
> >
<el-table-column <el-table-column

@ -345,6 +345,7 @@
<el-table <el-table
:data="dyGrantList" :data="dyGrantList"
stripe stripe
:header-cell-style="{'text-align':'left'}"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="authorizeName" label="抖音名" width="160" /> <el-table-column prop="authorizeName" label="抖音名" width="160" />

@ -447,8 +447,10 @@
<el-radio v-for="(item, index) in taskDetail.baseLabel" :key="index" :label="item">{{ item }}</el-radio> <el-radio v-for="(item, index) in taskDetail.baseLabel" :key="index" :label="item">{{ item }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<div class="label-link">客户号码</div> <div v-if="radioLabel == '有意向'">
<el-input v-model="newNid" type="number" placeholder="请输入客户号码" /> <div class="label-link">客户号码</div>
<el-input v-model="newNid" type="number" placeholder="请输入客户号码" />
</div>
<div class="label-link">线索记录</div> <div class="label-link">线索记录</div>
<div class="u-flex mt-15"> <div class="u-flex mt-15">
<el-input v-model="taskRemarks" type="textarea" :rows="5" placeholder="添加线索记录" /> <el-input v-model="taskRemarks" type="textarea" :rows="5" placeholder="添加线索记录" />
@ -1063,7 +1065,7 @@ export default {
clueId: index != null ? this.crud.data[index].id : this.taskDetail.id, clueId: index != null ? this.crud.data[index].id : this.taskDetail.id,
optimisticVersion: index != null ? this.crud.data[index].optimisticVersion : this.taskDetail.optimisticVersion optimisticVersion: index != null ? this.crud.data[index].optimisticVersion : this.taskDetail.optimisticVersion
} }
if ((type === 'labsub' && this.radioLabel === '有意向') || type === 'update') { if ((type === 'labsub' && this.radioLabel === '有意向') || (type === 'update' && this.radioLabel === '有意向')) {
const reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ const reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
if (!reg_tel.test(this.newNid)) { if (!reg_tel.test(this.newNid)) {
this.$message({ this.$message({
@ -1085,7 +1087,7 @@ export default {
} }
if (type === 'update') { if (type === 'update') {
this.loadingSub = true this.loadingSub = true
// //
if (this.radioLabel) { if (this.radioLabel) {
delete data.optimisticVersion delete data.optimisticVersion
data.sourceLabel = [this.radioLabel] data.sourceLabel = [this.radioLabel]

@ -385,8 +385,10 @@
<el-radio v-for="(item, index) in taskDetail.baseLabel" :key="index" :label="item">{{ item }}</el-radio> <el-radio v-for="(item, index) in taskDetail.baseLabel" :key="index" :label="item">{{ item }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<div class="label-link">客户号码</div> <div v-if="radioLabel == '有意向'">
<el-input v-model="newNid" type="number" placeholder="请输入客户号码" /> <div class="label-link">客户号码</div>
<el-input v-model="newNid" type="number" placeholder="请输入客户号码" />
</div>
<div class="label-link">线索记录</div> <div class="label-link">线索记录</div>
<div class="u-flex mt-15"> <div class="u-flex mt-15">
<el-input v-model="taskRemarks" type="textarea" :rows="5" placeholder="添加线索记录" /> <el-input v-model="taskRemarks" type="textarea" :rows="5" placeholder="添加线索记录" />
@ -966,7 +968,7 @@ export default {
clueId: index != null ? this.crud.data[index].id : this.taskDetail.id, clueId: index != null ? this.crud.data[index].id : this.taskDetail.id,
optimisticVersion: index != null ? this.crud.data[index].optimisticVersion : this.taskDetail.optimisticVersion optimisticVersion: index != null ? this.crud.data[index].optimisticVersion : this.taskDetail.optimisticVersion
} }
if ((type === 'labsub' && this.radioLabel === '有意向') || type === 'update') { if ((type === 'labsub' && this.radioLabel === '有意向') || (type === 'update' && this.radioLabel === '有意向')) {
const reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ const reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
if (!reg_tel.test(this.newNid)) { if (!reg_tel.test(this.newNid)) {
this.$message({ this.$message({
@ -988,7 +990,7 @@ export default {
} }
if (type === 'update') { if (type === 'update') {
this.loadingSub = true this.loadingSub = true
// //
if (this.radioLabel) { if (this.radioLabel) {
delete data.optimisticVersion delete data.optimisticVersion
data.sourceLabel = [this.radioLabel] data.sourceLabel = [this.radioLabel]

@ -139,7 +139,7 @@
inactive-text="是否开启" inactive-text="是否开启"
/> />
</div> </div>
<el-table ref="multipleTable" :data="userOptionsAll" tooltip-effect="dark" style="height: 400px;overflow-y: auto;" @selection-change="handleUserSelectionChange"> <el-table ref="multipleTable" :data="userOptionsAll" tooltip-effect="dark" :header-cell-style="{'text-align':'left'}" style="height: 400px;overflow-y: auto;" @selection-change="handleUserSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column width="100" property="label" label="组员名" /> <el-table-column width="100" property="label" label="组员名" />
<el-table-column label="分配比"> <el-table-column label="分配比">

Loading…
Cancel
Save