Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 3 years ago
parent
commit
9e28f9294f
  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

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

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

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

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

@ -30,7 +30,7 @@
<el-option v-for="(item, index) in figuration" :key="index" :label="item.modelName" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="购方式">
<el-form-item label="购方式">
<!-- <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-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

@ -112,12 +112,12 @@
</el-col>
<el-col :span="8">
<el-form-item>
<el-radio 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-radio :disabled="editState" v-model="temp.isOnRemind" label="否"></el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="temp.isOnRemind=='是'">
<el-row v-show="temp.isOnRemind=='是' && isOnRemind == '是'">
<el-col :span="4" class="trightb">
<el-form-item>
<span slot="label">提醒日期</span>
@ -125,7 +125,10 @@
</el-col>
<el-col :span="8">
<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-form-item>
</el-col>
@ -151,7 +154,10 @@
</el-col>
<el-col :span="8">
<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-col>
<el-col :span="4" class="trightb">
@ -186,8 +192,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-input v-model="temp.idnumber" style="width:50%" maxlength="20" placeholder="请输入证件号码" class="addinputw" clearable/>
<el-form-item prop="idnumber">
<el-input v-model="temp.idnumber" style="width:50%" maxlength="20" placeholder="请输入证件号码"
class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
@ -208,8 +215,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-input v-model="temp.e_mail" maxlength="20" style="width:50%" placeholder="请输入电子邮箱" class="addinputw" clearable/>
<el-form-item prop="e_mail">
<el-input v-model="temp.e_mail" maxlength="20" style="width:50%" placeholder="请输入电子邮箱"
class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
@ -230,7 +238,7 @@
</el-form-item>
</el-col>
<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-form-item>
</el-col>
@ -330,9 +338,10 @@
<el-checkbox v-for="item in aseType" :key="item.divtkey" :label="item.divtkey">
{{ item.dictValue }}
</el-checkbox>
</el-checkbox-group>
</el-checkbox-group><!-- -->
<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>
@ -383,7 +392,7 @@
<el-row>
<el-col :span="24">
<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-row>
</el-form>
@ -406,13 +415,7 @@
</template>
<script>
import {
getPcCustomerInfoBySid,
// getPcDistributorList,
// namesDown,
savePcCustomerInfo,
updatePcCustomerInfo,
} from '@/api/jichuxinxi/crmcustomer'
import {getPcCustomerInfoBySid, savePcCustomerInfo, updatePcCustomerInfo,} from '@/api/jichuxinxi/crmcustomer'
import {getCity, getCounty, getProvince} from '@/api/portal/areaPicker' //
import {typeValues} from '@/api/dictcommons/shujuzidian'
import {loginDetails} from '@/api/dictcommons/basemanufacturer'
@ -420,7 +423,7 @@ import {getStorage} from '@/utils/auth'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import {getPcBusinessInfoBySid} from '@/api/jichuxinxi/crmbusiness'
import Upload from '@/components/uploadFile/upload.vue' //
import Upload from '@/components/uploadFile/ManyImageUpload.vue' //
export default {
name: 'KehudanganAdd',
@ -429,20 +432,71 @@ export default {
var checkSubmit = (rule, value, callback) => {
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}$/
if (Submit.test(value)) {
return callback()
if (value) {
if (!Submit.test(value)) {
callback(new Error('请输入手机号'))
}
callback()
}
callback(new Error('请输入手机号'))
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) => {
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]$/
if (card.test(value)) {
return callback()
if (value) {
if (!card.test(value)) {
callback(new Error('请输入身份证号码'))
}
callback()
}
callback(new Error('请输入身份证号码'))
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 {
//
pickerOptions: {
disabledDate(time) {
let oneDay = 60 * 60 * 24 * 1000;
return time.getTime() < Date.now() - oneDay;
},
},
editState: false,
isOnRemind: '是',
// ---
list1: [],
list2: [],
@ -539,21 +593,42 @@ export default {
message: '请填写客户地址',
trigger: 'blur'
}
]
// mobile: [
// {
// required: true,
// validator: checkSubmit,
// trigger: 'blur',
// },
// ],
// idnumber: [
// {
// required: true,
// validator: identitycard,
// trigger: 'blur',
// },
// ],
],
mobile: [
{
required: true,
validator: checkSubmit,
trigger: 'blur',
},
],
weixin: [
{
required: true,
validator: validatePass2,
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.stateId = sid
this.isOnRemind = '否'
this.editState = true
if (this.stateId !== '0') {
getPcCustomerInfoBySid(this.stateId).then((response) => {
console.log(response.data)
@ -794,6 +870,8 @@ export default {
// ------------------------------------------------------
//
handleReturn() {
this.isOnRemind = '是'
this.editState = false
this.activeNames = ['1']
this.$emit('handleReturn')
},
@ -856,6 +934,9 @@ export default {
//
handleJUBuCun() {
this.$refs['dataForm'].validate((valid) => {
if (this.templooke.purchase_time == '0') {
this.templooke.purchase_num = ''
}
if (valid) {
this.FormLoading = true
if (this.temp.sex !== '') {

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

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

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

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

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

@ -225,11 +225,13 @@
},
methods: {
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')
},
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')
},
logout() {
@ -262,8 +264,8 @@
} else if (index == '8') {
let myPopup = window.open('http://120.46.131.15/message/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '1') {
//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://120.46.131.15/scm/#/' + '?token=' + getStorage(), '_blank')
// let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '4') {
let myPopup = window.open('http://120.46.131.15/fin/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '5') {

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

@ -2,7 +2,8 @@
<div class="app-container">
<div class="tab-header webtop">
<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 class="searchcon">

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

@ -2,7 +2,8 @@
<div class="app-container">
<div class="tab-header webtop">
<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 class="searchcon">

Loading…
Cancel
Save