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

yangfeng

2024-02-28 7979474ca5570945126d7f087fa4363272d964b4

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

 src/components/layout/components/appHeader/index.vue

@@ -24,7 +24,10 @@
export default {
  name: "SalesLeads",
  props: {
    headerTitle: String
    headerTitle: {
      type:String,
      default:''
    }
  },
  components:{
    UpdatePassWord,

 src/views/other/commonDialog/SelectCommonDialog.vue

@@ -177,9 +177,14 @@
      } else if (this.editConfig.title === "报价单") {
        this.tableColumn = [
          { label: "报价单号", prop: "number", isClick: true, default: true }, // 报价单号
          { label: "销售负责人", prop: "member_name" } // 销售负责人
          { label: "报价名称", prop: "quotationName" },
          { label: "销售负责人", prop: "member_name" }, // 销售负责人
          { label: "客户名称", prop: "client_name" },
          { label: "所属业务机会", prop: "sale_chance_name" },
          { label: "报价单状态", prop: "quotationStatus" },
          { label: "合计", prop: "amountTotal" }
        ]
        this.showCol = ["报价单号", "销售负责人"]
        this.showCol = ["报价单号", "报价名称", "销售负责人", "客户名称", "所属业务机会", "报价单状态", "合计"]
        this.tableList = {
          selectIndex: true,

@@ -363,7 +368,10 @@
        this.tableList.tableInfomation = this.editConfig.tableInfomation.map((item) => {
          return {
            ...item,
            member_name: item.member.username
            client_name: item.client.name,
            sale_chance_name: item.sale_chance.name,
            member_name: item.member.username,
            quotationStatus: item.quotation_status.name
          }
        })
        this.pagerOptions.totalCount = this.editConfig.count ? this.editConfig.count : 0
@@ -379,7 +387,10 @@
            const list = res.data.list.map((item) => {
              return {
                ...item,
                member_name: item.member.username
                client_name: item.client.name,
                sale_chance_name: item.sale_chance.name,
                member_name: item.member.username,
                quotationStatus: item.quotation_status.name
              }
            })
            this.tableList.tableInfomation = list || []

 src/views/sales/quotation/AddQuotationDialog.vue

@@ -638,6 +638,8 @@
        this.contactId = row.id
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = row.name
        this.editConfig.infomation.client_name=row.client.name
        this.clientId = row.client.id
        this.saleChanceId = row.id
      } else {
        this.editConfig.infomation.client_name = row.name

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -115,8 +115,9 @@
                      @select="handleSelectClient('chance', $event)"
                      :disabled="isNameChanceEdit || isView"
                    ></el-autocomplete>
                    <!-- &&editConfig.infomation.client_name -->
                    <div
                      v-if="!isNameChanceEdit && !isView&&editConfig.infomation.client_name"
                      v-if="!isNameChanceEdit && !isView"
                      class="common-select-btn"
                      @click="selClientClick('chance')"
                    >
@@ -181,6 +182,7 @@
                    }
                  ]"
                >
                <!-- isAddQuatation || -->
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.quotation_number"
@@ -192,21 +194,22 @@
                      value-key="number"
                      @select="handleSelectClient('quotation', $event)"
                      style="width: 100%"
                      placeholder="请先选择销售机会"
                      :disabled="isAddQuatation || isView"
                      placeholder="请选择销售报价单"
                      :disabled=" isView"
                    ></el-autocomplete>
                    <!-- !isAddQuatation && editConfig.infomation.sale_chance_name &&-->
                    <div
                      v-if="!isAddQuatation && !isView&&editConfig.infomation.sale_chance_name"
                      v-if=" !isView"
                      class="common-select-btn"
                      @click="selClientClick('quotation')"
                    >
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <!-- !isAddQuatation && -->
                    <div
                      v-if="
                        editConfig.infomation.quotation_number &&
                        editConfig.infomation.quotation_number.length > 0 &&
                        !isAddQuatation &&
                        !isView
                      "
                      class="common-select-btn"
@@ -927,7 +930,9 @@
      if (value === "client") {
        this.editSelectClientConfig.editVisible = true
      } else if (value === "chance") {
        this.editSelectChanceConfig.clientId = this.clientId
        if(this.clientId){
          this.editSelectChanceConfig.clientId = this.clientId
        }
        this.editSelectChanceConfig.editVisible = true
      } else if (value === "subbill") {
        this.editSelCommonConfig.title = "销售子单"
@@ -935,24 +940,37 @@
        this.editSelCommonConfig.clientId = this.clientId
      } else if (value === "quotation") {
        this.editSelCommonConfig.title = "报价单"
        if(this.saleChanceId&&this.clientId){
          this.editSelCommonConfig.clientId = this.clientId
          // 正向选择客户 销售机会  报价单
          this.editSelCommonConfig.isRequest = false
          this.editSelCommonConfig.count=this.count
          this.editSelCommonConfig.tableInfomation = [...this.quotationList]
        }else{
           // 反向选择
          this.editSelCommonConfig.isRequest = true;
        }
        this.editSelCommonConfig.editVisible = true
        this.editSelCommonConfig.clientId = this.clientId
        this.editSelCommonConfig.isRequest = false
        this.editSelCommonConfig.count=this.count
        this.editSelCommonConfig.tableInfomation = [...this.quotationList]
      }
    },
    selClient(row, value) {
      if (value === "client") {
        this.editConfig.infomation.sale_chance_name = ""
        this.saleChanceId=''
        this.editConfig.infomation.subbill_name = ""
        // 清空报价单
        this.editConfig.infomation.quotation_number =''
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
        this.getSaleChanceList(row)
        this.getSubOrderList(row)
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = row.name
        this.editConfig.infomation.client_name = row.client.name
        this.clientId = row.client.id
        this.saleChanceId = row.id
        // 清空报价单
        this.editConfig.infomation.quotation_number =''
        this.isAddQuatation = false
        this.getQuotation(row.id)
      } else if (value === "subbill") {
@@ -962,6 +980,12 @@
        this.productTableList.tableData = row.products
        // this.tableData = row.products
        this.editConfig.infomation.quotation_number = row.number
        //反向 客户名称
        this.editConfig.infomation.client_name = row.client.name
        this.clientId = row.client.id
        //反向 销售机会
        this.editConfig.infomation.sale_chance_name = row.sale_chance.name
        this.saleChanceId = row.sale_chance.id
        this.quotationId = row.id
      }
    },