From 77e29e8e84a8a44c924b304fcb06f81dec594b07 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 06 六月 2025 14:57:06 +0800
Subject: [PATCH] 1.库存管理页面表头修改 2.销售出库表单字段添加
---
src/views/basicInformation/mould/supplier.vue | 101 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 71 insertions(+), 30 deletions(-)
diff --git a/src/views/basicInformation/mould/supplier.vue b/src/views/basicInformation/mould/supplier.vue
index 5072173..b18cd9d 100644
--- a/src/views/basicInformation/mould/supplier.vue
+++ b/src/views/basicInformation/mould/supplier.vue
@@ -11,7 +11,7 @@
</el-form-item>
<el-form-item label="缁忚惀鍦板潃" prop="bids">
<el-cascader placeholder="璇烽�夋嫨缁忚惀鍦板潃" size="default" :options="addressSelectOptions" v-model="formData.bids"
- @change="handleChange">
+ :props="cascaderProps" @change="handleChange">
</el-cascader>
</el-form-item>
<el-form-item label="璇︾粏鍦板潃" prop="businessAddress">
@@ -29,13 +29,18 @@
<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>
@@ -44,12 +49,14 @@
<script setup>
import { ref, watch, defineProps, onMounted } from "vue";
-import addressList from "@/api/jsonApi/areaList.json";
import { addOrEditSupply } from "@/api/basicInformation/supplier";
+import { getAreaOptions } from "@/api/system/area.js";
+
const props = defineProps({
beforeClose: {
type: Function,
- default: () => { },
+ default: () => {
+ },
},
form: {
type: Object,
@@ -66,20 +73,41 @@
});
const emit = defineEmits(["submit", "handleBeforeClose"]);
-
+const copyForm = defineModel("copyForm", {
+ required: true,
+ type: Object,
+});
onMounted(() => {
- addressSelectOptions.value = mapAddress(addressList);
+ fetchAreaOptions()
})
+
+// 淇敼鏍戝舰閫夋嫨鐨勬槧灏�
+const cascaderProps = ref({
+ value: 'id', // 鎸囧畾value瀛楁涓篿d
+ label: 'label', // 鎸囧畾label瀛楁
+ children: 'children' // 鎸囧畾瀛愯妭鐐瑰瓧娈�
+})
+
// 鍦板潃閫夋嫨鏁版嵁
const addressSelectOptions = ref([]);
+const fetchAreaOptions = async () => {
+ addressSelectOptions.value = [];
+
+ const res = await getAreaOptions();
+ if (res.code === 200) {
+ addressSelectOptions.value = res.data;
+ }
+}
+
// 澶勭悊鍦板潃鏁版嵁杞崲
function mapAddress(list) {
return list.map(item => ({
- value: item.no,
+ value: item.id,
label: item.name,
children: item.children ? mapAddress(item.children) : undefined
}));
}
+
// 琛ㄥ崟寮曠敤
const formRef = ref(null);
// 琛ㄥ崟鏁版嵁
@@ -114,23 +142,29 @@
if (!formRef.value) return;
await formRef.value.validate(async (valid, fields) => {
if (valid) {
- if(props.title.includes('鏂板')){
+ const obj = ref({});
+ if (props.title.includes('鏂板')) {
let result = await addOrEditSupply({
- ...formData.value,
- })
- let obj = {
- ...formData.value,
- result
- };
- }else{
+ ...formData.value,
+ })
+ obj.value = {
+ title: "鏂板",
+ ...formData.value,
+ result
+ };
+ } else {
delete formData.value.createTime
delete formData.value.updateTime
let result = await addOrEditSupply({
- ...formData.value,
- })
- console.log(result)
+ ...formData.value,
+ })
+ obj.value = {
+ title: "缂栬緫",
+ ...formData.value,
+ result
+ };
}
- emit("submit", obj);
+ emit("submit", obj.value);
}
});
};
@@ -142,7 +176,8 @@
// 閲嶇疆琛ㄥ崟
const resetForm = () => {
if (!formRef.value) return;
- formRef.value.resetFields();
+ formData.value = JSON.parse(JSON.stringify(copyForm.value));
+ // formRef.value.resetFields();
};
// 鍏抽棴寮圭獥
const handleClose = () => {
@@ -158,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" }],
@@ -174,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