Commit eaceb565 authored by 华国豪's avatar 华国豪 🙄

1

parent e7c86e1e
...@@ -502,22 +502,25 @@ export default { ...@@ -502,22 +502,25 @@ export default {
{ {
id: 1, id: 1,
name: '写跟进', name: '写跟进',
},{ },
id: 2, // {
name: '创建任务', // id: 2,
},{ // name: '创建任务',
// },
{
id: 3, id: 3,
name: '创建联系人', name: '创建联系人',
},{ },{
id: 4, id: 4,
name: '创建商机', name: '创建商机',
},{
id: 5,
name: '创建合同',
},{
id: 6,
name: '创建回款',
}, },
// {
// id: 5,
// name: '创建合同',
// },{
// id: 6,
// name: '创建回款',
// },
], ],
gjImgList: [], gjImgList: [],
fjList: [], fjList: [],
......
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
methods: { methods: {
openDetails(scope){ openDetails(scope){
console.log(scope.row.ID) console.log(scope.row.ID)
this.MsgBus.$emit('busnessDrawerShow', scope.row.ID) this.MsgBus.$emit('busnessDrawerShow', scope.row.ID, 0)
}, },
GetBusinessList(){ GetBusinessList(){
this.apipost('/api/Customer/GetBusinessList', {CustomerId: this.ID}, res=>{ this.apipost('/api/Customer/GetBusinessList', {CustomerId: this.ID}, res=>{
......
...@@ -494,19 +494,22 @@ export default { ...@@ -494,19 +494,22 @@ export default {
{ {
id: 1, id: 1,
name: '写跟进', name: '写跟进',
},{ },
id: 2, // {
name: '创建任务', // id: 2,
},{ // name: '创建任务',
// },
{
id: 3, id: 3,
name: '创建联系人', name: '创建联系人',
},{
id: 5,
name: '创建合同',
},{
id: 6,
name: '创建回款',
}, },
// {
// id: 5,
// name: '创建合同',
// },{
// id: 6,
// name: '创建回款',
// },
], ],
gjImgList: [], gjImgList: [],
fjList: [], fjList: [],
......
...@@ -202,9 +202,10 @@ ...@@ -202,9 +202,10 @@
<div class="MyEditForm-item"> <div class="MyEditForm-item">
<el-form-item label="系列" prop="LineteamId"> <el-form-item label="系列" prop="LineteamId">
<el-select v-model="form.LineteamId" filterable placeholder="请选择系列"> <el-select v-model="form.LineteamId" filterable placeholder="请选择系列">
<el-option label='不限' value='0' key='0'></el-option>
<el-option <el-option
v-for="item in LineTeamList" v-for="item in LineTeamList"
:label='item.LtName' :value='item.LtID' :key='item.LtID'> :label='item.name' :value='item.id' :key='item.id'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -268,10 +269,10 @@ export default { ...@@ -268,10 +269,10 @@ export default {
ID: 0, ID: 0,
CustomerId: '', CustomerId: '',
BudgetPrice: '', BudgetPrice: '',
LineId: 10, LineId: '',
BusinessName: '', BusinessName: '',
BusinessStatus: '', BusinessStatus: '',
LineteamId: 14, LineteamId: '',
DepartTime: '', DepartTime: '',
PeopleNumber: 1, PeopleNumber: 1,
Remark: '', Remark: '',
...@@ -362,9 +363,8 @@ export default { ...@@ -362,9 +363,8 @@ export default {
if (!type) { if (!type) {
this.form.LineteamId = '' this.form.LineteamId = ''
} }
this.apipost2("team_post_GetList", { this.apipost2("b2b_get_GetLineTeam", {
lineID: lineId, lineId: lineId
isTOOP: 1
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LineTeamList = res.data.data; this.LineTeamList = res.data.data;
...@@ -372,7 +372,7 @@ export default { ...@@ -372,7 +372,7 @@ export default {
}); });
}, },
getLineList() { getLineList() {
this.apipost2("line_post_GetAllList_V2", {LineDirection: 14}, res => { this.apipost2("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LineList = res.data.data; this.LineList = res.data.data;
} }
......
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
</el-row> </el-row>
</div> </div>
<div class="content"> <div class="content">
<div class="state-box"> <div class="state-box" v-show="false">
<div class="busi-state"> <div class="busi-state">
<el-popover <el-popover
placement="bottom" placement="bottom"
...@@ -287,9 +287,9 @@ ...@@ -287,9 +287,9 @@
<el-tab-pane label="团队成员" name="4"> <el-tab-pane label="团队成员" name="4">
<TeamMembers v-if="activeName === '4'" :BusinessId="BusinessId" :IsRead="detailsData.IsRead"/> <TeamMembers v-if="activeName === '4'" :BusinessId="BusinessId" :IsRead="detailsData.IsRead"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="回款" name="7"> <!-- <el-tab-pane label="回款" name="7">
<MoneyBack /> <MoneyBack />
</el-tab-pane> </el-tab-pane> -->
<el-tab-pane label="附件" name="8"> <el-tab-pane label="附件" name="8">
<Enclosure v-if="activeName === '8'" :ID='BusinessId' :type='2' :IsRead="detailsData.IsRead"/> <Enclosure v-if="activeName === '8'" :ID='BusinessId' :type='2' :IsRead="detailsData.IsRead"/>
</el-tab-pane> </el-tab-pane>
...@@ -329,6 +329,10 @@ export default { ...@@ -329,6 +329,10 @@ export default {
BusinessIdCustomerId: { BusinessIdCustomerId: {
type: Number, type: Number,
default: 0 default: 0
},
CustomerType: {
type: Number,
default: 0
} }
}, },
data() { data() {
...@@ -344,6 +348,12 @@ export default { ...@@ -344,6 +348,12 @@ export default {
this.activeName = '1' this.activeName = '1'
}, },
deep:true deep:true
},
CustomerType: {
handler(val, oldVal){
},
deep:true
} }
}, },
mounted() { mounted() {
...@@ -359,7 +369,7 @@ export default { ...@@ -359,7 +369,7 @@ export default {
}, },
init(){ init(){
this.apipost('/api/Customer/GetAllBusinessModel', {BusinessId: this.BusinessId}, res=>{ this.apipost('/api/Customer/GetAllBusinessModel', {BusinessId: this.BusinessId, CustomerType: this.CustomerType}, res=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.detailsData = res.data.data this.detailsData = res.data.data
} }
......
...@@ -476,19 +476,22 @@ export default { ...@@ -476,19 +476,22 @@ export default {
{ {
id: 1, id: 1,
name: '写跟进', name: '写跟进',
},{ },
id: 2, // {
name: '创建任务', // id: 2,
},{ // name: '创建任务',
// },
{
id: 4, id: 4,
name: '创建商机', name: '创建商机',
},{
id: 5,
name: '创建合同',
},{
id: 6,
name: '创建回款',
}, },
// {
// id: 5,
// name: '创建合同',
// },{
// id: 6,
// name: '创建回款',
// },
], ],
gjImgList: [], gjImgList: [],
fjList: [], fjList: [],
......
...@@ -471,10 +471,12 @@ export default { ...@@ -471,10 +471,12 @@ export default {
{ {
id: 1, id: 1,
name: '写跟进', name: '写跟进',
},{ },
id: 2, // {
name: '创建任务', // id: 2,
},{ // name: '创建任务',
// },
{
id: 4, id: 4,
name: '创建商机', name: '创建商机',
},{ },{
......
...@@ -518,19 +518,23 @@ export default { ...@@ -518,19 +518,23 @@ export default {
{ {
id: 1, id: 1,
name: '写跟进', name: '写跟进',
},{ }
id: 2, // ,{
name: '创建任务', // id: 2,
},{ // name: '创建任务',
// }
,
{
id: 4, id: 4,
name: '创建商机', name: '创建商机',
},{
id: 5,
name: '创建合同',
},{
id: 6,
name: '创建回款',
}, },
// {
// id: 5,
// name: '创建合同',
// },{
// id: 6,
// name: '创建回款',
// },
], ],
gjImgList: [], gjImgList: [],
fjList: [], fjList: [],
......
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
methods: { methods: {
openDetails(scope){ openDetails(scope){
console.log(scope.row.ID) console.log(scope.row.ID)
this.MsgBus.$emit('busnessDrawerShow', scope.row.ID) this.MsgBus.$emit('busnessDrawerShow', scope.row.ID, 1)
}, },
GetBusinessList(){ GetBusinessList(){
this.apipost('/api/Customer/GetBusinessList', {CustomerId: this.ID, CustomerType: 1}, res=>{ this.apipost('/api/Customer/GetBusinessList', {CustomerId: this.ID, CustomerType: 1}, res=>{
......
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<div class="content"> <div class="content">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="活动" name="1"> <el-tab-pane label="活动" name="1">
<Activity v-if="activeName === '1'" :CustomerId="CustomerId" /> <Activity v-if="activeName === '1'" :CustomerId="CustomerId" :showType="2"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="详细资料" name="2"> <el-tab-pane label="详细资料" name="2">
<Details v-if="activeName === '2'" :detailsData="detailsData"/> <Details v-if="activeName === '2'" :detailsData="detailsData"/>
......
...@@ -498,10 +498,12 @@ export default { ...@@ -498,10 +498,12 @@ export default {
{ {
id: 1, id: 1,
name: '写跟进', name: '写跟进',
},{ },
id: 2, // {
name: '创建任务', // id: 2,
},{ // name: '创建任务',
// },
{
id: 3, id: 3,
name: '创建联系人', name: '创建联系人',
},{ },{
......
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
}, },
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = "https://localhost:5001" let domainUrl = "http://testcrm.oytour.com"
let locationName = window.location.hostname; let locationName = window.location.hostname;
let domainPostUrl = "http://testapi.oytour.com" let domainPostUrl = "http://testapi.oytour.com"
if (this.isOnline()) { if (this.isOnline()) {
......
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
:visible.sync="busnessDrawer" :visible.sync="busnessDrawer"
direction="rtl" direction="rtl"
:before-close="handleClose"> :before-close="handleClose">
<businessInfoBox :BusinessId="BusinessId" :BusinessIdCustomerId="BusinessIdCustomerId" @transferS="busTransfer" @watersS="busWaters" @editCustbusiness="editCustbusiness"/> <businessInfoBox :BusinessId="BusinessId" :CustomerType="CustomerType" :BusinessIdCustomerId="BusinessIdCustomerId" @transferS="busTransfer" @watersS="busWaters" @editCustbusiness="editCustbusiness"/>
</el-drawer> </el-drawer>
<!-- 高级筛选 --> <!-- 高级筛选 -->
<el-dialog :visible.sync="sceneShow" :close-on-click-modal="false" width="800px" custom-class="transfer-box add-box add-box2 add-scene"> <el-dialog :visible.sync="sceneShow" :close-on-click-modal="false" width="800px" custom-class="transfer-box add-box add-box2 add-scene">
...@@ -220,6 +220,7 @@ export default { ...@@ -220,6 +220,7 @@ export default {
BusinessIdCustomerId: 0, BusinessIdCustomerId: 0,
busnessDrawer: false, busnessDrawer: false,
contractDrawer: false, contractDrawer: false,
CustomerType: 0,
contractID: 0, contractID: 0,
url: '', url: '',
showViewer: false, showViewer: false,
...@@ -324,10 +325,10 @@ export default { ...@@ -324,10 +325,10 @@ export default {
$this.contractID = ID $this.contractID = ID
$this.contractDrawer = true $this.contractDrawer = true
}) })
this.MsgBus.$on('busnessDrawerShow', function (ID, BusinessIdCustomerId){ this.MsgBus.$on('busnessDrawerShow', function (ID, CustomerType){
$this.busnessDrawer = true $this.busnessDrawer = true
$this.BusinessId = ID $this.BusinessId = ID
$this.BusinessIdCustomerId = BusinessIdCustomerId $this.CustomerType = CustomerType
}) })
this.MsgBus.$on('sceneBoxShow', function (type, sceneType, sceneDataList){ this.MsgBus.$on('sceneBoxShow', function (type, sceneType, sceneDataList){
$this.LableType = type $this.LableType = type
......
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