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

haoxuan

2023-10-24 01cea4bc73210e43f748d82a02a432cce615be2d

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -24,8 +24,23 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="订单编号" prop="number">
                  <WordInput
                <el-form-item label="明细单编号" prop="number">
                  <el-input
                    v-if="
                      editConfig.title == '编辑' ||
                      (editConfig.title == '新建' &&
                        codenumer &&
                        (explain != '' || isIdDisabled))
                    "
                    :disabled="editConfig.title == '编辑'"
                    v-model="editConfig.infomation.number"
                    placeholder="请输入编码"
                  >
                  </el-input>
                  <span  v-else-if="editConfig.title == '新建'" style="color: #f56c6c"
                    >请优先配置编码规范 <el-button type="text" @click="numberClick"> 配置规范 </el-button></span
                  >
                  <!-- <WordInput
                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                    :codenumer="codenumer"
                    :sum="sum"
@@ -36,7 +51,7 @@
                  <span v-else-if="method == 0" style="color: #f56c6c"
                    >请优先配置编码规范 <el-button type="text" @click="numberClick"> 配置规范 </el-button></span
                  >
                  <span v-else>{{ editConfig.title === "新建" ? "自动生成" : editConfig.infomation.number }}</span>
                  <span v-else>{{ editConfig.title === "新建" ? "自动生成" : editConfig.infomation.number }}</span> -->
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -115,11 +130,11 @@
                          querySearchAsync(queryString, callback, 'subbill')
                        }
                      "
                      value-key="name"
                      value-key="number"
                      @select="handleSelectClient('subbill', $event)"
                      :disabled="isNameChanceEdit"
                    ></el-autocomplete>
                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('client')">
                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('subbill')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div
@@ -403,6 +418,12 @@
        :edit-common-config="editSelectChanceConfig"
        @selClient="selClient"
      />
      <!-- 销售子单 -->
      <SelectCommonDialog
        v-if="editSelCommonConfig.editVisible"
        :edit-common-config="editSelCommonConfig"
        @selClient="selClient"
      />
      <!-- 新建 收款计划 -->
      <AddCollectionPlan v-if="addCollectionConfig.visible" :edit-common-config="addCollectionConfig" />
    </el-dialog>
@@ -416,11 +437,12 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
import { getSaleChanceList} from "@/api/sales/salesOpportunity"
import codeMixin from "@/components/makepager/mixin/codeMixin"
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
import { getSubOrderList } from "@/api/sales/subOrder"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"

import {mapActions} from "vuex"
import { mapActions } from "vuex"

