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

haoxuan

2023-10-24 01cea4bc73210e43f748d82a02a432cce615be2d

 src/views/sales/quotation/AddQuotationDialog.vue

@@ -26,7 +26,22 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="报价编号" prop="number">
                  <WordInput
                  <el-input
                    v-if="
                      editConfig.title == '编辑' ||
                      (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"
                    >请优先配置编码规范 <el-button type="text" @click="numberClick"> 配置规范 </el-button></span
                  >
                  <!-- <WordInput
                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                    :codenumer="codenumer"
                    :sum="sum"
@@ -37,11 +52,17 @@
                  <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">
                <el-form-item label="报价名称" prop="quotationName">
                  <div class="custom-name">
                    <el-input v-model="editConfig.infomation.quotationName"></el-input>
                  </div>
                </el-form-item>
              </el-col>
              <!-- <el-col :span="12">
                <el-form-item label="客户名称" prop="client_name">
                  <div class="custom-name">
                    <el-autocomplete
@@ -66,7 +87,7 @@
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              </el-col> -->
              <!--              <el-col :span="12">-->
              <!--                <el-form-item label="报价编号" prop="number">-->
              <!--                  <el-input v-model="editConfig.infomation.number"></el-input>-->
@@ -106,7 +127,7 @@
                  </el-date-picker>
                </el-form-item>
              </el-col>
              <el-col :span="12">
              <!-- <el-col :span="12">
                <el-form-item label="联系人姓名" prop="contact_id">
                  <div class="custom-name">
                    <el-autocomplete
@@ -131,7 +152,7 @@
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              </el-col> -->
              <el-col :span="12">
                <el-form-item label="销售负责人" prop="member_id">
                  <el-select
@@ -312,7 +333,7 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
import codeMixin from "@/components/makepager/mixin/codeMixin"
export default {
  name: "QuotationDialog",
  mixins: [codeMixin],
@@ -349,14 +370,14 @@
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        client_id: [{ required: true, message: "请输入", trigger: "blur" }],
        number: [{ required: true, message: "请输入", trigger: "blur" }],
        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, message: "请选择销售机会", trigger: "blur" }],
        sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
        member_id: [{ required: true, message: "请选择负责人", trigger: "change" }]
      },
      memberOptions: [],
      quotationStatusOptions: [{ id: 1, name: "不知道" }], // 报价单状态
      quotationStatusOptions: [], // 报价单状态
      currencyOptions: [{ id: 1, name: "人民币" }], // 币种
      approvalWorkflowOptions: [], // 审批流程
      productTableList: {},
@@ -404,9 +425,6 @@
        this.formInfo()
      }
    },
    "editConfig.infomation.codeStandID"() {
      this.formInfo()
    }
  },
  methods: {
    formInfo() {
@@ -490,9 +508,8 @@
      let data = this.editConfig.infomation
      let params = {
        id: this.editConfig.title === "新建" ? 0 : data.id,
        client_id: this.clientId || 0,
        quotationName: data.quotationName || "",
        conditions: data.conditions || "",
        contact_id: this.contactId || 0,
        file: data.file || "",
        member_id: data.member_id || 0,
        number: data.number || "",
@@ -501,7 +518,7 @@
        validity_date: data.validity_date || "",
        products: this.tableData,
        codeStandID: data.ID,
        codeRule: this.codeRule
        client_id: this.clientId || 0
      }
      return params
    },
@@ -655,6 +672,14 @@
    clearupProduct(data) {
      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("请选择销售机会"))
      }
    }
  }
}