From df1406d0f571972d033dffd6a93fb4b94febeb56 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期二, 24 六月 2025 16:46:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- src/views/basicInformation/mould/customer.vue | 94 ++++++++++++++++++++++++---------------------- 1 files changed, 49 insertions(+), 45 deletions(-) diff --git a/src/views/basicInformation/mould/customer.vue b/src/views/basicInformation/mould/customer.vue index 0aa5a62..db4d96b 100644 --- a/src/views/basicInformation/mould/customer.vue +++ b/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); + } ); // 鎻愪氦琛ㄥ崟 @@ -191,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: [ { @@ -204,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> -- Gitblit v1.9.3