销售明细单接口修改，确认订单和推送aps合并为同一个

zuozhengqing

2023-11-24 be7e754d737d6c7a689465928117edb3aa02bad4

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -25,7 +25,21 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="明细单编号" prop="number">
                  <WordInput
                  <el-input
                    v-if="
                      isView ||
                      editConfig.title == '编辑' ||
                      (editConfig.title == '新建' && codenumer && (explain != '' || isIdDisabled))
                    "
                    :disabled="editConfig.title == '编辑' || isView"
                    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 +50,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">
@@ -52,16 +66,21 @@
                      "
                      value-key="name"
                      @select="handleSelectClient('client', $event)"
                      :disabled="isNameChanceEdit"
                      :disabled="isNameChanceEdit || isView"
                    ></el-autocomplete>
                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('client')">
                    <div
                      v-if="!isNameChanceEdit && !isView"
                      class="common-select-btn"
                      @click="selClientClick('client')"
                    >
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div
                      v-if="
                        editConfig.infomation.client_name &&
                        editConfig.infomation.client_name.length > 0 &&
                        !isNameChanceEdit
                        !isNameChanceEdit &&
                        !isView
                      "
                      class="common-select-btn"
                      @click="clearupClient('client')"
@@ -85,16 +104,21 @@
                      "
                      value-key="name"
                      @select="handleSelectClient('chance', $event)"
                      :disabled="isNameChanceEdit"
                      :disabled="isNameChanceEdit || isView"
                    ></el-autocomplete>
                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('chance')">
                    <div
                      v-if="!isNameChanceEdit && !isView"
                      class="common-select-btn"
                      @click="selClientClick('chance')"
                    >
                      <i class="el-icon-circle-plus-outline"></i>
                    </div>
                    <div
                      v-if="
                        editConfig.infomation.sale_chance_name &&
                        editConfig.infomation.sale_chance_name.length > 0 &&
                        !isNameChanceEdit
                        !isNameChanceEdit &&
                        !isView
                      "
                      class="common-select-btn"
                      @click="clearupClient('chance')"
@@ -104,7 +128,7 @@
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
              <!-- <el-col :span="12">
                <el-form-item label="销售子单" prop="subbill_name">
                  <div class="custom-name">
                    <el-autocomplete
@@ -135,7 +159,7 @@
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              </el-col> -->
              <el-col :span="12">
                <el-form-item label="销售报价单" prop="quotation_number">
                  <div class="custom-name">
@@ -150,16 +174,21 @@
                      @select="handleSelectClient('quotation', $event)"
                      style="width: 100%"
                      placeholder="请先选择销售机会"
                      :disabled="isAddQuatation"
                      :disabled="isAddQuatation || isView"
                    ></el-autocomplete>
                    <div v-if="!isAddQuatation" class="common-select-btn" @click="selClientClick('quotation')">
                    <div
                      v-if="!isAddQuatation && !isView"
                      class="common-select-btn"
                      @click="selClientClick('quotation')"
                    >
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div
                      v-if="
                        editConfig.infomation.quotation_number &&
                        editConfig.infomation.quotation_number.length > 0 &&
                        !isAddQuatation
                        !isAddQuatation &&
                        !isView
                      "
                      class="common-select-btn"
                      @click="clearupClient('quotation')"
@@ -177,6 +206,7 @@
                    type="date"
                    placeholder="选择日期"
                    style="width: 100%"
                    :disabled="isView"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -188,6 +218,7 @@
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
                    :disabled="isView"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    </el-option>