export default {
  name: "AddSalesDetailsDialog",
@@ -437,17 +459,17 @@
      }
    }
  },
  components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog, AddCollectionPlan },
  components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog, AddCollectionPlan, SelectCommonDialog },
  computed: {
    clientList() {
      return this.$store.state.getClientName.clientList
    },
    saleChancelist() {
      return this.$store.state.getClientName.saleChancelist
    },
    subOrderList(){
      return this.$store.state.getClientName.subOrderList
    }
    // saleChancelist() {
    //   return this.$store.state.getClientName.saleChancelist
    // },
    // subOrderList() {
    //   return this.$store.state.getClientName.subOrderList
    // }
  },
  data() {
    return {
@@ -456,7 +478,7 @@
      rules: {
        client_name: [{ required: true, message: "请选择客户名称", trigger: "change" }],
        // subbill_name: [{ required: true, message: "请选择销售子单", trigger: "change" }],
        number: [{ required: true, message: "请输入订单编号", trigger: "blur" }],
        number: [{ required: true,validator: this.validateCheckCode, trigger: "blur" }],
        signTime: [{ required: true, message: "请选择签约日期", trigger: "change" }],
        memberId: [{ required: true, message: "请选择销售负责人", trigger: "change" }]
        // approvalOpinion: [{ required: true, message: "请输入", trigger: "blur" }]
@@ -481,11 +503,17 @@
      editSelectChanceConfig: {
        editVisible: false,
        title: "",
        infomation: {},
        search_map: {}
      },
      editSelCommonConfig: {
        editVisible: false,
        title: "",
        infomation: {}
      },
      clientId: this.editCommonConfig.infomation.client_id,
      saleChanceId: this.editCommonConfig.infomation.saleChanceId,
      subbillId:this.editCommonConfig.infomation.subbillId,
      saleChanceId: this.editCommonConfig.infomation.sale_chance_id,
      subbillId: this.editCommonConfig.infomation.subbillId,
      productId: 1,
      isNoProduct: true,
      addCollectionConfig: {
@@ -499,8 +527,8 @@
  },
  created() {
    this.$store.dispatch("geClient")
    this.$store.dispatch("geChance")
    this.$store.dispatch("getSubunit")
    // this.$store.dispatch("geChance")
    // this.$store.dispatch("getSubunit")
    this.setTableForm()
    this.getCommonData()
    this.formInfo()
@@ -517,12 +545,9 @@
        this.formInfo()
      }
    },
    "editClientManageConfig.infomation.codeStandID"() {
      this.formInfo()
    }
  },
  methods: {
    ...mapActions(["getChanceFilter","getSubunitFliter"]), 
    ...mapActions(["getChanceFilter", "getSubunitFliter"]),
    formInfo() {
      this.objCode.type = "销售明细编码"
      this.objCode.codeStandID = ""
@@ -535,7 +560,7 @@
      getAllData()
        .then((res) => {
          this.memberOptions = res.data.member
          this.dataProcess()
          // this.dataProcess()
        })
        .catch((err) => {
          console.log(err)
@@ -552,7 +577,6 @@
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          console.log(this.editConfig.infomation)
          for (let i = 0; i < this.tableData.length; i++) {
            if (this.tableData[i].name.length === 0) {
              this.isNoProduct = true
@@ -618,7 +642,6 @@
        logisticCompany: data.logisticCompany || "",
        logisticCost: data.logisticCost || 0,
        logisticNumber: data.logisticNumber || "",
        codeRule: this.codeRule
      }
      let params = {}
      if (this.editConfig.title === "新建") {
@@ -642,84 +665,107 @@
      var restaurants = []
      if (value === "client") {
        restaurants = this.clientList
        console.log(restaurants,"客户单")
        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)
      } else if (value === "subbill") {
        restaurants = this.subOrderList
      }
      var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
      var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
      cb(results)
    },
    createStateFilter(queryString) {
    createStateFilter(queryString, value) {
      return (state) => {
        return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
        if (value === "subbill") {
          return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
        } else {
          return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
        }
      }
    },
    async handleSelectClient(value, item) {
    // 销售机会列表
    async getSaleChanceList(item) {
      await getSaleChanceList({
        page: 1,
        pageSize: 15,
        search_map: {
          client_id: item.id
        }
      }).then((res) => {
        console.log(res)
        this.saleChancelist = res.data.list
      })
    },
    // 销售子单列表
    async getSubOrderList(item) {
      await getSubOrderList({
        page: 1,
        pageSize: 15,
        search_map: {
          client_id: item.id
        }
      }).then((res) => {
        this.subOrderList = res.data.list
      })
    },
    handleSelectClient(value, item) {
      if (value === "client") {
        this.editConfig.infomation.subbill_name =""
        this.editConfig.infomation.sale_chance_name=""
        this.clientId = item.id
        this.editConfig.infomation.client_name = item.name
        // 需要修改
        await getSaleChanceList({
          client_id:this.clientId
        }).then((res)=>{
        })
        await getSubOrderList({
          page:1,
          pageSize:15,
          search_map:{
            client_id:item.id
          }
        }).then((res)=>{
          this.getSubunitFliter(res.data.list)
        })
        this.getSaleChanceList(item)
        this.getSubOrderList(item)
      } else if (value === "chance") {
        this.saleChanceId = item.id
        this.editConfig.infomation.client_name = item.name
      }else if(value==="subbill"){
        console.log("下拉框点击",item)
        this.editConfig.infomation.sale_chance_name = item.name
      } else if (value === "subbill") {
        console.log("下拉框点击", item)
        this.subbillId = item.id
        this.editConfig.infomation.subbill_name = item.name
        this.editConfig.infomation.subbill_name = item.number
      }
    },
    selClientClick(value) {
      if (value === "client") {
        this.editSelectClientConfig.editVisible = true
      } else if (value === "chance") {
        this.editSelectChanceConfig.clientId = this.clientId
        this.editSelectChanceConfig.editVisible = true
      }else if(value==="subbill"){
        this.editSelectChanceConfig.editVisible = true
      } else if (value === "subbill") {
        this.editSelCommonConfig.title = "销售子单"
        this.editSelCommonConfig.editVisible = true
        this.editSelCommonConfig.clientId = this.clientId
      }
    },
    selClient(row, value) {
      if (value === "client") {
        this.editConfig.infomation.sale_chance_name=""
        this.editConfig.infomation.subbill_name=""
        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.saleChanceId = row.id
      }else if(value==="subbill"){
        this.editConfig.infomation.subbill_name = row.name
        this.subbillId=row.id
      } else if (value === "subbill") {
        this.editConfig.infomation.subbill_name = row.number
        this.subbillId = row.id
      }
    },
    // 清除已选择用户
    clearupClient(value) {
      if (value === "client") {
        this.editConfig.infomation.sale_chance_name=""
        this.editConfig.infomation.client_name = ""
        this.editConfig.infomation.subbill_name =""
        this.clientId = 0
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = ""
        this.saleChanceId = 0
      }else if(value==="subbill"){
      } else if (value === "subbill") {
        this.editConfig.infomation.subbill_name = ""
        this.subbillId=0
        this.subbillId = 0
      }
    },
    // 添加附件