From 52b3b54470ecc3c80d816a9891b651ce7f5a0eaa Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 11 十月 2025 13:39:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW' into dev_NEW

---
 src/views/basicInformation/mould/customer.vue |  234 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 141 insertions(+), 93 deletions(-)

diff --git a/src/views/basicInformation/mould/customer.vue b/src/views/basicInformation/mould/customer.vue
index 5dbd82f..37db037 100644
--- a/src/views/basicInformation/mould/customer.vue
+++ b/src/views/basicInformation/mould/customer.vue
@@ -1,70 +1,68 @@
 <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"
-            >
-                <el-form-item label="鍗¤儭" prop="supplierName">
-                    <el-input
-                        v-model="formData.supplierName"
-                        placeholder="璇疯緭鍏ヤ緵璐у晢鍚嶇О"
-                    />
-                </el-form-item>
-                <el-form-item label="绾崇◣浜鸿瘑鍒彿" prop="identifyNumber">
-                    <el-input
-                        v-model="formData.identifyNumber"
-                        placeholder="璇疯緭鍏ョ撼绋庝汉璇嗗埆鍙�"
-                    />
-                </el-form-item>
-                <el-form-item label="缁忚惀鍦板潃" prop="address">
-                      <el-cascader
-                        placeholder="璇烽�夋嫨缁忚惀鍦板潃"
-                        size="default"
-                        :options="addressSelectOptions"
-                        v-model="formData.address"
-                        @change="handleChange"
-                      >
-                      </el-cascader>
-                    </el-form-item>
-                    <el-form-item label="璇︾粏鍦板潃" prop="addressDetail">
-                      <el-input
-                        v-model="formData.addressDetail"
-                        placeholder="璇疯緭鍏ュ鎴疯缁嗗湴鍧�"
-                      />
-                    </el-form-item>
-                <el-form-item label="閾惰璐︽埛" prop="bankAccount">
-                    <el-input v-model="formData.bankAccount" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
-                </el-form-item>
-                <el-form-item>
-                    <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>
-            </el-form>
-        </el-dialog>
-    </div>
+  <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">
+        <el-form-item label="瀹㈡埛鍚嶇О" prop="customerName">
+          <el-input v-model="formData.customerName" placeholder="璇疯緭鍏ュ鎴峰悕绉�" :disabled="isViewMode"/>
+        </el-form-item>
+        <el-form-item label="绾崇◣浜鸿瘑鍒彿" prop="taxpayerId">
+          <el-input v-model="formData.taxpayerId" placeholder="璇疯緭鍏ョ撼绋庝汉璇嗗埆鍙�" :disabled="isViewMode"/>
+        </el-form-item>
+        <el-form-item label="缁忚惀鍦板潃" prop="bids">
+          <el-cascader placeholder="璇烽�夋嫨缁忚惀鍦板潃" size="default" :options="addressSelectOptions"
+                       v-model="formData.bids"
+                       :props="cascaderProps" @change="handleChange" :disabled="isViewMode">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="缁忚惀璇︾粏鍦板潃" prop="businessAddress">
+          <el-input v-model="formData.businessAddress" placeholder="璇疯緭鍏ョ粡钀ヨ缁嗗湴鍧�" :disabled="isViewMode"/>
+        </el-form-item>
+        <el-form-item label="寮�鎴疯" prop="bankName">
+          <el-input v-model="formData.bankName" placeholder="璇疯緭鍏ュ紑鎴疯" :disabled="isViewMode"/>
+        </el-form-item>
+        <el-form-item label="閾惰璐︽埛" prop="bankAccount">
+          <el-input v-model="formData.bankAccount" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" :disabled="isViewMode"/>
+        </el-form-item>
+        <el-form-item label="鑱旂郴浜�" prop="contactPerson">
+          <el-input v-model="formData.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" :disabled="isViewMode"/>
+        </el-form-item>
+        <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+          <el-input v-model="formData.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isViewMode"/>
+        </el-form-item>
+
+        <el-form-item label="鑱旂郴浜哄湴鍧�" prop="cids">
+          <el-cascader placeholder="璇烽�夋嫨鑱旂郴浜哄湴鍧�" size="default" :options="addressSelectOptions"
+                       v-model="formData.cids"
+                       :props="cascaderProps" @change="handleChange" :disabled="isViewMode">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="鑱旂郴浜鸿缁�" prop="contactAddress">
+          <el-input v-model="formData.contactAddress" placeholder="璇疯緭鍏ヨ仈绯讳汉璇︾粏鍦板潃" :disabled="isViewMode"/>
+        </el-form-item>
+        <el-form-item class="dialog-footer">
+          <el-button v-if="addOrEdit === 'edit'" @click="resetForm">閲嶇疆</el-button>
+          <el-button v-if="addOrEdit === 'add' || addOrEdit.includes('viewRow')" @click="cancelForm">鍙栨秷</el-button>
+          <el-button type="primary" v-if="!isViewMode" @click="submitForm">
+            纭畾
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup>
-import { ref, watch, onMounted } from "vue";
-import addressList from "@/api/jsonApi/areaList.json";
+import {ref, watch, onMounted} from "vue";
+import {getAreaOptions} from "@/api/system/area.js";
+import {addOrEditCustomer} from "@/api/basicInformation/customer";
 
 const props = defineProps({
   beforeClose: {
     type: Function,
-    default: () => {},
+    default: () => {
+    },
   },
   form: {
     type: Object,
@@ -79,6 +77,7 @@
     default: "",
   },
 });