@@ -202,6 +233,7 @@
                    type="date"
                    placeholder="选择日期"
                    style="width: 100%"
                    :disabled="isView"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -213,8 +245,23 @@
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
                    :disabled="isView"
                  >
                    <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="选择项目" prop="projectId">
                  <el-select
                    v-model="editConfig.infomation.projectId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
                    :disabled="isView"
                  >
                    <el-option v-for="item in projectList" :key="item.projectId" :label="item.projectName" :value="item.projectId">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -227,12 +274,12 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="收货人" prop="addressee">
                  <el-input v-model="editConfig.infomation.addressee"></el-input>
                  <el-input v-model="editConfig.infomation.addressee" :disabled="isView"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="收货人联系方式" prop="phone">
                  <el-input v-model="editConfig.infomation.phone"></el-input>
                  <el-input v-model="editConfig.infomation.phone" :disabled="isView"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -242,17 +289,18 @@
                    type="textarea"
                    :autosize="{ minRows: 2 }"
                    v-model="editConfig.infomation.address"
                    :disabled="isView"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="物流公司" prop="logisticCompany">
                  <el-input v-model="editConfig.infomation.logisticCompany"></el-input>
                  <el-input v-model="editConfig.infomation.logisticCompany" :disabled="isView"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="物流单号" prop="logisticNumber">
                  <el-input v-model="editConfig.infomation.logisticNumber"></el-input>
                  <el-input v-model="editConfig.infomation.logisticNumber" :disabled="isView"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -264,6 +312,7 @@
                    :precision="2"
                    :controls="false"
                    style="width: 100%; margin-right: 5px"
                    :disabled="isView"
                  ></el-input-number>
                </el-form-item>
              </el-col>
@@ -280,6 +329,7 @@
                    type="textarea"
                    :autosize="{ minRows: 4 }"
                    v-model="editConfig.infomation.conditions"
                    :disabled="isView"
                  ></el-input>
                </el-form-item>
              </el-col>
@@ -295,6 +345,7 @@
                    type="textarea"
                    :autosize="{ minRows: 2 }"
                    v-model="editConfig.infomation.remark"
                    :disabled="isView"
                  ></el-input>
                </el-form-item>
              </el-col>
@@ -332,7 +383,13 @@
            产品管理
            <div style="margin-left: 400px">
              币种
              <el-select v-model="editConfig.infomation.currency" placeholder="请选择" size="mini" style="width: 63%">
              <el-select
                v-model="editConfig.infomation.currency"
                placeholder="请选择"
                size="mini"
                style="width: 63%"
                :disabled="isView"
              >
                <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
              </el-select>
@@ -342,7 +399,7 @@
            <CommonFormTableView
              ref="commonFormTableView"
              :detail-enter="true"
              :select-box="true"
              :select-box="selectBox"
              :show-summary="showSummary"
              :product-table-list="productTableList"
              @inputContent="inputContent"
@@ -428,11 +485,11 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
import { getAddSalesDetails, getUpdateSalesDetails } from "@/api/sales/salesDetails"
import { getAddSalesDetails, getUpdateSalesDetails,getProjectList} from "@/api/sales/salesDetails"
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"
@@ -474,11 +531,12 @@
      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", "change"] }],
        signTime: [{ required: true, message: "请选择签约日期", trigger: "change" }],
        memberId: [{ required: true, message: "请选择销售负责人", trigger: "change" }],
        sale_chance_name: [{ required: true, message: "请选择销售机会", trigger: "change" }],
        quotation_number: [{ required: true, message: "请选择销售报价单", trigger: "change" }]
        quotation_number: [{ required: true, message: "请选择销售报价单", trigger: "change" }],
        deliveryDate: [{ required: true, message: "请选择交付日期", trigger: "change" }],
        // approvalOpinion: [{ required: true, message: "请输入", trigger: "blur" }]
      },
      memberOptions: [],
@@ -524,10 +582,14 @@
      isAddQuatation: true,
      // 交付类型
      deliveryTypeList: getDataByType("deliveryType"),
      projectList:[],
      quotationList: [],
      quotationId: this.editCommonConfig.infomation.quotationId,
      tableData: [],
      selProductData: []
      selProductData: [],
      isView: this.editCommonConfig.title === "查看",
      selectBox: this.editCommonConfig.title !== "查看",
      thatMember:{}
    }
  },
  created() {
@@ -541,15 +603,13 @@
    if (this.editConfig.title === "编辑") {
      this.productTableList.tableData = this.editConfig.infomation.products
    }
    this.getProjectList()
  },
  watch: {
    "editClientManageConfig.visible"(val) {
      if (val) {
        this.formInfo()
      }
    },
    "editClientManageConfig.infomation.codeStandID"() {
      this.formInfo()
    }
  },
  // beforeUpdate() {
@@ -585,11 +645,9 @@
    // 保存
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
        this.validateFormNumber()
        if (valid) {
          console.log(this.editConfig.infomation)
          for (let i = 0; i < this.tableData.length; i++) {
            if (this.tableData[i].name.length === 0) {
          for (let i = 0; i < this.selProductData.length; i++) {
            if (this.selProductData[i].name.length === 0) {
              this.isNoProduct = true
              break
            } else {
@@ -600,14 +658,13 @@
            this.$message.error("请选择产品")
          } else {
            const params = this.saveParams()
            console.log(params)
            if (this.editConfig.title === "新建") {
              getAddSalesDetails(params).then((res) => {
                console.log(res)
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.tableData.map((item) => {
                    this.amountTotal += item.total
                  this.selProductData.map((item) => {
                    this.amountTotal += parseFloat(item.total)
                  })
                  let config = {
                    amountTotal: this.amountTotal,
@@ -617,6 +674,7 @@
                }
              })
            } else {
              console.log(this.selProductData)
              getUpdateSalesDetails(params).then((res) => {
                console.log(res)
                this.editConfig.visible = false
@@ -653,9 +711,10 @@
        logisticCompany: data.logisticCompany || "",
        logisticCost: data.logisticCost || 0,
        logisticNumber: data.logisticNumber || "",
        codeRule: this.codeRule,
        quotationId: this.quotationId,
        deliverType: data.deliverType || 0
        deliverType: data.deliverType || 0,
        status: 1,
        projectId:data.projectId||''
      }
      let params = {}
      if (this.editConfig.title === "新建") {
@@ -692,8 +751,14 @@
                this.tableData = item.products
                this.tableData.map((item, index) => {
                  item.productId = index + 1
                  this.selProductData.forEach((key) => {
                    if (item.number === key.number) {
                      item.amount = key.amount
                      item.id = key.id
                    }
                  })
                })
                this.productTableList.tableData = item.products
                this.productTableList.tableData = this.tableData
                this.selProductData.forEach((key) => {
                  this.tableData.forEach((row) => {
                    if (key.number === row.number) {
@@ -759,6 +824,7 @@
    },
    handleSelectClient(value, item) {
      if (value === "client") {
        this.thatMember=item.member
        this.editConfig.infomation.subbill_name = ""
        this.editConfig.infomation.sale_chance_name = ""
        this.clientId = item.id
@@ -827,6 +893,8 @@
        this.editConfig.infomation.sale_chance_name = ""
        this.editConfig.infomation.client_name = ""
        this.editConfig.infomation.subbill_name = ""
        this.editConfig.infomation.quotation_number = ""
        this.quotationId = 0
        this.clientId = 0
        this.saleChanceId = 0
        this.subbillId = 0
@@ -839,7 +907,11 @@
      } else if (value === "subbill") {
        this.editConfig.infomation.subbill_name = ""
        this.subbillId = 0
      } else if (value === "quotation") {
        this.editConfig.infomation.quotation_number = ""
        this.quotationId = 0
      }
      this.productTableList.tableData = []
    },
    // 添加附件
    addAnnexClick() {},
@@ -860,6 +932,7 @@
          { label: "产品名称", prop: "name", isRequird: true },
          { label: "产品编号", prop: "number" },
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },
          { label: "单位", prop: "unit" },
          { label: "销售单价", prop: "price" },
          { label: "价税合计", prop: "total" }
        ]
@@ -877,6 +950,15 @@
    // 选择产品
    getSelectArray(val) {
      this.selProductData = val
    },
    // 获取项目列表
    async getProjectList(){
      await getProjectList({
        page: 1,
        pageSize: 100,
      }).then((res) => {
        this.projectList=res.data
      })
    }
  }
}