Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

zuozhengqing

2023-10-17 4e8e3e78c35ca2ff4a31f865561f0d5c4d89dad9

 src/views/other/commonDialog/SelectCommonDialog.vue

@@ -352,8 +352,9 @@
    // 销售明细单
    async getSalesDetailsList() {
      await getSalesDetailsList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        // keyword: this.keyword,
        // keywordType: this.keywordType,
        clientId:this.editCommonConfig.clientId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
@@ -433,8 +434,9 @@
    },
    async getSalesReturnList() {
      await getSalesReturnList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        // keyword: this.keyword,
        // keywordType: this.keywordType,
        clientId:this.editCommonConfig.clientId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {