Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

昨天 df1406d0f571972d033dffd6a93fb4b94febeb56

 src/views/basicInformation/mould/customer.vue

@@ -1,44 +1,47 @@
<template>
  <div>
    <el-dialog v-model="dialogVisible" :title="title" width="600" :close-on-click-modal="false"
      :before-close="handleClose">
      <el-form ref="formRef" style="max-width: 400px; margin: 0 auto" :model="formData" :rules="rules" label-width="auto">
               :before-close="handleClose">
      <el-form ref="formRef" style="max-width: 400px; margin: 0 auto" :model="formData" :rules="rules"
               label-width="auto">
        <el-form-item label="客户名称" prop="customerName">
          <el-input v-model="formData.customerName" placeholder="请输入客户名称" />
          <el-input v-model="formData.customerName" placeholder="请输入客户名称"/>
        </el-form-item>
        <el-form-item label="纳税人识别号" prop="taxpayerId">
          <el-input v-model="formData.taxpayerId" placeholder="请输入纳税人识别号" />
          <el-input v-model="formData.taxpayerId" placeholder="请输入纳税人识别号"/>
        </el-form-item>
        <el-form-item label="经营地址" prop="bids">
          <el-cascader placeholder="请选择经营地址" size="default" :options="addressSelectOptions" v-model="formData.bids"
           :props="cascaderProps" @change="handleChange">
          <el-cascader placeholder="请选择经营地址" size="default" :options="addressSelectOptions"
                       v-model="formData.bids"
                       :props="cascaderProps" @change="handleChange">
          </el-cascader>
        </el-form-item>
        <el-form-item label="经营详细地址" prop="businessAddress">
          <el-input v-model="formData.businessAddress" placeholder="请输入经营详细地址" />
          <el-input v-model="formData.businessAddress" placeholder="请输入经营详细地址"/>
        </el-form-item>
        <el-form-item label="开户行" prop="bankName">
          <el-input v-model="formData.bankName" placeholder="请输入开户行" />
          <el-input v-model="formData.bankName" placeholder="请输入开户行"/>
        </el-form-item>
        <el-form-item label="银行账户" prop="bankAccount">
          <el-input v-model="formData.bankAccount" placeholder="请输入银行账户" />
          <el-input v-model="formData.bankAccount" placeholder="请输入银行账户"/>
        </el-form-item>
        <el-form-item label="联系人" prop="contactPerson">
          <el-input v-model="formData.contactPerson" placeholder="请输入联系人" />
          <el-input v-model="formData.contactPerson" placeholder="请输入联系人"/>
        </el-form-item>
        <el-form-item label="联系电话" prop="contactPhone">
          <el-input v-model="formData.contactPhone" placeholder="请输入联系电话" />
          <el-input v-model="formData.contactPhone" placeholder="请输入联系电话"/>
        </el-form-item>
  

        <el-form-item label="联系人地址" prop="cids">
          <el-cascader placeholder="请选择联系人地址" size="default" :options="addressSelectOptions" v-model="formData.cids"
            :props="cascaderProps" @change="handleChange">
          <el-cascader placeholder="请选择联系人地址" size="default" :options="addressSelectOptions"
                       v-model="formData.cids"
                       :props="cascaderProps" @change="handleChange">
          </el-cascader>
        </el-form-item>
        <el-form-item label="联系人详细" prop="contactAddress">
          <el-input v-model="formData.contactAddress" placeholder="请输入联系人详细地址" />
          <el-input v-model="formData.contactAddress" placeholder="请输入联系人详细地址"/>
        </el-form-item>
        <el-form-item class="dialog-footer"> 
        <el-form-item class="dialog-footer">
          <el-button v-if="addOrEdit === 'edit'" @click="resetForm">重置</el-button>
          <el-button v-if="addOrEdit === 'add'" @click="cancelForm">取消</el-button>
          <el-button type="primary" @click="submitForm">
@@ -51,15 +54,16 @@
</template>

<script setup>
import { ref, watch, onMounted } from "vue";
import { getAreaOptions } from "@/api/system/area.js";
import {ref, watch, onMounted} from "vue";
import {getAreaOptions} from "@/api/system/area.js";
import addressList from "@/api/jsonApi/areaList.json";
import { addOrEditCustomer } from "@/api/basicInformation/customer";
import {addOrEditCustomer} from "@/api/basicInformation/customer";

const props = defineProps({
  beforeClose: {
    type: Function,
    default: () => { },
    default: () => {
    },
  },
  form: {
    type: Object,
@@ -111,7 +115,7 @@
// 表单引用
const formRef = ref(null);
// 表单数据
const formData = ref({ ...props.form });
const formData = ref({...props.form});
// 弹窗可见性
const dialogVisible = defineModel("customerDialogFormVisible", {
  required: true,
@@ -120,26 +124,26 @@

// 监听外部传入的表单数据变化
watch(
  () => props.form,
  (newVal) => {
    formData.value = { ...newVal };
  },
  { deep: true }
    () => props.form,
    (newVal) => {
      formData.value = {...newVal};
    },
    {deep: true}
);
watch(
  () => props.form,
  (newVal) => {
    formData.value = { ...newVal };
  },
  { deep: true }
    () => props.form,
    (newVal) => {
      formData.value = {...newVal};
    },
    {deep: true}
);

// 监听内部弹窗状态变化
watch(
  () => dialogVisible.value,
  (newVal) => {
    emit("update:customerDialogFormVisible", newVal);
  }
    () => dialogVisible.value,
    (newVal) => {
      emit("update:customerDialogFormVisible", newVal);
    }
);

// 提交表单
@@ -158,8 +162,6 @@
          result
        };
      } else {
        delete formData.value.createTime
        delete formData.value.updateTime
        let result = await addOrEditCustomer({
          ...formData.value,
        })
@@ -193,11 +195,11 @@
};
const rules = reactive({
  customerName: [
    { required: true, message: "请输入供货商名称", trigger: "blur" },
    {required: true, message: "请输入供货商名称", trigger: "blur"},
  ],
  taxpayerId: [
    { required: true, message: "请正确输入纳税人识别号", trigger: "blur" },
    { min: 17, max: 20, message: "请输入17-20位纳税人识别号", trigger: "blur" },
    {required: true, message: "请正确输入纳税人识别号", trigger: "blur"},
    {min: 17, max: 20, message: "请输入17-20位纳税人识别号", trigger: "blur"},
  ],
  address: [
    {
@@ -206,14 +208,14 @@
      trigger: "change",
    },
  ],
  bankAccount: [{ required: true, message: "请输入银行账户", trigger: "blur" }],
  bankName: [{ required: true, message: "请输入开户行", trigger: "blur" }],
  contactPerson: [{ required: true, message: "请输入开户行", trigger: "blur" }],
  cids: [{ required: true, message: "请输入开户行", trigger: "blur" }],
  bids: [{ required: true, message: "请输入开户行", trigger: "blur" }],
  bankAccount: [{required: true, message: "请输入银行账户", trigger: "blur"}],
  bankName: [{required: true, message: "请输入开户行", trigger: "blur"}],
  contactPerson: [{required: true, message: "请输入开户行", trigger: "blur"}],
  cids: [{required: true, message: "请输入开户行", trigger: "blur"}],
  bids: [{required: true, message: "请输入开户行", trigger: "blur"}],
  contactPhone: [
    { required: true, message: "请输入联系人", trigger: "blur" },
    { min: 11, max: 11, message: "请输入11位联系人电话", trigger: "blur" },
    {required: true, message: "请输入联系人", trigger: "blur"},
    {min: 11, max: 11, message: "请输入11位联系人电话", trigger: "blur"},
  ],
});
</script>