Commit 78eafdf9 authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/xiangwei/horse into master

# Conflicts:
#	src/api/customer.ts
parents 79073f2b 64ad5fd6
...@@ -9,7 +9,7 @@ export declare interface customerFieldlistType { ...@@ -9,7 +9,7 @@ export declare interface customerFieldlistType {
export declare interface customerFieldtabsType { export declare interface customerFieldtabsType {
Id: number Id: number
Name: string Name: string
disable?: boolean disable?: boolean | any
} }
/** 客户字段 新增的类型 */ /** 客户字段 新增的类型 */
export declare interface customerFieldaddMsgType { export declare interface customerFieldaddMsgType {
......
...@@ -10,5 +10,5 @@ export default defineComponent({ ...@@ -10,5 +10,5 @@ export default defineComponent({
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('./css/font.sass') @import url('./css/font.sass')
@import url('//at.alicdn.com/t/font_2930340_dn2rgl17m5t.css') @import url('//at.alicdn.com/t/font_2930340_ymozcida88.css')
</style> </style>
...@@ -13,7 +13,10 @@ ...@@ -13,7 +13,10 @@
interface msg { interface msg {
Enable: number Enable: number
} }
interface IdName {
Id:number,
Name:string
}
...@@ -73,28 +76,48 @@ ...@@ -73,28 +76,48 @@
} }
// 获取客户子段类型枚举 // 获取客户子段类型枚举
static async getCustomerFieldTypeEnumList(data: any): Promise<HttpResponse> { static async getCustomerFieldTypeEnumList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerFieldTypeEnumList', { return Axios('/QYCustomer/GetCustomerFieldTypeEnumList', {
method: 'post', method: 'post',
responseType: 'json', responseType: 'json',
data data
}) })
} }
// 获取部门树形列表 // 获取部门树形列表
static async getDeptTree(data: any): Promise<HttpResponse> { static async getDeptTree(data: any): Promise<HttpResponse> {
return Axios('/User/GetDeptTree', { return Axios('/User/GetDeptTree', {
method: 'post', method: 'post',
responseType: 'json', responseType: 'json',
data data
}) })
} }
// 获取部门树形列表 // 获取部门树形列表
static async getCustomerFieldInputTypeEnumList(data: any): Promise<HttpResponse> { static async getCustomerFieldInputTypeEnumList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerFieldInputTypeEnumList', { return Axios('/QYCustomer/GetCustomerFieldInputTypeEnumList', {
method: 'post', method: 'post',
responseType: 'json', responseType: 'json',
data data
}) })
} }
//新增修改客户字段
static async setCustomerFiledInfo(data: {
Id:number,
Type:number,
Name:string,
Required:number,
DeptId:number,
WordNum:number,
InputType:string,
OptionsList:Array<IdName>,
Digits:number,
Enable:number,
[propName: string]: any
}): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerFiledInfo', {
method: 'post',
responseType: 'json',
data
})
}
} }
export default customerService export default customerService
This diff is collapsed.
...@@ -177,7 +177,6 @@ ...@@ -177,7 +177,6 @@
ok: { ok: {
label: "确认", label: "确认",
flat: true, flat: true,
focus: true
} }
}).onOk(() => { }).onOk(() => {
setFiledState(item, type) setFiledState(item, type)
...@@ -187,10 +186,16 @@ ...@@ -187,10 +186,16 @@
customerService.getCustomerFieldTypeEnumList({}).then((res) => { customerService.getCustomerFieldTypeEnumList({}).then((res) => {
if (res.data.Code == 1) { if (res.data.Code == 1) {
tabsList.value = res.data.Data tabsList.value = res.data.Data
tabsList.value.forEach(x => {
x.disable = false
})
} }
}) })
} }
const goedit = (item: customerFieldlistType) => {
addMsg.value = JSON.parse(JSON.stringify(item))
Isadd.value = true;
}
const goaddfield = () => { const goaddfield = () => {
Isadd.value = true; Isadd.value = true;
addMsg.value = { addMsg.value = {
...@@ -255,7 +260,8 @@ ...@@ -255,7 +260,8 @@
deptl, deptl,
getFieldInputType, getFieldInputType,
checkboxList, checkboxList,
tabsList tabsList,
goedit
} }
} }
......
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