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

@@ -29,16 +29,14 @@
                  <el-input
                    v-if="
                      editConfig.title == '编辑' ||
                      (editConfig.title == '新建' &&
                        codenumer &&
                        (explain != '' || isIdDisabled))
                      (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"
                  <span v-else-if="editConfig.title == '新建'" style="color: #f56c6c"
                    >请优先配置编码规范 <el-button type="text" @click="numberClick"> 配置规范 </el-button></span
                  >
                  <!-- <WordInput
@@ -167,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"
@@ -239,20 +238,23 @@
          <!-- 产品管理 -->
          <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" placeholder="请选择" size="mini" style="width: 63%">
                <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">
            <CommonFormTableView
              :show-summary="showSummary"
              pageName="quotation"
              :addTypeIdMultiple="true"
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
              @getSelectArray="getSelectArray"
              @emptyProductClick="emptyProductClick"
              @recalculateProductClick="recalculateProductClick"
              @clearupProduct="clearupProduct"
@@ -370,11 +372,11 @@
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        number: [{ required: true, validator: this.validateCheckCode,  trigger: ["blur","change"] }],
        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" }],
        member_id: [{ required: true, message: "请选择负责人", trigger: "change" }]
        // sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
        member_id: [{ required: true, validator: this.validateMemberId, trigger: "change" }]
      },
      memberOptions: [],
      quotationStatusOptions: [], // 报价单状态
@@ -385,7 +387,7 @@
        show: true,
        total: true,
        sumProp: ["Amount", "total"],
        mergeNumber: 2
        mergeNumber: 7
      },
      editSelectClientConfig: {
        editVisible: false,
@@ -418,6 +420,7 @@
    this.setTableForm()
    this.getCommonData()
    this.formInfo()
    this.getUseSystemSet({modeType:'bjd'})
  },
  watch: {
    "editConfig.visible"(val) {
@@ -438,7 +441,17 @@
      getAllData()
        .then((res) => {
          this.memberOptions = res.data.member
          this.quotationStatusOptions = res.data.quotationStatus
          this.quotationStatusOptions = res.data.quotationStatus?res.data.quotationStatus:[]
          if (this.editConfig.title === "新建") {
            let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
            this.memberOptions.map((item) => {
              if (item.username == username) {
                this.$set(this.editConfig.infomation, "member_id", item.id)
              }
            })
            this.$set(this.editConfig.infomation,'quotation_status_id',this.quotationStatusOptions.length>0?this.quotationStatusOptions[0].id:'')
          }
          
          this.dataProcess()
        })
        .catch((err) => {
@@ -467,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)
@@ -605,7 +626,11 @@
            name: "",
            number: "",
            price: 0,
            total: 0
            cost:'',
            profit:'',
            margin:'',
            total: 0,
            unit: ""
          }
        ]
      } else {
@@ -618,10 +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: "unit" },
          { 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: "price", inputFloat: true },
          { label: "价税合计", prop: "total", inputFloat: true }
        ]
      }
@@ -637,17 +666,32 @@
    },
    // 产品新增
    addProductClick() {
      this.productId++
      this.tableData.push({
        productId: this.productId,
        id: 0,
        amount: 0,
        desc: "",
        name: "",
        number: "",
        price: 0,
        total: 0
      })
      // 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
    },
    //  产品清空
@@ -662,7 +706,11 @@
          name: "",
          number: "",
          price: 0,
          total: 0
          cost:'',
          profit:'',
          margin:'',
          total: 0,
          unit: ""
        }
      ]
      this.productTableList.tableData = this.tableData
@@ -673,12 +721,24 @@
      this.tableData = data
      this.productTableList.tableData = this.tableData
    },
    // 订单编码单独校验
    // 销售机会单独校验
    checkChance(rule, value, callback) {
      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()
        }
      }
    },
    // 销售负责人自定义校验规则
    validateMemberId(rule, value, callback) {
      if (this.editConfig.infomation?.member_id > 0) {
        callback()
      } else {
        callback(new Error("请选择销售负责人"))
      }
    }
  }