yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 3 years ago
parent
2ee91e4273 63ce349886
commit
9e28f9294f
9 changed files with 161 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmcustomer.js
  2. 2
      anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmvisit.js
  3. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiu.vue
  4. 165
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue
  5. 32
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiliAdd.vue
  6. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
  7. 10
      anrui-system-ui/src/views/Home/Home.vue
  8. 3
      anrui-system-ui/src/views/flow/doneList.vue
  9. 3
      anrui-system-ui/src/views/flow/todoList.vue

4
anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmcustomer.js
View File

@ -56,9 +56,9 @@ export function deleteBySids(data) {
return request({ return request({
// url: '/crm/v1/crmcustomer/deleteBySids?sids=' + data, // url: '/crm/v1/crmcustomer/deleteBySids?sids=' + data,
url: '/crm/v1/crmcustomertemp/del/' + data, url: '/crm/v1/crmcustomertemp/del/' + data,
method: 'GET', method: 'DELETE',
// data: data // data: data
data: data data: qs.stringify(data)
}) })
} }

2
anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmvisit.js
View File

@ -49,7 +49,7 @@ export function fetchSid(data) {
export function del(data) { export function del(data) {
return request({ return request({
url: '/crm/v1/crmvisit/del/' + data, url: '/crm/v1/crmvisit/del/' + data,
method: 'get', method: 'DELETE',
data: qs.stringify(data) data: qs.stringify(data)
}) })
} }

2
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiu.vue
View File

@ -30,7 +30,7 @@
<el-option v-for="(item, index) in figuration" :key="index" :label="item.modelName" :value="item.sid"/> <el-option v-for="(item, index) in figuration" :key="index" :label="item.modelName" :value="item.sid"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="购买方式"> <el-form-item label="购车方式">
<!-- <el-input v-model="listQuery.params.orgSid" placeholder="" clearable /> --> <!-- <el-input v-model="listQuery.params.orgSid" placeholder="" clearable /> -->
<el-select v-model="listQuery.params.purchaseMethodValue" class="addinputw" placeholder="请选择" @change="getGouche" style="width:200px"> <el-select v-model="listQuery.params.purchaseMethodValue" class="addinputw" placeholder="请选择" @change="getGouche" style="width:200px">
<el-option v-for="item in orgSid_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/> <el-option v-for="item in orgSid_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>

165
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue
View File

@ -112,12 +112,12 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item>
<el-radio v-model="temp.isOnRemind" label="是">是</el-radio> <el-radio :disabled="editState" v-model="temp.isOnRemind" label="是">是</el-radio>
<el-radio v-model="temp.isOnRemind" label="否">否</el-radio> <el-radio :disabled="editState" v-model="temp.isOnRemind" label="否">否</el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="temp.isOnRemind=='是'"> <el-row v-show="temp.isOnRemind=='是' && isOnRemind == '是'">
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span slot="label">提醒日期</span> <span slot="label">提醒日期</span>
@ -125,7 +125,10 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item>
<el-date-picker v-model="temp.remind_day" type="date" style="width:50%" value-format="yyyy-MM-dd" placeholder="选择日期"> <el-date-picker v-model="temp.remind_day" type="date" style="width:50%"
value-format="yyyy-MM-dd"
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -151,7 +154,10 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item>
<el-date-picker v-model="temp.birthday" style="width:50%" type="date" format="yyyy-MM-dd" class="addinputw" value-format="yyyy-MM-dd" placeholder="请选择"/> <el-date-picker v-model="temp.birthday" type="date" style="width:50%"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
@ -186,8 +192,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item prop="idnumber">
<el-input v-model="temp.idnumber" style="width:50%" maxlength="20" placeholder="请输入证件号码" class="addinputw" clearable/> <el-input v-model="temp.idnumber" style="width:50%" maxlength="20" placeholder="请输入证件号码"
class="addinputw" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -208,8 +215,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item prop="e_mail">
<el-input v-model="temp.e_mail" maxlength="20" style="width:50%" placeholder="请输入电子邮箱" class="addinputw" clearable/> <el-input v-model="temp.e_mail" maxlength="20" style="width:50%" placeholder="请输入电子邮箱"
class="addinputw" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -230,7 +238,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item> <el-form-item prop="emergencyMobile">
<el-input v-model="temp.emergencyMobile" maxlength="20" style="width:50%" placeholder="请输入紧急联系电话" class="addinputw" clearable/> <el-input v-model="temp.emergencyMobile" maxlength="20" style="width:50%" placeholder="请输入紧急联系电话" class="addinputw" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -330,9 +338,10 @@
<el-checkbox v-for="item in aseType" :key="item.divtkey" :label="item.divtkey"> <el-checkbox v-for="item in aseType" :key="item.divtkey" :label="item.divtkey">
{{ item.dictValue }} {{ item.dictValue }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group><!-- -->
<div class="mw">第 <div class="mw">第
<el-input v-model="templooke.purchase_num" maxlength="10" class="addinputwduan" clearable/> <el-input v-model="templooke.purchase_num" :disabled="templooke.purchase_time == '0'"
maxlength="10" class="addinputwduan" clearable/>
辆 辆
</div> </div>
</div> </div>
@ -383,7 +392,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<span slot="label">文件</span> <span slot="label">文件</span>
<Upload ref="uploadImg" v-model="list1" :limit="1" bucket="map" :upload-data="{type:'0001'}"/> <Upload ref="uploadImg" v-model="list1" bucket="map" :upload-data="{type:'0001'}"/>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -406,13 +415,7 @@
</template> </template>
<script> <script>
import { import {getPcCustomerInfoBySid, savePcCustomerInfo, updatePcCustomerInfo,} from '@/api/jichuxinxi/crmcustomer'
getPcCustomerInfoBySid,
// getPcDistributorList,
// namesDown,
savePcCustomerInfo,
updatePcCustomerInfo,
} from '@/api/jichuxinxi/crmcustomer'
import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' // 省市区 import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' // 省市区
import {typeValues} from '@/api/dictcommons/shujuzidian' import {typeValues} from '@/api/dictcommons/shujuzidian'
import {loginDetails} from '@/api/dictcommons/basemanufacturer' import {loginDetails} from '@/api/dictcommons/basemanufacturer'
@ -420,7 +423,7 @@ import {getStorage} from '@/utils/auth'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import {getPcBusinessInfoBySid} from '@/api/jichuxinxi/crmbusiness' import {getPcBusinessInfoBySid} from '@/api/jichuxinxi/crmbusiness'
import Upload from '@/components/uploadFile/upload.vue' // 上传文件 import Upload from '@/components/uploadFile/ManyImageUpload.vue' // 上传文件
export default { export default {
name: 'KehudanganAdd', name: 'KehudanganAdd',
@ -429,20 +432,71 @@ export default {
var checkSubmit = (rule, value, callback) => { var checkSubmit = (rule, value, callback) => {
const Submit = const Submit =
/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
if (Submit.test(value)) { if (value) {
return callback() if (!Submit.test(value)) {
}
callback(new Error('请输入手机号')) callback(new Error('请输入手机号'))
} }
callback()
}
callback()
// if (Submit.test(value)) {
// return callback()
// }
// callback(new Error('请输入手机号'))
}
var validatePass2 = (rule, value, callback) => {
const WeiXin = /^[a-zA-Z][a-zA-Z\d_-]{5,19}$/;
const phone = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
if (value) {
// 如果没有通过验证！！
if (!WeiXin.test(value) && !phone.test(value)) {
callback(new Error("请输入正确的微信号码"));
}
callback();
} else {
callback();
}
};
var identitycard = (rules, value, callback) => { var identitycard = (rules, value, callback) => {
const card = const card =
/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/ /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
if (card.test(value)) { if (value) {
return callback() if (!card.test(value)) {
}
callback(new Error('请输入身份证号码')) callback(new Error('请输入身份证号码'))
} }
callback()
}
callback()
// if (card.test(value)) {
// return callback()
// }
// callback(new Error('请输入身份证号码'))
}
var validateE_mail = (rules, value, callback) => {
const mail =
/^[a-zA-Z0-9_-]+@([a-zA-Z0-9]+\.)+(com|cn|net|org)$/
if (value) {
if (!mail.test(value)) {
callback(new Error('请输入正确的电子邮箱'))
}
callback()
}
callback()
// if (card.test(value)) {
// return callback()
// }
// callback(new Error('请输入身份证号码'))
}
return { return {
// 限制日期不可选择当天之前的
pickerOptions: {
disabledDate(time) {
let oneDay = 60 * 60 * 24 * 1000;
return time.getTime() < Date.now() - oneDay;
},
},
editState: false,
isOnRemind: '是',
// ---见证材料 // ---见证材料
list1: [], list1: [],
list2: [], list2: [],
@ -539,21 +593,42 @@ export default {
message: '请填写客户地址', message: '请填写客户地址',
trigger: 'blur' trigger: 'blur'
} }
] ],
// mobile: [ mobile: [
// { {
// required: true, required: true,
// validator: checkSubmit, validator: checkSubmit,
// trigger: 'blur', trigger: 'blur',
// }, },
// ], ],
// idnumber: [ weixin: [
// { {
// required: true, required: true,
// validator: identitycard, validator: validatePass2,
// trigger: 'blur', trigger: 'blur',
// }, },
// ], ],
idnumber: [
{
required: true,
validator: identitycard,
trigger: 'blur',
},
],
e_mail: [
{
required: true,
validator: validateE_mail,
trigger: 'blur',
},
],
emergencyMobile: [
{
required: true,
validator: checkSubmit,
trigger: 'blur',
},
],
} }
} }
}, },
@ -571,6 +646,7 @@ export default {
this.clientSid = sid this.clientSid = sid
this.stateId = sid this.stateId = sid
this.isOnRemind = '否' this.isOnRemind = '否'
this.editState = true
if (this.stateId !== '0') { if (this.stateId !== '0') {
getPcCustomerInfoBySid(this.stateId).then((response) => { getPcCustomerInfoBySid(this.stateId).then((response) => {
console.log(response.data) console.log(response.data)
@ -794,6 +870,8 @@ export default {
// ----------------------------------方法-------------------- // ----------------------------------方法--------------------
// 组件返回 // 组件返回
handleReturn() { handleReturn() {
this.isOnRemind = '是'
this.editState = false
this.activeNames = ['1'] this.activeNames = ['1']
this.$emit('handleReturn') this.$emit('handleReturn')
}, },
@ -856,6 +934,9 @@ export default {
// 保存客户运营数据 // 保存客户运营数据
handleJUBuCun() { handleJUBuCun() {
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (this.templooke.purchase_time == '0') {
this.templooke.purchase_num = ''
}
if (valid) { if (valid) {
this.FormLoading = true this.FormLoading = true
if (this.temp.sex !== '') { if (this.temp.sex !== '') {

32
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiliAdd.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="tab-header webtop"> <div class="tab-header webtop">
<div>【新增】客户跟进记录</div> <div>{{viewTitle}}</div>
<div> <div>
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button> <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<!-- <el-button type="primary" size="small">下载</el-button> --> <!-- <el-button type="primary" size="small">下载</el-button> -->
@ -25,8 +25,8 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row class="bordertopline"> <el-row class="bordertopline">
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item prop="follow_form"> <el-form-item>
<span slot="label">跟进形式</span> <span slot="label"><span class="icon">*</span>跟进形式</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -49,8 +49,8 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item prop="follow_result"> <el-form-item>
<span slot="label">跟进结果</span> <span slot="label"><span class="icon">*</span>跟进结果</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
@ -88,15 +88,17 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item prop="remind_day" v-show="temp.isOnRemind=='是'"> <el-form-item v-show="temp.isOnRemind=='是'">
<span slot="label">提醒日期</span> <span slot="label">提醒日期</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="remind_day" v-show="temp.isOnRemind=='是'"> <el-form-item prop="remind_day" v-show="temp.isOnRemind=='是'">
<el-select v-model="temp.remind_day" class="addinputw" placeholder="" style="width:60%" @change="gettime"> <el-date-picker v-model="temp.remind_day" type="date" format="yyyy-MM-dd" class="addinputw"
<el-option v-for="(item, index) in reminderdate" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/> value-format="yyyy-MM-dd" placeholder="选择日期" :picker-options="pickerOptions"/>
</el-select> <!-- <el-select v-model="temp.remind_day" class="addinputw" placeholder="" style="width:60%" @change="gettime">-->
<!-- <el-option v-for="(item, index) in reminderdate" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -112,7 +114,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row v-show="stateId == '0'">
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span slot="label">见证材料</span> <span slot="label">见证材料</span>
@ -150,6 +152,14 @@ export default {
}, },
data() { data() {
return { return {
// 限制日期不可选择当天之前的
pickerOptions: {
disabledDate(time) {
let oneDay = 60 * 60 * 24 * 1000;
return time.getTime() < Date.now() - oneDay;
},
},
viewTitle:'',
stateId: 0, stateId: 0,
FormLoading: false, FormLoading: false,
followupform: [], followupform: [],
@ -207,6 +217,7 @@ export default {
}, },
// 修改回显 // 修改回显
openUpdate(sid, cusid) { openUpdate(sid, cusid) {
this.viewTitle = '【编辑】客户跟进记录'
this.list1 = [] this.list1 = []
this.stateId = sid this.stateId = sid
this.customerSid = cusid this.customerSid = cusid
@ -243,6 +254,7 @@ export default {
}, },
// 新增 // 新增
openCreate(bname, sid) { openCreate(bname, sid) {
this.viewTitle = '【新增】客户跟进记录'
this.list1 = [] this.list1 = []
this.customerName = bname this.customerName = bname
this.customerSid = sid this.customerSid = sid

2
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
View File

@ -393,6 +393,8 @@ export default {
}, },
// 根据本行ID删除数据 // 根据本行ID删除数据
doDel() { doDel() {
// const sids = this.sids.toString()
// console.log('删除的数据',sids)
del(this.sids).then((response) => { del(this.sids).then((response) => {
if (response.code === '200') { if (response.code === '200') {
this.$notify({ this.$notify({

10
anrui-system-ui/src/views/Home/Home.vue
View File

@ -225,11 +225,13 @@
}, },
methods: { methods: {
todowork() { todowork() {
this.$router.push({ path: '/todo' + '?token=' + getStorage() }) window.open('/#/todo' + '?token=' + getStorage(), '_blank')
// this.$router.push({ path: '/todo' + '?token=' + getStorage() })
// window.open('http://127.0.0.1/message'+'?token='+getStorage(),'_blank') // window.open('http://127.0.0.1/message'+'?token='+getStorage(),'_blank')
}, },
donework() { donework() {
this.$router.push({ path: '/done' + '?token=' + getStorage() }) window.open('/#/done' + '?token=' + getStorage(), '_blank')
// this.$router.push({ path: '/done' + '?token=' + getStorage() })
// window.open('http://127.0.0.1/message'+'?token='+getStorage(),'_blank') // window.open('http://127.0.0.1/message'+'?token='+getStorage(),'_blank')
}, },
logout() { logout() {
@ -262,8 +264,8 @@
} else if (index == '8') { } else if (index == '8') {
let myPopup = window.open('http://120.46.131.15/message/#/' + '?token=' + getStorage(), '_blank') let myPopup = window.open('http://120.46.131.15/message/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '1') { } else if (index == '1') {
//let myPopup = window.open('http://120.46.131.15/scm/#/' + '?token=' + getStorage(), '_blank') let myPopup = window.open('http://120.46.131.15/scm/#/' + '?token=' + getStorage(), '_blank')
let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage(), '_blank') // let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '4') { } else if (index == '4') {
let myPopup = window.open('http://120.46.131.15/fin/#/' + '?token=' + getStorage(), '_blank') let myPopup = window.open('http://120.46.131.15/fin/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '5') { } else if (index == '5') {

3
anrui-system-ui/src/views/flow/doneList.vue
View File

@ -2,7 +2,8 @@
<div class="app-container"> <div class="app-container">
<div class="tab-header webtop"> <div class="tab-header webtop">
<div> <div>
<router-link tag='a' :to="'/home'">《&nbsp;返回首页</router-link> <!-- <router-link tag='a' :to="'/home'">《&nbsp;返回首页</router-link>-->
<a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">关闭</a>
</div> </div>
</div> </div>
<div class="searchcon"> <div class="searchcon">

3
anrui-system-ui/src/views/flow/todoList.vue
View File

@ -2,7 +2,8 @@
<div class="app-container"> <div class="app-container">
<div class="tab-header webtop"> <div class="tab-header webtop">
<div> <div>
<router-link tag='a' :to="'/home'">《&nbsp;返回首页</router-link> <!-- <router-link tag='a' :to="'/home'">《&nbsp;返回首页</router-link>-->
<a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">关闭</a>
</div> </div>
</div> </div>
<div class="searchcon"> <div class="searchcon">

Write Preview
Loading…
Cancel
Save