From 89fd2cf7202c321512c2ea699a3a220a7138ed44 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
ui/admin-ui3/src/views/cwgl/customerManagement/index.vue | 528 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 389 insertions(+), 139 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/customerManagement/index.vue b/ui/admin-ui3/src/views/cwgl/customerManagement/index.vue
index 2b8eb3e..2177c96 100644
--- a/ui/admin-ui3/src/views/cwgl/customerManagement/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/customerManagement/index.vue
@@ -1,163 +1,413 @@
<template>
- <basicContainer >
- <avue-crud
- :option="option"
- :table-loading="pageF.loading"
- :data="tableData"
- :page="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crudRef"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @refresh-change="refreshChange"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @on-load="onLoad"
- >
+ <basicContainer>
+ <avue-crud :option="option" :table-loading="pageF.loading" :data="tableData" :page="page"
+ :permission="permissionList" :before-open="beforeOpen" v-model="form" ref="crudRef" @row-update="rowUpdate"
+ @row-save="rowSave" @refresh-change="refreshChange" @row-del="rowDel" @search-change="searchChange"
+ @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
+ @size-change="sizeChange" @on-load="onLoad">
<template #menu-left>
- <el-button
- type="success"
- icon="Edit"
- :disabled="pageF.single"
- v-hasPermi="['cwgl:customerManagement:edit']"
- @click="handleUpdate">淇敼
+ <!-- <el-button type="success" icon="Edit" :disabled="pageF.single" v-hasPermi="['cwgl:customerManagement:edit']"
+ @click="handleUpdate">淇敼
</el-button>
- <el-button
- type="danger"
- icon="Delete"
- :disabled="pageF.multiple"
- @click="handleDelete"
- v-hasPermi="['cwgl:customerManagement:remove']"
- >鍒犻櫎
+ <el-button type="danger" icon="Delete" :disabled="pageF.multiple" @click="handleDelete"
+ v-hasPermi="['cwgl:customerManagement:remove']">鍒犻櫎
+ </el-button> -->
+ <el-button type="primary" icon="Plus" v-hasPermi="['cwgl:customerManagement:add']" @click="handleAdd">鏂板
</el-button>
- <el-button
- type="warning"
- plain
- icon="Download"
- @click="handleExport"
- v-hasPermi="['cwgl:customerManagement:export']"
- >瀵煎嚭
+ <el-button type="warning" plain icon="Download" @click="handleExport"
+ v-hasPermi="['cwgl:customerManagement:export']">瀵煎嚭
</el-button>
+ </template>
+ <template #menu="{ size, row, index }">
+ <el-link class="link-btn" type="primary" :underline="false" plain :size="size" icon="Edit"
+ @click="handleFy(row)" v-hasPermi="['cwgl:dispatchOrder:query']"> 缂栬緫
+ </el-link>
+
</template>
</avue-crud>
</basicContainer>
+
+ <!-- 鏂板瀹㈡埛寮圭獥 -->
+ <el-dialog v-model="dialogVisible" title="鏂板" width="70%" destroy-on-close @close="handleClose">
+ <!-- 琛ㄥ崟 -->
+ <el-form ref="customerFormRef" :model="formData" :rules="formRules" label-width="140px" size="default">
+ <!-- 鍩烘湰淇℃伅鎶樺彔闈㈡澘 -->
+ <el-collapse v-model="activePanels">
+ <!-- 鍩烘湰淇℃伅闈㈡澘 -->
+ <el-collapse-item title="鍩烘湰淇℃伅" name="basic">
+ <el-row :gutter="20">
+ <!-- 瀹㈡埛绫诲瀷 -->
+ <!-- 瀹㈡埛绠�绉� -->
+ <el-col :span="12">
+ <el-form-item label="瀹㈡埛缂栫爜" prop="customerCode">
+ <el-input v-model="formData.customerCode" placeholder="璇疯緭鍏ュ鎴风紪鐮�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瀹㈡埛绫诲瀷" prop="customerType">
+
+ <el-select v-model="form.customerType" placeholder="璇烽�夋嫨瀹㈡埛绫诲瀷" clearable>
+ <el-option v-for="dict in customer_type" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+
+ <!-- 瀹㈡埛绠�绉� -->
+ <el-col :span="12">
+ <el-form-item label="瀹㈡埛绠�绉�" prop="customerShortName">
+ <el-input v-model="formData.customerShortName" placeholder="璇疯緭鍏ュ鎴风畝绉�" />
+ </el-form-item>
+ </el-col>
+
+ <!-- 瀹㈡埛鍏ㄧО -->
+ <el-col :span="12">
+ <el-form-item label="瀹㈡埛鍏ㄧО" prop="customerFullName">
+ <el-input v-model="formData.customerFullName" placeholder="璇疯緭鍏ュ鎴峰叏绉�" />
+ </el-form-item>
+ </el-col>
+
+ <!-- 缁忚惀鐧昏璇佷欢鍙风爜 -->
+ <el-col :span="12">
+ <el-form-item label="缁忚惀鐧昏璇佷欢鍙风爜" prop="licenseNumber">
+ <el-input v-model="formData.licenseNumber" placeholder="璇疯緭鍏ョ粡钀ョ櫥璁拌瘉浠跺彿鐮�" />
+ </el-form-item>
+ </el-col>
+
+ <!-- 鍦板潃 -->
+ <el-col :span="24">
+ <el-form-item label="鍦板潃" prop="address">
+ <el-input v-model="formData.address" placeholder="璇疯緭鍏ュ湴鍧�" type="textarea" :rows="2" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-collapse-item>
+
+ <!-- 鑱旂郴浜轰俊鎭潰鏉� -->
+ <el-collapse-item title="鑱旂郴浜轰俊鎭�" name="contact">
+ <el-row :gutter="20">
+ <!-- 鑱旂郴浜哄鍚� -->
+ <el-col :span="12">
+ <el-form-item label="鑱旂郴浜哄鍚�" prop="contactName">
+ <el-input v-model="formData.contactName" placeholder="璇疯緭鍏ヨ仈绯讳汉濮撳悕" />
+ </el-form-item>
+ </el-col>
+
+ <!-- 鑱旂郴浜虹數璇� -->
+ <el-col :span="12">
+ <el-form-item label="鑱旂郴浜虹數璇�" prop="contactPhone">
+ <el-input v-model="formData.contactPhone" placeholder="璇疯緭鍏ヨ仈绯讳汉鐢佃瘽" />
+ </el-form-item>
+ </el-col>
+
+ <!-- 鑱旂郴浜洪偖绠� -->
+ <el-col :span="24">
+ <el-form-item label="鑱旂郴浜洪偖绠�" prop="contactEmail">
+ <el-input v-model="formData.contactEmail" placeholder="璇疯緭鍏ヨ仈绯讳汉閭" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-collapse-item>
+
+ <!-- 鍏朵粬淇℃伅闈㈡澘 -->
+ <el-collapse-item title="鍏朵粬淇℃伅" name="other">
+ <el-row :gutter="20">
+ <!-- 澶囨敞 -->
+ <el-col :span="24">
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" type="textarea" :rows="2" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-collapse-item>
+ </el-collapse>
+ </el-form>
+
+ <!-- 搴曢儴鎸夐挳 -->
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="handleClose">鍙栨秷</el-button>
+ <el-button type="primary" @click="handleSubmit">淇濆瓨</el-button>
+ </span>
+ </template>
+ </el-dialog>
</template>
<script setup name="customerManagement" lang="ts">
- import {CustomerManagementI,addCustomerManagement, delCustomerManagement, exportCustomerManagement, getCustomerManagement, listCustomerManagement, updateCustomerManagement} from "@/api/cwgl/customerManagement";
- import useCurrentInstance from "@/utils/useCurrentInstance";
- import {computed,reactive, ref, toRefs} from "vue";
- import {PagesInterface, PageQueryInterface} from "@/utils/globalInterface";
- import {usePagePlus} from "@/hooks/usePagePlus";
- import {hasPermission} from "@/utils/permissionUtils";
+import { CustomerManagementI, addCustomerManagement, delCustomerManagement, exportCustomerManagement, getCustomerManagement, listCustomerManagement, updateCustomerManagement } from "@/api/cwgl/customerManagement";
+import useCurrentInstance from "@/utils/useCurrentInstance";
+import { computed, reactive, ref, toRefs } from "vue";
+import { PagesInterface, PageQueryInterface } from "@/utils/globalInterface";
+import { usePagePlus } from "@/hooks/usePagePlus";
+import { hasPermission } from "@/utils/permissionUtils";
+import router from "@/router";
+const { proxy } = useCurrentInstance();
- const { proxy } = useCurrentInstance();
- const crudRef = ref();
+const {
+ customer_type, sys_invoice_type, sys_currency, sys_account_type
- const permissionList = computed(()=>{
- return {
- addBtn: hasPermission(["cwgl:customerManagement:add"]),
- delBtn: hasPermission(["cwgl:customerManagement:remove"]),
- editBtn: hasPermission(["cwgl:customerManagement:edit"]),
- viewBtn: hasPermission(["cwgl:customerManagement:query"]),
- }
- })
- const data = reactive({
- form:<CustomerManagementI>{},
- queryParams:<CustomerManagementI&PageQueryInterface>{},
- page: <PagesInterface>{
- pageSize: 10,
- total: 0,
- currentPage: 1,
+} =
+ proxy.useDict(
+ 'customer_type', 'sys_invoice_type', 'sys_currency', 'sys_account_type'
+ );
+
+const crudRef = ref();
+
+const permissionList = computed(() => {
+ return {
+ addBtn: hasPermission(["cwgl:customerManagement:add"]),
+ delBtn: hasPermission(["cwgl:customerManagement:remove"]),
+ editBtn: hasPermission(["cwgl:customerManagement:edit"]),
+ viewBtn: hasPermission(["cwgl:customerManagement:query"]),
+ }
+})
+
+const data = reactive({
+ form: <CustomerManagementI>{},
+ queryParams: <CustomerManagementI & PageQueryInterface>{},
+ page: <PagesInterface>{
+ pageSize: 10,
+ total: 0,
+ currentPage: 1,
+ },
+ selectionList: [],
+ formData: <CustomerManagementI>{},
+ formRules: {
+ customerType: [
+ { required: true, message: '璇烽�夋嫨瀹㈡埛绫诲瀷', trigger: 'change' }
+ ],
+ customerShortName: [
+ { required: true, message: '璇疯緭鍏ュ鎴风畝绉�', trigger: 'blur' }
+ ],
+ customerFullName: [
+ { required: true, message: '璇疯緭鍏ュ鎴峰叏绉�', trigger: 'blur' }
+ ],
+ licenseNumber: [
+ { required: true, message: '璇疯緭鍏ョ粡钀ョ櫥璁拌瘉浠跺彿鐮�', trigger: 'blur' }
+ ],
+ contactName: [
+ { required: true, message: '璇疯緭鍏ヨ仈绯讳汉濮撳悕', trigger: 'blur' }
+ ]
+ }
+})
+
+
+const { queryParams, form, page, selectionList, formData } = toRefs(data);
+const option = ref({
+ pageKey: 'CustomerManagement',
+ rowKey: 'id',
+ searchSpan: 5,
+ addBtn: false,
+ // editBtn: false,
+ searchLabelWidth: 100,
+ column: {
+ // id: {
+ // label: 'ID',
+ // },
+ customerCode: {
+ label: '瀹㈡埛缂栫爜',
+ minWidth: 120,
+ search: true,
},
- selectionList:[],
- })
- const {queryParams,form,page,selectionList} = toRefs(data);
- const option = ref({
- pageKey: 'CustomerManagement',
- rowKey: 'id',
- column: {
- id: {
- label: 'ID',
- },
- customerFullName: {
- label: '瀹㈡埛鍏ㄧО',
- rules: [
- {
- required: true,
- message: "瀹㈡埛鍏ㄧО涓嶈兘涓虹┖", trigger: "blur" }
- ], },
- customerShortName: {
- label: '瀹㈡埛绠�绉�',
- },
- customerType: {
- label: '瀹㈡埛绫诲瀷',
- },
- contactPerson: {
- label: '鑱旂郴浜哄鍚�',
- },
- address: {
- label: '鍦板潃',
- type: 'textarea', minRows: 3, maxRows: 5,
- },
- contactPhone: {
- label: '鑱旂郴浜虹數璇�',
- },
- customerCode: {
- label: '瀹㈡埛缂栫爜',
- },
- status: {
- label: '鐘舵��',
- },
- remark: {
- label: '澶囨敞',
- type: 'textarea', minRows: 3, maxRows: 5,
- },
- createBy: {
- label: '鍒涘缓浜�',
- },
- updateBy: {
- label: '鏇存柊浜�',
- },
- createTime: {
- label: '鍒涘缓鏃堕棿',
- },
- updateTime: {
- label: '鏇存柊鏃堕棿',
- },
- deleted: {
- label: '鍒犻櫎鏍囪(0:姝ｅ父;1:鍒犻櫎)',
- },
- }
- })
+ customerType: {
+ label: '瀹㈡埛绫诲瀷', minWidth: 120,
+ type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/customer_type',
+ addDisplay: true,
+ editDisplay: true, value: '1',
+ viewDisplay: true,
+ hide: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "瀹㈡埛绫诲瀷涓嶈兘涓虹┖", trigger: "change"
+ }
+ ],
+ },
+ customerFullName: {
+ label: '瀹㈡埛鍏ㄧО',
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ hide: true,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "瀹㈡埛鍏ㄧО涓嶈兘涓虹┖", trigger: "blur"
+ }
+ ],
+ },
+ customerShortName: {
+ label: '瀹㈡埛绠�绉�',
+ addDisplay: true, minWidth: 130,
+ editDisplay: true,
+ viewDisplay: true,
+ hide: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "瀹㈡埛绠�绉颁笉鑳戒负绌�", trigger: "blur"
+ }
+ ],
+ },
- const { tableData,pageF,rowSave,rowUpdate,rowDel,beforeOpen,searchChange,
- searchReset,selectionChange,onLoad,currentChange,sizeChange,handleDelete,handleExport,handleUpdate,refreshChange} = usePagePlus({
- form:form,
- option:option,
- queryParams:queryParams,
- idKey:'id',
- page:page.value,
- getListApi:listCustomerManagement,
- getDetailApi:getCustomerManagement,
- exportApi:exportCustomerManagement,
- deleteApi:delCustomerManagement,
- addApi:addCustomerManagement,
- updateApi:updateCustomerManagement,
- handleUpdateFunc:()=>{
+ contactPerson: {
+ label: '鑱旂郴浜哄鍚�',
+ search: true,
+ minWidth: 180,
+ },
+ contactPhone: {
+ label: '鑱旂郴浜虹數璇�',
+ minWidth: 180,
+ },
+ // address: {
+ // label: '鍦板潃',
+ // type: 'textarea', minRows: 3, maxRows: 5,
+ // },
+ status: {
+ label: '鐘舵��',
+ },
+
+
+
+ // remark: {
+ // label: '澶囨敞',
+ // type: 'textarea', minRows: 3, maxRows: 5,
+ // },
+ createBy: {
+ label: '鍒涘缓浜�',
+ minWidth: 180,
+ },
+ createTime: {
+ label: '鍒涘缓鏃堕棿',
+ minWidth: 180,
+ },
+ createdTimeArray: {
+ label: '鍒涘缓鏃堕棿',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true
+ },
+ updateBy: {
+ label: '鏇存柊浜�',
+ minWidth: 180,
+ },
+ updateTime: {
+ label: '鏇存柊鏃堕棿',
+ addDisplay: false, minWidth: 180,
+ editDisplay: false,
+ viewDisplay: true,
+ hide: false,
+ search: false,
+ rules: [
+ {
+ required: true,
+ message: "鏇存柊鏃堕棿涓嶈兘涓虹┖", trigger: "blur"
+ }
+ ],
+ },
+ updateTimeArray: {
+ label: '鏇存柊鏃堕棿',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true
+ },
+ // deleted: {
+ // label: '鍒犻櫎鏍囪(0:姝ｅ父;1:鍒犻櫎)',
+ // },
+ }
+})
+
+const { tableData, pageF, rowSave, rowUpdate, rowDel, beforeOpen, searchChange,
+ searchReset, selectionChange, onLoad, currentChange, sizeChange, handleDelete, handleExport, handleUpdate, refreshChange } = usePagePlus({
+ form: form,
+ option: option,
+ queryParams: queryParams,
+ idKey: 'id',
+ page: page.value,
+ getListApi: listCustomerManagement,
+ getDetailApi: getCustomerManagement,
+ exportApi: exportCustomerManagement,
+ deleteApi: delCustomerManagement,
+ addApi: addCustomerManagement,
+ updateApi: updateCustomerManagement,
+ handleUpdateFunc: () => {
crudRef.value.rowEdit(selectionList.value[0]);
},
- handleSelectionChangeFunc:(selection:any)=>{
+ handleSelectionChangeFunc: (selection: any) => {
selectionList.value = selection;
+ },
+ getBeginListFunc: (params = {}) => {
+ // 鍒涘缓鏂板弬鏁板璞�
+ let newParams = { ...params };
+
+ newParams = proxy.addDateRangeNew(newParams, newParams?.createdTimeArray, 'createTime') || [];
+ newParams = proxy.addDateRangeNew(newParams, newParams?.updateTimeArray, 'updateTime') || [];
+ delete newParams.createdTimeArray;
+ delete newParams.updateTimeArray;
+ queryParams.value = newParams;
+ return newParams;
}
})
+const handleAdd = () => {
+ router.push('/customer/customerManagement-info')
+ // crudRef.value.rowAdd();
+}
+// 寮圭獥鏄剧ず鐘舵��
+const dialogVisible = ref(false);
+// 鎶樺彔闈㈡澘榛樿灞曞紑椤�
+const activePanels = ref(['basic', 'contact', 'other']);
+// 琛ㄥ崟瀹炰緥
+const customerFormRef = ref<FormInstance>();
+
+// 琛ㄥ崟鏁版嵁
+
+
+
+
+// 鎵撳紑寮圭獥锛堜緵鐖剁粍浠惰皟鐢級
+const handleFy = () => {
+ dialogVisible.value = true;
+ // 閲嶇疆琛ㄥ崟
+ customerFormRef.value?.resetFields();
+};
+
+// 鍏抽棴寮圭獥
+const handleClose = () => {
+ dialogVisible.value = false;
+ customerFormRef.value?.resetFields();
+};
+
+// 鎻愪氦琛ㄥ崟
+const handleSubmit = async () => {
+ if (!customerFormRef.value) return;
+
+ try {
+ // 琛ㄥ崟鏍￠獙
+ await customerFormRef.value.validate();
+ // 杩欓噷鍙互鍐欐彁浜ゆ帴鍙ｇ殑閫昏緫
+ console.log('琛ㄥ崟鏁版嵁锛�', form);
+ ElMessage.success('淇濆瓨鎴愬姛锛�');
+ // 鍏抽棴寮圭獥
+ dialogVisible.value = false;
+ // 閲嶇疆琛ㄥ崟
+ customerFormRef.value.resetFields();
+ } catch (error) {
+ ElMessage.warning('璇峰畬鍠勫繀濉」鍚庢彁浜�');
+ }
+};
+
</script>
--
Gitblit v1.8.0