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">
@@ -422,7 +437,7 @@
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 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"
@@ -463,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" }]
@@ -488,7 +503,8 @@
      editSelectChanceConfig: {
        editVisible: false,
        title: "",
        infomation: {}
        infomation: {},
        search_map: {}
      },
      editSelCommonConfig: {
        editVisible: false,
@@ -496,7 +512,7 @@
        infomation: {}
      },
      clientId: this.editCommonConfig.infomation.client_id,
      saleChanceId: this.editCommonConfig.infomation.saleChanceId,
      saleChanceId: this.editCommonConfig.infomation.sale_chance_id,
      subbillId: this.editCommonConfig.infomation.subbillId,
      productId: 1,
      isNoProduct: true,
@@ -529,9 +545,6 @@
        this.formInfo()
      }
    },
    "editClientManageConfig.infomation.codeStandID"() {
      this.formInfo()
    }
  },
  methods: {
    ...mapActions(["getChanceFilter", "getSubunitFliter"]),
@@ -547,7 +560,7 @@
      getAllData()
        .then((res) => {
          this.memberOptions = res.data.member
          this.dataProcess()
          // this.dataProcess()
        })
        .catch((err) => {
          console.log(err)
@@ -564,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
@@ -630,7 +642,6 @@
        logisticCompany: data.logisticCompany || "",
        logisticCost: data.logisticCost || 0,
        logisticNumber: data.logisticNumber || "",
        codeRule: this.codeRule
      }
      let params = {}
      if (this.editConfig.title === "新建") {
@@ -672,33 +683,42 @@
        }
      }
    },
    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({
          page: 1,
          pageSize: 15,
          search_map: {
            client_id: item.id
          }
        }).then((res) => {
          console.log(res)
          this.saleChancelist = res.data.list
        })
        await getSubOrderList({
          page: 1,
          pageSize: 15,
          search_map: {
            client_id: item.id
          }
        }).then((res) => {
          this.subOrderList = res.data.list
        })
        this.getSaleChanceList(item)
        this.getSubOrderList(item)
      } else if (value === "chance") {
        this.saleChanceId = item.id
        this.editConfig.infomation.client_name = item.name
        this.editConfig.infomation.sale_chance_name = item.name
      } else if (value === "subbill") {
        console.log("下拉框点击", item)
        this.subbillId = item.id
@@ -719,8 +739,12 @@
    },
    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
@@ -732,7 +756,9 @@
    // 清除已选择用户
    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 = ""