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/supplier.vue | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/src/views/basicInformation/mould/supplier.vue b/src/views/basicInformation/mould/supplier.vue
index 9819f41..88a2192 100644
--- a/src/views/basicInformation/mould/supplier.vue
+++ b/src/views/basicInformation/mould/supplier.vue
@@ -4,7 +4,7 @@
: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="supplierName">
+ <el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierName">
<el-input v-model="formData.supplierName" placeholder="璇疯緭鍏ヤ緵璐у晢鍚嶇О"/>
</el-form-item>
<el-form-item label="绾崇◣浜鸿瘑鍒彿" prop="taxpayerId">
@@ -13,8 +13,7 @@
<el-form-item label="缁忚惀鍦板潃" prop="bids">
<el-cascader placeholder="璇烽�夋嫨缁忚惀鍦板潃" size="default" :options="addressSelectOptions"
v-model="formData.bids"
- :props="cascaderProps"
- @change="handleChange">
+ :props="cascaderProps" @change="handleChange">
</el-cascader>
</el-form-item>
<el-form-item label="璇︾粏鍦板潃" prop="businessAddress">
@@ -32,13 +31,19 @@
<el-form-item label="鑱旂郴浜虹數璇�" prop="contactPhone">
<el-input v-model="formData.contactPhone" placeholder="璇疯緭鍏ヨ仈绯讳汉鐢佃瘽"/>
</el-form-item>
- <el-form-item label="鑱旂郴浜哄湴鍧�" prop="contactAddress">
+ <el-form-item label="鑱旂郴浜哄湴鍧�" prop="cids">
+ <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-form-item>
- <el-form-item>
- <el-button type="primary" @click="submitForm"> 纭畾</el-button>
+ <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"> 纭畾</el-button>
</el-form-item>
</el-form>
</el-dialog>
@@ -71,7 +76,10 @@
});
const emit = defineEmits(["submit", "handleBeforeClose"]);
-
+const copyForm = defineModel("copyForm", {
+ required: true,
+ type: Object,
+});
onMounted(() => {
fetchAreaOptions()
})
@@ -137,23 +145,27 @@
if (!formRef.value) return;
await formRef.value.validate(async (valid, fields) => {
if (valid) {
+ const obj = ref({});
if (props.title.includes('鏂板')) {
let result = await addOrEditSupply({
...formData.value,
})
- let obj = {
+ obj.value = {
+ title: "鏂板",
...formData.value,
result
};
} else {
- delete formData.value.createTime
- delete formData.value.updateTime
let result = await addOrEditSupply({
...formData.value,
})
- console.log(result)
+ obj.value = {
+ title: "缂栬緫",
+ ...formData.value,
+ result
+ };
}
- emit("submit", obj);
+ emit("submit", obj.value);
}
});
};
@@ -165,7 +177,7 @@
// 閲嶇疆琛ㄥ崟
const resetForm = () => {
if (!formRef.value) return;
- formRef.value.resetFields();
+ formData.value = JSON.parse(JSON.stringify(copyForm.value));
};
// 鍏抽棴寮圭獥
const handleClose = () => {
@@ -181,13 +193,13 @@
{required: true, message: "璇锋纭緭鍏ョ撼绋庝汉璇嗗埆鍙�", trigger: "blur"},
{min: 17, max: 20, message: "璇疯緭鍏�17-20浣嶇撼绋庝汉璇嗗埆鍙�", trigger: "blur"},
],
- bids: [
- {
- required: true,
- message: "璇烽�夋嫨缁忚惀鍦板潃",
- trigger: "change",
- },
- ],
+ // bids: [
+ // {
+ // required: true,
+ // message: "璇烽�夋嫨缁忚惀鍦板潃",
+ // trigger: "change",
+ // },
+ // ],
bankName: [{required: true, message: "璇疯緭鍏ラ摱琛岃处鎴�", trigger: "blur"}],
bankAccount: [{required: true, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur"}],
contactPerson: [{required: true, message: "鑱旂郴浜�", trigger: "blur"}],
@@ -197,5 +209,11 @@
],
});
</script>
-<style lang="sass" scoped>
+<style lang="scss" scoped>
+.dialog-footer {
+ display: flex;
+ justify-content: flex-end;
+ margin-top: 20px;
+ flex-direction: column;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3