From 1a73c77e1d14205014f6a77a8954de480d436c0e Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 05 六月 2025 16:05:31 +0800
Subject: [PATCH] 联调基础模块信息-》供应商-》客户信息-》煤种信息 采购信息 联调

---
 src/views/basicInformation/mould/supplier.vue |   83 ++++++++++++++++++++++++++++-------------
 1 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/src/views/basicInformation/mould/supplier.vue b/src/views/basicInformation/mould/supplier.vue
index 5072173..9580ea2 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,11 +29,16 @@
         <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-button type="primary" @click="submitForm"> 纭畾</el-button>
           <el-button v-if="addOrEdit === 'edit'" @click="resetForm">閲嶇疆</el-button>
           <el-button v-if="addOrEdit === 'add'" @click="cancelForm">鍙栨秷</el-button>
         </el-form-item>
@@ -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,
@@ -68,18 +75,36 @@
 const emit = defineEmits(["submit", "handleBeforeClose"]);
 
 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 +139,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);
     }
   });
 };
@@ -158,13 +189,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" }],

--
Gitblit v1.9.3