Commit 17fa733e authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm into master

# Conflicts:
#	src/components/guestManagement/Agreement.vue
#	src/components/guestManagement/customerInfoBox.vue
parents 4dbfef1e 5facc92b
......@@ -78,7 +78,6 @@ function getLotteryAwardItem() {
}
$(document).ready(function () {
//动态添加大转盘的奖品与奖品区域背景颜色
console.log(LotteryAward)
turnplate.restaraunts = LotteryAward;
turnplate.colors = colors;
//旋转转盘 item:奖品位置; txt:提示语;
......
......@@ -218,7 +218,6 @@ export default {
},
methods: {
reload(){
console.log(1)
this.getList()
this.drawer = false
},
......
......@@ -682,9 +682,8 @@ export default {
});
});
},
// 上传附件
//上传附件
uploadImg2(file) {
console.log(file);
let newArr = [];
newArr.push(file.file);
let path = "/Upload/Temporary/";
......
......@@ -4,51 +4,35 @@
<template>
<div class="Business">
<div class="add-Enclosure">
<el-button icon="el-icon-plus" class="crm-btn query-btn crm-btn-mini margin-right0" @click="addBusiness">新建商机</el-button>
<el-button icon="el-icon-plus" class="crm-btn query-btn crm-btn-mini margin-right0" @click="addBusiness">新建商机
</el-button>
</div>
<el-table
v-loading="loading"
stripe
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
<el-table v-loading="loading" stripe ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%"
row-class-name="font-size-12">
<el-table-column
prop="BusinessName"
label="商机名称"
show-overflow-tooltip>
<el-table-column prop="BusinessName" label="商机名称" show-overflow-tooltip>
<template slot-scope="scope">
<p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.BusinessName}}</p>
</template>
</el-table-column>
<el-table-column
prop="BudgetPrice"
label="商机金额"
show-overflow-tooltip>
<el-table-column prop="BudgetPrice" label="商机金额" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="CustomerName"
label="客户名称"
show-overflow-tooltip>
<el-table-column prop="CustomerName" label="客户名称" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="BusinessStatusStr"
label="商机阶段"
show-overflow-tooltip>
<el-table-column prop="BusinessStatusStr" label="商机阶段" show-overflow-tooltip>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
export default {
props: ['ID', 'BusinessType'],
data() {
return {
dataList: [],
loading: false
};
},watch:{
},
watch: {
},
mounted() {
......@@ -56,30 +40,30 @@ export default {
},
methods: {
openDetails(scope){
console.log(scope.row.ID)
openDetails(scope) {
this.MsgBus.$emit('busnessDrawerShow', scope.row.ID, 0)
},
GetBusinessList(){
this.apipost('/api/Customer/GetBusinessList', {CustomerId: this.ID}, res=>{
GetBusinessList() {
this.apipost('/api/Customer/GetBusinessList', {
CustomerId: this.ID
}, res => {
if (res.data.resultCode == 1) {
console.log(res.data.data)
this.dataList = res.data.data
} else {
this.$message.error(res.data.message);
}
})
},
addBusiness(){
let $this= this
addBusiness() {
let $this = this
this.MsgBus.$emit('addBusinessBoxOpen', $this.ID, 0)
},
guanlian(){
guanlian() {
},
jiechuguanlian(){
jiechuguanlian() {
},
}
}
}
</script>
\ No newline at end of file
......@@ -90,7 +90,6 @@ export default {
},watch:{
CustomerId: {
handler(val, oldVal){
console.log(val)
this.GetCustomerTeamList()
},
deep:true
......
This diff is collapsed.
......@@ -90,7 +90,6 @@ export default {
},watch:{
BusinessId: {
handler(val, oldVal){
console.log(val)
this.GetCustomerTeamList()
},
deep:true
......
......@@ -580,15 +580,15 @@ export default {
},
//删除
delete(){
console.log('删除')
},
//导出
export(){
console.log('导出')
},
// 更改状态
changeState(){
console.log('更改状态')
},
// 放入公海
waters(type){
......
This diff is collapsed.
<style>
.add-Enclosure{
.add-Enclosure {
text-align: right;
padding-bottom: 20px;
}
}
</style>
<template>
<div class="Enclosure">
<div class="add-Enclosure" v-if="upload !== 2">
<el-upload
class="upload-demo"
:file-list="fileList" :limit="1" :http-request="uploadImg2" :multiple="true"
<el-upload class="upload-demo" :file-list="fileList" :limit="1" :http-request="uploadImg2" :multiple="true"
:show-file-list="false" action="">
<el-button icon="el-icon-plus" class="crm-btn query-btn crm-btn-mini margin-right0">上传附件</el-button>
</el-upload>
</div>
<el-table
v-loading="loading"
stripe
ref="multipleTable"
:data="fileList"
tooltip-effect="dark"
style="width: 100%"
<el-table v-loading="loading" stripe ref="multipleTable" :data="fileList" tooltip-effect="dark" style="width: 100%"
row-class-name="font-size-12">
<el-table-column
prop="FileName"
label="附件名称"
show-overflow-tooltip>
<el-table-column prop="FileName" label="附件名称" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="CreateSrt"
label="上传人"
show-overflow-tooltip>
<el-table-column prop="CreateSrt" label="上传人" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="CreateTime"
label="上传时间"
show-overflow-tooltip>
<el-table-column prop="CreateTime" label="上传时间" show-overflow-tooltip>
<template slot-scope="scope">
<span class="cfont-color-info">{{scope.row.CreateTime}}</span>
</template>
</el-table-column>
<el-table-column
prop="IsFirstContact"
label="操作"
width="100"
show-overflow-tooltip>
<el-table-column prop="IsFirstContact" label="操作" width="100" show-overflow-tooltip>
<template slot-scope="scope">
<span class="font-color-link cp" style="padding-right: 10px;" @click="previewFile(scope.row.FileURL)">预览</span>
<span class="font-color-warning cp underline" v-if="scope.row.FileUploadType && IsRead === 0" @click="deleteItem(scope.row.ID)">删除</span>
<span class="font-color-link cp" style="padding-right: 10px;"
@click="previewFile(scope.row.FileURL)">预览</span>
<span class="font-color-warning cp underline" v-if="scope.row.FileUploadType && IsRead === 0"
@click="deleteItem(scope.row.ID)">删除</span>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
props:['ID', 'type', 'IsRead', 'upload', 'isGuest'],
export default {
props: ['ID', 'type', 'IsRead', 'upload', 'isGuest'],
data() {
return {
loading: false,
......@@ -73,7 +54,8 @@ export default {
FileSoureType: ''
}
};
},watch:{
},
watch: {
},
mounted() {
......@@ -88,17 +70,17 @@ export default {
this.getList()
},
methods: {
getList(){
getList() {
this.loading = true
this.apipost('/api/Customer/GetCustomerFilePage', this.msg, res=>{
this.apipost('/api/Customer/GetCustomerFilePage', this.msg, res => {
if (res.data.resultCode == 1) {
this.fileList = res.data.data.pageData
this.loading = false
}
})
},
AddCustomerFile(){
this.apipost('/api/Customer/AddCustomerFile', this.fileMsg, res=>{
AddCustomerFile() {
this.apipost('/api/Customer/AddCustomerFile', this.fileMsg, res => {
if (res.data.resultCode == 1) {
this.msg.pageIndex = 1
this.getList()
......@@ -106,13 +88,15 @@ export default {
})
},
// 删除
deleteItem(id){
deleteItem(id) {
this.$confirm('确定删除此附件,删除后不可恢复', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/Customer/DelCustomerFile', {IDs: id}, res=>{
this.apipost('/api/Customer/DelCustomerFile', {
IDs: id
}, res => {
if (res.data.resultCode == 1) {
this.msg.pageIndex = 1
this.getList()
......@@ -135,7 +119,6 @@ export default {
},
// 上传附件
uploadImg2(file) {
console.log(file)
let newArr = [];
newArr.push(file.file);
let path = "/Upload/Temporary/";
......@@ -147,5 +130,5 @@ export default {
});
},
}
}
}
</script>
\ No newline at end of file
......@@ -545,10 +545,10 @@ export default {
});
},
handleEdit(index, row) {
console.log(index, row);
},
handleDelete(index, row) {
console.log(index, row);
},
toggleSelection(rows) {
if (rows) {
......
This diff is collapsed.
This diff is collapsed.
......@@ -485,7 +485,6 @@ export default {
watch: {
CustomerId: {
handler(val, oldVal) {
console.log(val);
},
deep: true,
},
......
......@@ -303,7 +303,6 @@ export default {
SceneName: '',
IsDefault: 0,
}
console.log(val)
},
deep:true
}
......@@ -324,7 +323,6 @@ export default {
arr.push(item[i])
}
arr.map((x, index)=>{
console.log(x)
this.sceneList.map((s, sIndex)=>{
if(x.name === s.FieldName) {
let msg = {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -104,7 +104,6 @@
<el-table-column prop="MobilePhone" label="手机号码" width="120" v-if="queryType[1].show"
show-overflow-tooltip>
</el-table-column>
<el-table-column prop="CustomerSourceTypeStr" label="客户来源" v-if="queryType[3].show"
show-overflow-tooltip>
</el-table-column>
......@@ -530,6 +529,7 @@
$this.dialogTableVisible = false;
});
this.GetSceneEmployeeList();
//保存场景
this.MsgBus.$on("sceneSave", function (msg) {
$this.sceneList = [...msg];
$this.GetSceneEmployeeList();
......@@ -540,6 +540,7 @@
$this.msg.Data = obj;
$this.getList();
});
//编辑场景
this.MsgBus.$on("editScene", function () {
$this.GetSceneEmployeeList();
});
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment