src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -90,9 +90,9 @@
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售机会" prop="sale_chance_name">
                <el-form-item label="销售机会" prop="sale_chance_name"
                :rules="[{ required: autoCodeHeadersObj.ywjh=='yes'?true:false, message: '请选择销售机会', trigger: 'change' }]">
                  <div class="custom-name">
                    <el-autocomplete
                      style="width: 100%"
@@ -161,7 +161,8 @@
                </el-form-item>
              </el-col> -->
              <el-col :span="12">
                <el-form-item label="销售报价单" prop="quotation_number">
                <el-form-item label="销售报价单" prop="quotation_number"
                :rules="[{ required: autoCodeHeadersObj.bjd=='yes'?true:false, message: '请选择销售报价单', trigger: 'change' }]">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.quotation_number"
@@ -386,7 +387,7 @@
          <!-- 产品管理 -->
          <div class="basic-info-title" style="display: flex">
            产品管理
            <div style="margin-left: 400px">
            <!-- <div style="margin-left: 400px">
              币种
              <el-select
                v-model="editConfig.infomation.currency"
@@ -398,17 +399,21 @@
                <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
              </el-select>
            </div>
            </div> -->
          </div>
          <div class="product-view">
            <!-- :detail-enter="true" -->
            <CommonFormTableView
              ref="commonFormTableView"
              :detail-enter="true"
              :select-box="selectBox"
              :show-summary="showSummary"
              pageName="quotation"
              :isOperate="((autoCodeHeadersObj.bjd=='yes'&&editConfig.infomation.quotation_number)||autoCodeHeadersObj.bjd!='yes')?true:false"
              :quotationNumber="autoCodeHeadersObj.bjd=='yes'?editConfig.infomation.quotation_number:''"
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @getSelectArray="getSelectArray"
              @addProductClick="addProductClick"
              @emptyProductClick="emptyProductClick"
              @clearupProduct="clearupProduct"
            ></CommonFormTableView>
          </div>
          <!-- 选择审批流程 -->
@@ -539,8 +544,8 @@
        number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
        signTime: [{ required: true, message: "请选择签约日期", trigger: "change" }],
        memberId: [{ required: true, validator: this.validateMemberId, trigger: "change" }],
        sale_chance_name: [{ required: true, message: "请选择销售机会", trigger: "change" }],
        quotation_number: [{ required: true, message: "请选择销售报价单", trigger: "change" }],
        // sale_chance_name: [{ required: true, message: "请选择销售机会", trigger: "change" }],
        // quotation_number: [{ required: true, message: "请选择销售报价单", trigger: "change" }],
        deliveryDate: [{ required: true, message: "请选择交付日期", trigger: "change" }]
        // approvalOpinion: [{ required: true, message: "请输入", trigger: "blur" }]
      },
@@ -554,7 +559,7 @@
        show: true,
        total: true,
        sumProp: ["Amount", "total"],
        mergeNumber: 2
        mergeNumber: 7
      },
      editSelectClientConfig: {
        editVisible: false,
@@ -591,7 +596,6 @@
      quotationList: [],
      quotationId: this.editCommonConfig.infomation.quotationId,
      tableData: [],
      selProductData: [],
      isView: this.editCommonConfig.title === "查看",
      selectBox: this.editCommonConfig.title !== "查看",
      thatMember: {}
@@ -638,7 +642,7 @@
            let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
            this.memberOptions.map((item) => {
              if (item.username == username) {
                this.editConfig.infomation.memberId = item.id
                this.$set(this.editConfig.infomation, "memberId", item.id)
              }
            })
          }
@@ -659,8 +663,8 @@
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          for (let i = 0; i < this.selProductData.length; i++) {
            if (this.selProductData[i].name.length === 0) {
          for (let i = 0; i < this.tableData.length; i++) {
            if (this.tableData[i].name.length === 0) {
              this.isNoProduct = true
              break
            } else {
@@ -670,13 +674,23 @@
          if (this.isNoProduct) {
            this.$message.error("请选择产品")
          } else {
            for (let i = 0; i < this.tableData.length; i++) {
              if (this.tableData[i].cost) {
                let reg =
            /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
                if(!reg.test(this.tableData[i].cost)){
                  this.$message.error("成本单价需要填写大于0的2位小数!")
                  return true;
                }
              }
            }
            const params = this.saveParams()
            if (this.editConfig.title === "新建") {
              getAddSalesDetails(params).then((res) => {
                console.log(res)
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.selProductData.map((item) => {
                  this.tableData.map((item) => {
                    this.amountTotal += parseFloat(item.total)
                  })
                  let config = {
@@ -687,7 +701,6 @@
                }
              })
            } else {
              console.log(this.selProductData)
              getUpdateSalesDetails(params).then((res) => {
                console.log(res)
                this.editConfig.visible = false
@@ -715,7 +728,7 @@
        memberId: data.memberId || 0,
        number: data.number || "",
        phone: data.phone || "",
        products: this.selProductData,
        products: this.tableData,
        remark: data.remark || "",
        saleChanceId: this.saleChanceId || 0,
        saleType: data.saleType || 0,
@@ -764,7 +777,7 @@
                this.tableData = item.products
                this.tableData.map((item, index) => {
                  item.productId = index + 1
                  this.selProductData.forEach((key) => {
                  this.tableData.forEach((key) => {
                    if (item.number === key.number) {
                      item.amount = key.amount
                      item.id = key.id
@@ -772,13 +785,6 @@
                  })
                })
                this.productTableList.tableData = this.tableData
                this.selProductData.forEach((key) => {
                  this.tableData.forEach((row) => {
                    if (key.number === row.number) {
                      this.$refs.commonFormTableView.$refs.fromTable.toggleRowSelection(row, true)
                    }
                  })
                })
              }
            })
          }
@@ -854,7 +860,7 @@
        this.subbillId = item.id
        this.editConfig.infomation.subbill_name = item.number
      } else if (value === "quotation") {
        this.productTableList.tableData = item.products
        // this.productTableList.tableData = item.products
        // this.tableData = item.products
        this.editConfig.infomation.quotation_number = item.number
        this.quotationId = item.id
@@ -932,21 +938,43 @@
    setFormatClick() {},
    setTableForm() {
      if (this.editConfig.title === "新建" || this.editConfig.infomation.products.length === 0) {
        this.tableData = []
        this.tableData = [
          {
            productId: this.productId,
            id: 0,
            amount: 0,
            desc: "",
            name: "",
            number: "",
            price: 0,
            cost:'',
            profit:'',
            margin:'',
            total: 0,
            unit: ""
          }
        ]
      } else {
        this.selProductData = this.editConfig.infomation.products
        this.tableData = this.editConfig.infomation.products
        this.getQuotation(this.editConfig.infomation.saleChanceId, "全部产品")
      }
      // let productData = this.quotationList.products
      let isBjdRequird=false
      if(this.autoCodeHeadersObj.bjd=='yes'){
        isBjdRequird=true
      }
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: [
          { label: "#", prop: "productId", width: 40 },
          { label: "产品名称", prop: "name", isRequird: true },
          { label: "产品名称", prop: "name", productName: true, isRequird: true,min:110, },
          { label: "产品编号", prop: "number" },
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },
          { label: "单位", prop: "unit" },
          { label: "销售单价", prop: "price" },
          { label: "销售单价", prop: "price",inputFloat: !isBjdRequird, isRequird: true },
          { label: "成本单价", prop: "cost",input: !isBjdRequird},
          { label: "毛利", prop: "profit" },
          { label: "毛利率(%)", prop: "margin",min:90},
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },
          { label: "价税合计", prop: "total" }
        ]
      }
@@ -960,9 +988,49 @@
        }
      })
    },
    // 选择产品
    getSelectArray(val) {
      this.selProductData = val
    // 产品新增
    addProductClick() {
      this.productId++
      this.tableData.push({
        productId: this.productId,
        id: 0,
        amount: 0,
        desc: "",
        name: "",
        number: "",
        price: 0,
        cost:'',
        profit:'',
        margin:'',
        total: 0,
        unit: ""
      })
      this.showSummary.show = true
    },
    //  产品清空
    emptyProductClick() {
      this.productId = 1
      this.tableData = [
        {
          productId: this.productId,
          id: 0,
          amount: 0,
          desc: "",
          name: "",
          number: "",
          price: 0,
          cost:'',
          profit:'',
          margin:'',
          total: 0,
          unit: ""
        }
      ]
      this.productTableList.tableData = this.tableData
    },
    clearupProduct(data) {
      this.tableData = data
      this.productTableList.tableData = this.tableData
    },
    // 获取项目列表
    async getProjectList() {