Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn

haoxuan

2023-10-17 bbf59cd0a1c02ebf7974704250ae262f17050c59

Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn

 src/views/other/payment/receipt/index.vue

@@ -180,10 +180,10 @@
      // console.log()
      this.loading = true
      let params = {}
      let sourceTyle = (this.addConfig.keywordType === "销售明细单"||this.addConfig.keywordType ==='客户名称') ? 1 : 2
      let sourceTyle = this.addConfig.keywordType === "销售明细单" || this.addConfig.keywordType === "客户名称" ? 1 : 2
      if (this.addConfig.id) {
        params = {
          sourceID: this.addConfig.id,
          sourceId: this.addConfig.id,
          sourceType: sourceTyle,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize,
@@ -246,7 +246,7 @@
    addBtnClick() {
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.sourceType = this.addConfig.keywordType ==='客户名称'?1:this.sourceType
      this.editConfig.sourceType = this.addConfig.keywordType === "客户名称" ? 1 : this.sourceType
      this.editConfig.infomation = { ...this.addConfig, saleDetailNumber: "" }
    }
  }

 src/views/other/payment/saleInvoice/index.vue

@@ -174,7 +174,7 @@
      let sourceTyle = this.addConfig.keywordType === "销售明细单" ? 1 : 2
      if (this.addConfig.id) {
        params = {
          sourceID: this.addConfig.id,
          sourceId: this.addConfig.id,
          sourceType: sourceTyle,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize

 src/views/sales/refundForm/index.vue

@@ -185,7 +185,7 @@
      let params = {}
      if (this.addConfig.id) {
        params = {
          sourceID: this.addConfig.id,
          sourceId: this.addConfig.id,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -497,7 +497,7 @@
        infomation: {}
      },
      clientId: this.editCommonConfig.infomation.client_id,
      saleChanceId: this.editCommonConfig.infomation.saleChanceId,
      saleChanceId: this.editCommonConfig.infomation.sale_chance_id,
      subbillId: this.editCommonConfig.infomation.subbillId,
      productId: 1,
      isNoProduct: true,

 src/views/sales/salesReturn/index.vue

@@ -190,7 +190,7 @@
      let params = {}
      if (this.addConfig.id) {
        params = {
          sourceID: this.addConfig.id,
          sourceId: this.addConfig.id,
          sourceType: 1,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize

 src/views/service/clientServiceOrder/index.vue

@@ -179,13 +179,23 @@
    // 请求数据
    async getData() {
      this.loading = true
      await getServiceOrderList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        sourceId: this.addConfig.id
      })
      console.log(this.addConfig)
      let params = {}
      if (this.addConfig.keywordType === "服务合同") {
        params = {
          serviceContractId: this.addConfig.serviceContractId,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }
      } else {
        params = {
          keyword: this.keyword,
          keywordType: this.keywordType,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }
      }
      await getServiceOrderList(params)
        .then((res) => {
          console.log(res)
          if (res.code === 200) {