Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

zhangqian

2023-08-30 5053e0347804728c63c5498e0aa18129822454cb

 docs/swagger.yaml

@@ -116,18 +116,6 @@
    type: string
    x-enum-varnames:
    - PaymentTypeQueryClassExpireLessThen60Days
  constvar.ReceiptKeywordType:
    enum:
    - ""
    type: string
    x-enum-varnames:
    - ReceiptKeywordCustomerName
  constvar.ReceiptQueryClass:
    enum:
    - ""
    type: string
    x-enum-varnames:
    - ReceiptQueryClassExpireLessThen60Days
  constvar.ReceiptSourceType:
    enum:
    - 1
@@ -136,6 +124,12 @@
    - 4
    - 5
    type: integer
    x-enum-comments:
      ReceiptSourceTypeChuKuDan: 出库单it
      ReceiptSourceTypeCollectionPlan: 收款计划
      ReceiptSourceTypeInvoice: 销售发票
      ReceiptSourceTypeSalesDetails: 销售明细单
      ReceiptSourceTypeServiceContract: 服务合同
    x-enum-varnames:
    - ReceiptSourceTypeSalesDetails
    - ReceiptSourceTypeServiceContract
@@ -1444,6 +1438,8 @@
        type: integer
      desc:
        type: string
      detail_address:
        type: string
      followRecord:
        items:
          $ref: '#/definitions/model.FollowRecord'
@@ -1477,6 +1473,8 @@
    type: object
  model.SalesRefund:
    properties:
      Source:
        $ref: '#/definitions/model.SalesReturn'
      amountTotal:
        description: 价税合计
        type: number
@@ -1632,6 +1630,10 @@
      percent:
        description: 比例
        type: number
      principal:
        allOf:
        - $ref: '#/definitions/model.User'
        description: 收款负责人ID
      principalId:
        description: 收款负责人ID
        type: integer
@@ -2059,10 +2061,16 @@
      MaterialMode:
        description: 物料类型
        type: string
      MaxInventory:
        description: 最大库存
        type: integer
      MinInventory:
        description: 安全库存
        type: integer
      Name:
        type: string
      Node:
        description: 备注
        type: string
      Number:
        type: string
@@ -2072,6 +2080,12 @@
      SalePrice:
        description: 销售价格
        type: number
      Specs:
        description: 规格
        type: string
      Type:
        description: 型号
        type: string
      Unit:
        type: string
    type: object
@@ -2773,6 +2787,9 @@
      desc:
        description: 备注
        type: string
      detail_address:
        description: 详细地址
        type: string
      member_id:
        description: 销售负责人ID
        type: integer
@@ -3444,7 +3461,9 @@
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"name": "客户名称",
          "phone": "手机号码", "detail_address":"详细地址", "next_visit_time":"下回回访日期", "member_name":
          "销售负责人", "client_status": "客户状态", "client_level": "重要级别"}'
          "销售负责人", "client_status": "客户状态", "client_level": "重要级别","representative":
          "法定代表人", "registration_time": "注册时间", "business_scope": "经营范围", "remark":
          "备注", "not_admin":"1:我的客户; 2:admin客户"}'
        type: object
    type: object
  request.GetContactList:
@@ -4936,6 +4955,9 @@
      desc:
        description: 备注
        type: string
      detail_address:
        description: 详细地址
        type: string
      id:
        type: integer
      member_id:
@@ -5055,6 +5077,10 @@
      percent:
        description: 比例
        type: number
      principal:
        allOf:
        - $ref: '#/definitions/model.User'
        description: 收款负责人ID
      principalId:
        description: 收款负责人ID
        type: integer
@@ -9440,16 +9466,6 @@
  /api/receipt/list:
    get:
      parameters:
      - in: query
        name: keyword
        type: string
      - enum:
        - ""
        in: query
        name: keywordType
        type: string
        x-enum-varnames:
        - ReceiptKeywordCustomerName
      - description: 页码
        in: query
        name: page
@@ -9458,13 +9474,30 @@
        in: query
        name: pageSize
        type: integer
      - in: query
        name: sourceId
        type: integer
      - enum:
        - ""
        - 1
        - 2
        - 3
        - 4
        - 5
        in: query
        name: queryClass
        type: string
        name: sourceType
        type: integer
        x-enum-comments:
          ReceiptSourceTypeChuKuDan: 出库单it
          ReceiptSourceTypeCollectionPlan: 收款计划
          ReceiptSourceTypeInvoice: 销售发票
          ReceiptSourceTypeSalesDetails: 销售明细单
          ReceiptSourceTypeServiceContract: 服务合同
        x-enum-varnames:
        - ReceiptQueryClassExpireLessThen60Days
        - ReceiptSourceTypeSalesDetails
        - ReceiptSourceTypeServiceContract
        - ReceiptSourceTypeInvoice
        - ReceiptSourceTypeCollectionPlan
        - ReceiptSourceTypeChuKuDan
      produces:
      - application/json
      responses:
@@ -10220,7 +10253,12 @@
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  $ref: '#/definitions/request.AddSalesDetails'
              type: object
      summary: 添加销售明细
      tags:
      - SalesDetails
@@ -10861,10 +10899,23 @@
  /api/serviceCollectionPlan/list:
    get:
      parameters:
      - description: 服务合同id
        in: query
        name: serviceContractId
      - in: query
        name: sourceId
        required: true
        type: integer
      - enum:
        - 1
        - 2
        in: query
        name: sourceType
        required: true
        type: integer
        x-enum-comments:
          CollectionSourceTypeSaleDetails: 销售明细
          CollectionSourceTypeServiceContract: 服务合同
        x-enum-varnames:
        - CollectionSourceTypeSaleDetails
        - CollectionSourceTypeServiceContract
      produces:
      - application/json
      responses: