Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/plan/customerorder/sample-customerorder-form.vue

@@ -68,7 +68,7 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="业务员" prop="salesMan">
              <el-select @change="selsctionSales" filterable v-model="salesSelectData" style="width:100%">
              <el-select @change="selsctionSales" clearable filterable v-model="salesSelectData" style="width:100%">
                <el-option v-for="(item,index) in staffOptions" :key="index" :value="item.staffNo+','+item.staffName" :label="item.staffName"/>
              </el-select>
            </el-form-item>
@@ -538,23 +538,39 @@
    },
    // 表单提交
    dataFormSubmit() {
      this.buttonDisable = true
      this.$refs.dataForm.validate((valid) => {
        this.dataForm.customerOrderVOList = this.tableData
        if (valid) {
          addObj(this.dataForm)
            .then((data) => {
              this.$message.success('添加成功')
              this.initDataForm();
              this.visible = false
              this.buttonDisable = false
              this.$emit('refreshDataList', 1)
      const _than = this
      let isError = false
      _than.buttonDisable = true
      _than.tableData.forEach(ele=>{
        if(ele.buyQtyDue==null || ele.buyQtyDue=='' || ele.buyQtyDue==undefined){
          _than.$message.error("零件数量不能为空!")
          isError = true
        }else{
          var reg = /^\d+$/
          if(!reg.test(ele.buyQtyDue)){
            _than.$message.error("零件数量类型必须是数字!")
            isError = true
          }
        }
            })
            .catch((error) => {
              this.buttonDisable = false
      if(isError){
        _than.buttonDisable = false
        return
      }
      _than.$refs.dataForm.validate((valid) => {
        if (valid) {
          _than.dataForm.customerOrderVOList = _than.tableData
          addObj(_than.dataForm).then((data) => {
              _than.$message.success('添加成功')
              _than.initDataForm();
              _than.visible = false
              _than.buttonDisable = false
              _than.$emit('refreshDataList', 1)
            }).catch((error) => {
              _than.buttonDisable = false
            })
        } else {
          this.buttonDisable = false
          _than.buttonDisable = false
        }
      })
    },
@@ -564,7 +580,6 @@
      this.showPart = true
    },
    selectPart(part) {
      console.log(part);
      const index = this.currentSelectRow
      if (part) {
        this.tableData[index].partNo = part.partNo