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

# Conflicts:
#	src/api/customer.ts

src/@types/customer.ts

@@ -9,7 +9,7 @@ export declare interface customerFieldlistType {
 export declare interface customerFieldtabsType {
     Id: number
     Name: string
-    disable?: boolean
+    disable?: boolean | any
 }
 /** 客户字段 新增的类型 */
 export declare interface customerFieldaddMsgType {

src/App.vue

@@ -10,5 +10,5 @@ export default defineComponent({
 </script>
 <style lang="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>

src/api/customer.ts

@@ -13,7 +13,10 @@
  interface msg {
    Enable: number
  }
-
+ interface IdName {
+   Id:number,
+   Name:string
+ }
  
  
  
@@ -73,28 +76,48 @@
    }
    // 获取客户子段类型枚举
    static async getCustomerFieldTypeEnumList(data: any): Promise<HttpResponse> {
-     return Axios('/QYCustomer/GetCustomerFieldTypeEnumList', {
-       method: 'post',
-       responseType: 'json',
-       data
-     })
-   }
-   // 获取部门树形列表
-   static async getDeptTree(data: any): Promise<HttpResponse> {
-     return Axios('/User/GetDeptTree', {
-       method: 'post',
-       responseType: 'json',
-       data
-     })
-   }
-   // 获取部门树形列表
-   static async getCustomerFieldInputTypeEnumList(data: any): Promise<HttpResponse> {
-     return Axios('/QYCustomer/GetCustomerFieldInputTypeEnumList', {
-       method: 'post',
-       responseType: 'json',
-       data
-     })
-   }
+    return Axios('/QYCustomer/GetCustomerFieldTypeEnumList', {
+      method: 'post',
+      responseType: 'json',
+      data
+    })
+  }
+  // 获取部门树形列表
+  static async getDeptTree(data: any): Promise<HttpResponse> {
+    return Axios('/User/GetDeptTree', {
+      method: 'post',
+      responseType: 'json',
+      data
+    })
+  }
+  // 获取部门树形列表
+  static async getCustomerFieldInputTypeEnumList(data: any): Promise<HttpResponse> {
+    return Axios('/QYCustomer/GetCustomerFieldInputTypeEnumList', {
+      method: 'post',
+      responseType: 'json',
+      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

src/pages/customer/components/customerField.vue

@@ -177,7 +177,6 @@
                     ok: {
                         label: "确认",
                         flat: true,
-                        focus: true
                     }
                 }).onOk(() => {
                     setFiledState(item, type)
@@ -187,10 +186,16 @@
                 customerService.getCustomerFieldTypeEnumList({}).then((res) => {
                     if (res.data.Code == 1) {
                         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 = () => {
                 Isadd.value = true;
                 addMsg.value = {
@@ -255,7 +260,8 @@
                 deptl,
                 getFieldInputType,
                 checkboxList,
-                tabsList
+                tabsList,
+                goedit
 
             }
         }