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

yangfeng

2023-10-16 05cad23e13a46a9d1c032056b86b9f987474ca59

Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style

 src/store/modules/getClientName.js

@@ -1,4 +1,5 @@
import { getClientList } from "@/api/client/client" // 导入接口
import { getSubOrderList } from "@/api/sales/subOrder" 
import { getContactList } from "@/api/client/contacts"
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
import { getSalesLeadsList } from "@/api/client/salesLead"
@@ -15,6 +16,7 @@
export default {
  state: {
    clientList: [], // 客户列表
    subOrderList:[],//销售子单
    contactNamelist: [], // 联系人
    saleChancelist: [], // 销售机会
    saleLeadlist: [], // 销售线索
@@ -30,6 +32,9 @@
  mutations: {
    clientNameList(state, payload) {
      state.clientList = payload
    },
    subOrderList(state,payload){
      state.subOrderList=payload
    },
    contactNameList(state, payload) {
      state.contactNamelist = payload
@@ -75,6 +80,18 @@
        }
      })
    },
    getSubunit(context){
      getSubOrderList().then((res)=>{
        if (res.code == 200) {
          context.commit("subOrderList", res.data.list)
        } else {
          Message.error(res.msg)
        }
      })
    },
    getSubunitFliter({commit},newData){
      commit("subOrderList",newData)
    },
    geContact(context) {
      getContactList().then((res) => {
        if (res.code == 200) {

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -104,6 +104,38 @@
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售子单" prop="subbill_name">
                  <div class="custom-name">
                    <el-autocomplete
                      style="width: 100%"
                      v-model="editConfig.infomation.subbill_name"
                      :fetch-suggestions="
                        (queryString, callback) => {
                          querySearchAsync(queryString, callback, 'subbill')
                        }
                      "
                      value-key="name"
                      @select="handleSelectClient('subbill', $event)"
                      :disabled="isNameChanceEdit"
                    ></el-autocomplete>
                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('client')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div
                      v-if="
                        editConfig.infomation.subbill_name &&
                        editConfig.infomation.subbill_name.length > 0 &&
                        !isNameChanceEdit
                      "
                      class="common-select-btn"
                      @click="clearupClient('subbill')"
                    >
                      <i class="el-icon-remove-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <!-- <el-col :span="12">
                <el-form-item label="选择源单" prop="selSourceOrder">
                  <el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
@@ -386,6 +418,8 @@
import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
import { getSaleChanceList} from "@/api/sales/salesOpportunity"
import { getSubOrderList } from "@/api/sales/subOrder"

import {mapActions} from "vuex"

export default {
@@ -410,6 +444,9 @@
    },
    saleChancelist() {
      return this.$store.state.getClientName.saleChancelist
    },
    subOrderList(){
      return this.$store.state.getClientName.subOrderList
    }
  },
  data() {
@@ -418,6 +455,7 @@
      editConfig: this.editCommonConfig,
      rules: {
        client_name: [{ required: true, message: "请选择客户名称", trigger: "change" }],
        subbill_name: [{ required: true, message: "请选择销售子单", trigger: "change" }],
        number: [{ required: true, message: "请输入订单编号", trigger: "blur" }],
        signTime: [{ required: true, message: "请选择签约日期", trigger: "change" }],
        memberId: [{ required: true, message: "请选择销售负责人", trigger: "change" }]
@@ -447,6 +485,7 @@
      },
      clientId: this.editCommonConfig.infomation.client_id,
      saleChanceId: this.editCommonConfig.infomation.saleChanceId,
      subbillId:this.editCommonConfig.infomation.subbillId,
      productId: 1,
      isNoProduct: true,
      addCollectionConfig: {
@@ -461,12 +500,13 @@
  created() {
    this.$store.dispatch("geClient")
    this.$store.dispatch("geChance")
    this.$store.dispatch("getSubunit")
    this.setTableForm()
    this.getCommonData()
    this.formInfo()
    if (this.editConfig.title === "新建" && this.editConfig.infomation.client_name.length > 0) {
      this.isNameChanceEdit = true
    }
    // if (this.editConfig.title === "新建" && this.editConfig.infomation.client_name.length > 0) {
    //   this.isNameChanceEdit = true
    // }
    // else {

    // }
@@ -482,7 +522,7 @@
    }
  },
  methods: {
    ...mapActions(["getChanceFilter"]), 
    ...mapActions(["getChanceFilter","getSubunitFliter"]), 
    formInfo() {
      this.objCode.type = "销售明细编码"
      this.objCode.codeStandID = ""
@@ -602,8 +642,16 @@
      var restaurants = []
      if (value === "client") {
        restaurants = this.clientList
        console.log(restaurants,"客户单")
      } else if (value === "chance") {
        restaurants = this.saleChancelist
      }else if(value==="subbill"){
        let arr=[]
         this.subOrderList.map((item)=>{
          arr.push(item.client)
         })
         restaurants=arr
        console.log("子丹",restaurants,arr)
      }
      var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
      cb(results)
@@ -621,17 +669,31 @@
        await getSaleChanceList({
          client_id:this.clientId
        }).then((res)=>{
          this.getChanceFilter(res.data.list)
        })
        await getSubOrderList({
          page:1,
          pageSize:15,
          search_map:{
            client_id:item.id
          }
        }).then((res)=>{
          this.getSubunitFliter(res.data.list)
        })
      } else if (value === "chance") {
        this.saleChanceId = item.id
        this.editConfig.infomation.client_name = item.name
      }else if(value==="subbill"){
        console.log("下拉框点击",item)
        this.subbillId = item.id
        this.editConfig.infomation.subbill_name = item.name
      }
    },
    selClientClick(value) {
      if (value === "client") {
        this.editSelectClientConfig.editVisible = true
      } else if (value === "chance") {
        this.editSelectChanceConfig.editVisible = true
      }else if(value==="subbill"){
        this.editSelectChanceConfig.editVisible = true
      }
    },
@@ -642,6 +704,9 @@
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = row.name
        this.saleChanceId = row.id
      }else if(value==="subbill"){
        this.editConfig.infomation.subbill_name = row.name
        this.subbillId=row.id
      }
    },
    // 清除已选择用户
@@ -652,6 +717,9 @@
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = ""
        this.saleChanceId = 0
      }else if(value==="subbill"){
        this.editConfig.infomation.subbill_name = ""
        this.subbillId=0
      }
    },
    // 添加附件