Skip to content

C
CRM
Commit dc84facc authored by 罗超's avatar 罗超
Browse files
Options

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

parents 092031c3 e19a64c4
Show whitespace changes
Inline Side-by-side
Showing with 171 additions and 186 deletions
src/components/dialogModel/editGuestTeam.vue
View file @ dc84facc
......@@ -73,17 +73,6 @@
</div>
</el-form-item>
</div>
<div class="MyEditForm-item">
<el-form-item label="同时添加至" class="label-pad-left form-check">
<div class="pad-left-10">
<el-checkbox-group v-model="TransferOther">
<el-checkbox :value="4" :label="4">订单</el-checkbox>
<el-checkbox :value="2" :label="2">商机</el-checkbox>
<el-checkbox :value="3" :label="3">合同</el-checkbox>
</el-checkbox-group>
</div>
</el-form-item>
</div>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
......@@ -95,7 +84,7 @@
</template>
<script>
export default {
props: ["ID"],
props: ["GuestId"],
data() {
return {
dialogTableVisible: true,
......@@ -103,14 +92,17 @@
EmpIdsS: [],
TransferOther: [],
form: {
CustomerIds: 0,
EmpIds: "",
GuestId: 0,
EmployeeIds: "",
IsRead: 0,
TransferOther: "",
},
};
},
watch: {},
created()
{
},
mounted() {
this.Employee();
let $this = this;
......@@ -120,10 +112,10 @@
},
methods: {
closedDialog() {
this.MsgBus.$emit("closeeditGuestTeam");
this.MsgBus.$emit("success");
},
addData() {
this.form.CustomerIds = this.ID;
this.form.GuestId = this.GuestId;
if (this.EmpIdsS.length < 1) {
return this.$message.error("请选择成员");
} else {
......@@ -131,20 +123,13 @@
this.EmpIdsS.map((x, i) => {
str = str + x + ",";
});
this.form.EmpIds = str.substring(0, str.length - 1);
}
if (this.TransferOther.length < 1) {
let str2 = "";
this.TransferOther.map((x, i) => {
str2 = str2 + x + ",";
});
this.form.TransferOther = str2.substring(0, str2.length - 1);
this.form.EmployeeIds = str.substring(0, str.length - 1);
}
this.apipost("/api/SellEvent/SetGuestTeam", this.form, (res) => {
if (res.data.resultCode == 1) {
this.resetForm("form");
this.dialogTableVisible = false;
this.$emit("editGuestTeamOk");
this.$emit("success");
this.$message.success(res.data.message);
} else {
this.$message.error(res.data.message);
......@@ -184,10 +169,9 @@
resetForm(formName) {
// 重置表单
this.form = {
CustomerId: 0,
EmpIds: [],
GuestId: 0,
EmployeeIds: [],
IsRead: 0,
TransferOther: [],
};
this.$refs[formName].resetFields();
},
......
src/components/dialogModel/editGuestTeamPower.vue
View file @ dc84facc
<style>
.editGuestTeamPower .add-tit {
.editGuestTeamPower .add-tit {
display: flex;
justify-content: space-between;
align-items: center;
height: 20px;
}
.editGuestTeamPower .add-tit p {
}
.editGuestTeamPower .add-tit p {
display: flex;
align-items: center;
font-weight: bold;
color: rgba(17, 17, 17, 1);
font-size: 14px;
}
.editGuestTeamPower .add-tit p span {
}
.editGuestTeamPower .add-tit p span {
display: inline-block;
width: 6px;
height: 6px;
background: #409efe;
border-radius: 50%;
margin-right: 10px;
}
.editGuestTeamPower .el-dialog__header {
}
.editGuestTeamPower .el-dialog__header {
padding: 15px 20px;
background: rgba(255, 255, 255, 1);
}
.editGuestTeamPower .dialog-footer {
}
.editGuestTeamPower .dialog-footer {
text-align: center;
background-color: rgba(248, 250, 251, 1);
padding-bottom: 20px;
}
.editGuestTeamPower .el-dialog__footer {
}
.editGuestTeamPower .el-dialog__footer {
padding: 0;
}
}
</style>
<template>
<el-dialog @closed="closedDialog" :modal="false" width="400px" :visible.sync="dialogTableVisible" :close-on-click-modal="false" class="editGuestTeamPower">
<el-dialog @closed="closedDialog" :modal="false" width="400px" :visible.sync="dialogTableVisible"
:close-on-click-modal="false" class="editGuestTeamPower">
<div class="add-tit" slot="title">
<p><span></span>编辑权限</p>
<span icon="el-icon-close"></span>
</div>
<div class="form-box" >
<div class="form-box">
<el-form :model="form" ref="form" class="MyEditForm">
<div class="MyEditForm-item">
<el-form-item label="权限" class="label-pad-left form-check">
<div class="pad-left-10">
<el-radio v-model="form.IsRead" :label="1">只读</el-radio>
<el-radio v-model="form.IsRead" :label="0">读写</el-radio>
<el-radio v-model="form.IsRead" :label="0">只读</el-radio>
<el-radio v-model="form.IsRead" :label="1">读写</el-radio>
</div>
</el-form-item>
</div>
......@@ -53,19 +59,16 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" class="add-box-btn" @click="submitForm('form')">确 定</el-button>
<el-button class="add-box-btn add-box-cancel" @click="dialogTableVisible = false, resetForm('form')">取 消</el-button>
<el-button class="add-box-btn add-box-cancel" @click="dialogTableVisible = false, resetForm('form')">取 消
</el-button>
</div>
</el-dialog>
</template>
<script>
export default {
export default {
props: {
ID: {
type: "",
default: 0,
},
CustomerId: {
type: Number,
Ids: {
type: String,
default: 0,
},
},
......@@ -74,8 +77,7 @@ export default {
dialogTableVisible: true,
zwList: [],
form: {
CustomerId: 0,
ID: "",
Ids: "",
IsRead: 1,
},
};
......@@ -89,20 +91,19 @@ export default {
},
methods: {
closedDialog() {
this.MsgBus.$emit("closeeditGuestTeamPower");
this.MsgBus.$emit("success");
},
addData() {
this.form.CustomerId = this.CustomerId;
this.form.IDs = this.ID;
this.form.Ids = this.Ids;
this.apipost(
"/api/Customer/EditCustomerJurisdiction",
"/api/SellEvent/SetTravelGuestTeamPower",
this.form,
(res) => {
if (res.data.resultCode == 1) {
this.$message.success("操作成功");
this.resetForm("form");
this.dialogTableVisible = false;
this.$emit("addTeammanOk");
this.$emit("success");
}
}
);
......@@ -120,12 +121,11 @@ export default {
resetForm(formName) {
// 重置表单
this.form = {
CustomerId: 0,
ID: "",
Ids: "",
IsRead: 0,
};
this.$refs[formName].resetFields();
},
},
};
};
</script>
\ No newline at end of file
src/components/guestManagement/customerInfoBox.vue
View file @ dc84facc
......@@ -115,7 +115,7 @@
<Details v-if="activeName === '2'" :detailsData="detailsData" />
</el-tab-pane>
<el-tab-pane label="团队" name="10">
<guestTeam v-if="activeName === '10'" :ID="CustomerId" />
<guestTeam v-if="activeName === '10'" :GuestId="CustomerId" />
</el-tab-pane>
<el-tab-pane label="商机" name="5">
<Business v-if="activeName === '5'" :ID="CustomerId" />
......@@ -182,6 +182,10 @@
},
deep: true,
},
},
created()
{
},
mounted() {
let $this = this;
......
src/components/guestManagement/guestManagement.vue
View file @ dc84facc
......@@ -707,6 +707,7 @@
this.dialogTableVisible = true;
},
openDetails(scope) {
console.log("scope",scope)
this.drawer = true;
this.CustomerId = scope.row.ID;
this.CustomerName = scope.row.GusetName;
......
src/components/guestManagement/guestTeam.vue
View file @ dc84facc
......@@ -16,7 +16,7 @@
<el-table v-loading="loading" stripe ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%"
@selection-change="handleSelectionChange" row-class-name="font-size-12">
<el-table-column :selectable='checkboxT' fixed type="selection" width="40"></el-table-column>
<el-table-column prop="EmpName" label="销售名称" show-overflow-tooltip>
<el-table-column prop="EmployeeName" label="销售名称" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="PostName" label="岗位" show-overflow-tooltip>
</el-table-column>
......@@ -32,10 +32,10 @@
</el-table-column>
</el-table>
<div v-if="addTeammanShow">
<editGuestTeam :ID="CustomerId" @addTeammanOk="addTeammanOk" />
<editGuestTeam :GuestId="GuestId" @success="addTeammanOk" />
</div>
<div v-if="editTeamPowerShow">
<editGuestTeamPower :CustomerId="CustomerId" :ID="IDs" @addTeammanOk="addTeammanOk" />
<editGuestTeamPower :Ids="IDs" @success="addTeammanOk" />
</div>
</div>
</template>
......@@ -48,7 +48,7 @@
editGuestTeamPower
},
props: {
CustomerId: {
GuestId: {
type: Number,
default: 0
},
......@@ -64,11 +64,11 @@
editTeamPowerShow: false,
dataList: [],
multipleSelection: [],
IDs: ''
IDs: "",
};
},
watch: {
CustomerId: {
GuestId: {
handler(val, oldVal) {
this.GetGuestTeamList()
},
......@@ -78,12 +78,7 @@
mounted() {
this.GetGuestTeamList()
let $this = this
this.MsgBus.$on('closeaddTeamman', function () {
$this.addTeammanShow = false
})
this.MsgBus.$on('closeeditTeamPower', function () {
$this.editTeamPowerShow = false
})
},
methods: {
tuichu() {
......@@ -96,21 +91,21 @@
this.multipleSelection.map((x, i) => {
str = str + x + ','
})
let msg = {
CustomerId: this.CustomerId,
IDs: str.substring(0, str.length - 1)
}
this.apipost('/api/Customer/ExitCustomerJurisdiction', msg, res => {
if (res.data.resultCode == 1) {
this.$message.success('操作成功')
this.GetGuestTeamList()
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
// let msg = {
// CustomerId: this.CustomerId,
// IDs: str.substring(0, str.length - 1)
// }
// this.apipost('/api/Customer/ExitCustomerJurisdiction', msg, res => {
// if (res.data.resultCode == 1) {
// this.$message.success('操作成功')
// this.GetGuestTeamList()
// }
// })
// }).catch(() => {
// this.$message({
// type: 'info',
// message: '已取消'
// });
});
},
yichu() {
......@@ -127,10 +122,9 @@
str = str + x + ','
})
let msg = {
CustomerId: this.CustomerId,
IDs: str.substring(0, str.length - 1)
Ids: str.substring(0, str.length - 1)
}
this.apipost('/api/Customer/RemoveCustomerListJurisdiction', msg, res => {
this.apipost('/api/SellEvent/RemoveGuestTeam', msg, res => {
if (res.data.resultCode == 1) {
this.$message.success('操作成功')
this.GetGuestTeamList()
......@@ -151,7 +145,7 @@
this.multipleSelection.map((x, i) => {
str = str + x + ','
})
this.IDs = str.substring(0, str.length - 1)
this.IDs = str.substring(0, str.length - 1);
this.editTeamPowerShow = true
},
checkboxT(row, index) {
......@@ -163,17 +157,19 @@
},
handleSelectionChange(val) {
this.multipleSelection = val.map(x =>
x.ID
x.Id
)
},
addTeammanOk() {
this.addTeammanShow = false;
this.editTeamPowerShow = false;
this.GetGuestTeamList()
},
GetGuestTeamList() {
if (this.CustomerId === 0) return
if (this.GuestId === 0) return
this.loading = true
this.apipost('/api/SellEvent/GetGuestTeamPage', {
GuestId: this.CustomerId
this.apipost('/api/SellEvent/GetGuestTeamList', {
GuestId: this.GuestId
}, res => {
if (res.data.resultCode == 1) {
this.loading = false
......
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