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

haoxuan

2023-12-26 eed27d3000e127c433fd45609d0d5e5d06b7868c

 src/views/sales/quotation/AddQuotationDialog.vue

@@ -165,7 +165,8 @@
                </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.Xsjh=='yes'?true:false, validator: this.checkChance, trigger: 'change' }]">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.sale_chance_name"
@@ -248,9 +249,12 @@
          <div class="product-view">
            <CommonFormTableView
              :show-summary="showSummary"
              pageName="quotation"
              :addTypeIdMultiple="true"
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
              @getSelectArray="getSelectArray"
              @emptyProductClick="emptyProductClick"
              @recalculateProductClick="recalculateProductClick"
              @clearupProduct="clearupProduct"
@@ -371,7 +375,7 @@
        number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
        quotationName: [{ required: true, message: "请输入", trigger: "blur" }],
        quotation_status_id: [{ required: true, message: "请选择", trigger: "change" }],
        sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
        // sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
        member_id: [{ required: true, validator: this.validateMemberId, trigger: "change" }]
      },
      memberOptions: [],
@@ -383,7 +387,7 @@
        show: true,
        total: true,
        sumProp: ["Amount", "total"],
        mergeNumber: 2
        mergeNumber: 7
      },
      editSelectClientConfig: {
        editVisible: false,
@@ -416,13 +420,14 @@
    this.setTableForm()
    this.getCommonData()
    this.formInfo()
    this.getUseSystemSet({modeType:'bjd'})
  },
  watch: {
    "editConfig.visible"(val) {
      if (val) {
        this.formInfo()
      }
    }
    },
  },
  methods: {
    formInfo() {
@@ -475,8 +480,16 @@
          if (this.isNoProduct) {
            this.$message.error("产品名称不能为空")
          } else {
            for (let i = 0; i < this.tableData.length; i++) {
              if (this.tableData[i].cost||Number(this.tableData[i].cost)==0) {
                let reg = /^\+?[1-9]\d*$/;
                if(!reg.test(this.tableData[i].cost)){
                  this.$message.error("成本单价需要填写大于0的2位小数！")
                  return true;
                }
              }
            }
            const params = this.saveParams()
            console.log(params)
            if (this.editConfig.title === "新建") {
              getAddQuotation(params).then((res) => {
                console.log(res)
@@ -613,6 +626,9 @@
            name: "",
            number: "",
            price: 0,
            cost:'',
            profit:'',
            margin:'',
            total: 0,
            unit: ""
          }
@@ -627,11 +643,14 @@
        tableData: this.tableData,
        tableColumn: [
          { label: "#", prop: "productId", width: 40 },
          { label: "产品名称", prop: "name", productName: true, 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", inputFloat: true },
          { label: "销售单价", prop: "price", inputFloat: true, isRequird: true },
          { label: "成本单价", prop: "cost",input: true  },
          { label: "毛利", prop: "profit" },
          { label: "毛利率(%)", prop: "margin",min:90},
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },
          { label: "价税合计", prop: "total", inputFloat: true }
        ]
      }
@@ -647,18 +666,32 @@
    },
    // 产品新增
    addProductClick() {
      this.productId++
      this.tableData.push({
        productId: this.productId,
        id: 0,
        amount: 0,
        desc: "",
        name: "",
        number: "",
        price: 0,
        total: 0,
        unit: ""
      })
      // 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
    },
    // 新增方式修改
    getSelectArray(val){
      if(val.length>0){
        val.map((item, index) => {
          item.productId = this.tableData.length + index+1
        })
      }
      this.tableData=this.tableData.concat(val);
      this.productTableList.tableData=this.tableData
      this.showSummary.show = true
    },
    //  产品清空
@@ -673,6 +706,9 @@
          name: "",
          number: "",
          price: 0,
          cost:'',
          profit:'',
          margin:'',
          total: 0,
          unit: ""
        }
@@ -690,7 +726,11 @@
      if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
        callback()
      } else {
        callback(new Error("请选择销售机会"))
        if(this.autoCodeHeadersObj.Xsjh=='yes'){
          callback(new Error("请选择销售机会"))
        }else{
          callback()
        }
      }
    },
    // 销售负责人自定义校验规则