+const isViewMode = computed(() => props.addOrEdit.includes("viewRow"));
 const handleChange = (value) => {
   console.log(value);
 };
@@ -87,23 +86,35 @@
   "handleBeforeClose",
   "update:customerDialogFormVisible",
 ]);
-onMounted(() => {
-  addressSelectOptions.value = mapAddress(addressList);
+const copyForm = defineModel("copyForm", {
+  required: true,
+  type: Object,
 });
+onMounted(() => {
+  fetchAreaOptions()
+})
+
+// 淇敼鏍戝舰閫夋嫨鐨勬槧灏�
+const cascaderProps = ref({
+  value: 'id', // 鎸囧畾value瀛楁涓篿d
+  label: 'label', // 鎸囧畾label瀛楁
+  children: 'children' // 鎸囧畾瀛愯妭鐐瑰瓧娈�
+})
+
 // 鍦板潃閫夋嫨鏁版嵁
 const addressSelectOptions = ref([]);
-// 澶勭悊鍦板潃鏁版嵁杞崲
-function mapAddress(list) {
-  return list.map((item) => ({
-    value: item.no,
-    label: item.name,
-    children: item.children ? mapAddress(item.children) : undefined,
-  }));
+const fetchAreaOptions = async () => {
+  addressSelectOptions.value = [];
+
+  const res = await getAreaOptions();
+  if (res.code === 200) {
+    addressSelectOptions.value = res.data;
+  }
 }
 // 琛ㄥ崟寮曠敤
 const formRef = ref(null);
 // 琛ㄥ崟鏁版嵁
-const formData = ref({ ...props.form });
+const formData = ref({...props.form});
 // 寮圭獥鍙鎬�
 const dialogVisible = defineModel("customerDialogFormVisible", {
   required: true,
@@ -112,27 +123,54 @@
 
 // 鐩戝惉澶栭儴浼犲叆鐨勮〃鍗曟暟鎹彉鍖�
 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}
 );
 
 // 鐩戝惉鍐呴儴寮圭獥鐘舵�佸彉鍖�
 watch(
-  () => dialogVisible.value,
-  (newVal) => {
-    emit("update:customerDialogFormVisible", newVal);
-  }
+    () => dialogVisible.value,
+    (newVal) => {
+      emit("update:customerDialogFormVisible", newVal);
+    }
 );
 
 // 鎻愪氦琛ㄥ崟
 const submitForm = async () => {
   if (!formRef.value) return;
-  await formRef.value.validate((valid, fields) => {
+  await formRef.value.validate(async (valid, fields) => {
     if (valid) {
-      emit("submit", formData.value);
+      const obj = ref({});
+      if (props.title.includes('鏂板')) {
+        let result = await addOrEditCustomer({
+          ...formData.value,
+        })
+        obj.value = {
+          title: "鏂板",
+          ...formData.value,
+          result
+        };
+      } else {
+        let result = await addOrEditCustomer({
+          ...formData.value,
+        })
+        obj.value = {
+          title: "缂栬緫",
+          ...formData.value,
+          result
+        };
+      }
+      emit("submit", obj.value);
     }
   });
 };
@@ -144,7 +182,9 @@
 // 閲嶇疆琛ㄥ崟
 const resetForm = () => {
   if (!formRef.value) return;
-  formRef.value.resetFields();
+  formData.value = JSON.parse(JSON.stringify(copyForm.value));
+
+  // formRef.value.resetFields();
 };
 // 鍏抽棴寮圭獥
 const handleClose = () => {
@@ -153,12 +193,12 @@
   emit("update:customerDialogFormVisible", false);
 };
 const rules = reactive({
-  supplierName: [
-    { required: true, message: "璇疯緭鍏ヤ緵璐у晢鍚嶇О", trigger: "blur" },
+  customerName: [
+    {required: true, message: "璇疯緭鍏ヤ緵璐у晢鍚嶇О", trigger: "blur"},
   ],
-  identifyNumber: [
-    { required: true, message: "璇锋纭緭鍏ョ撼绋庝汉璇嗗埆鍙�", trigger: "blur" },
-    { min: 17, max: 20, message: "璇疯緭鍏�17-20浣嶇撼绋庝汉璇嗗埆鍙�", trigger: "blur" },
+  taxpayerId: [
+    {required: true, message: "璇锋纭緭鍏ョ撼绋庝汉璇嗗埆鍙�", trigger: "blur"},
+    {min: 17, max: 20, message: "璇疯緭鍏�17-20浣嶇撼绋庝汉璇嗗埆鍙�", trigger: "blur"},
   ],
   address: [
     {
@@ -167,15 +207,23 @@
       trigger: "change",
     },
   ],
-  bankAccount: [{ required: true, message: "璇疯緭鍏ラ摱琛岃处鎴�", trigger: "blur" }],
-  bank: [{ required: true, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur" }],
-  contacts: [{ required: true, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur" }],
-  contactsPhone: [
-    { required: true, message: "璇疯緭鍏ヨ仈绯讳汉", trigger: "blur" },
-    { min: 11, max: 11, message: "璇疯緭鍏�11浣嶈仈绯讳汉鐢佃瘽", 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"},
   ],
 });
 </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