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

zuozhengqing

2023-10-12 fc97d1465f402cb2ca265620f2de989873581a6f

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

 src/views/sales/salesOpportunity/DetailOpportunity.vue

@@ -268,6 +268,7 @@
import ServiceContract from "@/views/service/serviceContract"
import DetailAdvanceDialog from "@/views/sales/salesOpportunity/DetailAdvanceDialog"
import { getSaleStageList } from "@/api/sales/salesOpportunity"
import {getAllData} from "@/api/client/client";
export default {
  name: "DetailClientManage",
  props: {
@@ -285,6 +286,7 @@
  computed: {},
  data() {
    return {
      statusList: [],
      detailConfig: this.opportunityDetail,
      activeName: "first",
      isSchduleExpand: true, // 进度追踪
@@ -330,8 +332,15 @@
      sale_chance_name: this.detailConfig.infomation.name,
      sale_chance_id: this.detailConfig.infomation.id
    }
    this.getSaleStageList()
    this.setData(this.detailConfig.infomation)
    this.getSaleStageList().then(()=>{
      return  this.getAllData()
    }).then((statusList)=>{
      this.statusList =statusList

      this.setData(this.detailConfig.infomation)

    })
    console.log('this.detailConfig.infomation',this.detailConfig.infomation)
  },
  mounted() {},
  methods: {
@@ -363,7 +372,7 @@
          leftStr: "商机来源",
          leftValue: item.sales_sources.name,
          rightStr: "商机类型",
          rightValue: "" // item.SaleType.name
          rightValue: item.sale_type.name
        },
        {
          leftStr: "销售阶段",
@@ -373,13 +382,13 @@
        },
        {
          leftStr: "老客户营销",
          leftValue: item.regular_customers_id,
          leftValue: item.regular_customers.name,
          rightStr: "审批状态",
          rightValue: ""
        },
        {
          leftStr: "竞争对手",
          leftValue: "",
          leftValue: item.competitors,
          rightStr: "创建人",
          rightValue: ""
        },
@@ -407,7 +416,7 @@
          leftStr: "预计合同金额",
          leftValue: item.projected_amount,
          rightStr: "当前状态",
          rightValue: item.status_id
          rightValue: this.statusList.find(ele=>ele.id === item.status_id)?.name ?? ''
        }
      ]
      this.dynamicInfoList = [
@@ -553,6 +562,16 @@
        options: options,
        id: this.detailConfig.infomation.id
      }
    },

    getAllData(){
     return getAllData()
          .then((res) => {
            return res.data.status
          })
          .catch((err) => {
            console.log(err)
          })
    }
  }
}