diff --git a/src/components/a-icon/iconfont.css b/src/components/a-icon/iconfont.css index 53e489c..05f5f2a 100644 --- a/src/components/a-icon/iconfont.css +++ b/src/components/a-icon/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* 项目名称 再昇云 */ - src: url('@/components/a-icon/iconfont.woff2?t=1770194183018') format('woff2'), - url('@/components/a-icon/iconfont.woff?t=1770194183018') format('woff'), - url('@/components/a-icon/iconfont.ttf?t=1770194183018') format('truetype'); + src: url('@/components/a-icon/iconfont.woff2?t=1771989909326') format('woff2'), + url('@/components/a-icon/iconfont.woff?t=1771989909326') format('woff'), + url('@/components/a-icon/iconfont.ttf?t=1771989909326') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-zhongzhimima:before { + content: "\e660"; +} + .icon-yundanguiji:before { content: "\e680"; } diff --git a/src/components/a-icon/iconfont.json b/src/components/a-icon/iconfont.json index 4110203..af10f47 100644 --- a/src/components/a-icon/iconfont.json +++ b/src/components/a-icon/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "524416", + "name": "重置密码", + "font_class": "zhongzhimima", + "unicode": "e660", + "unicode_decimal": 58976 + }, { "icon_id": "8242394", "name": "运单轨迹", diff --git a/src/components/a-icon/iconfont.ts b/src/components/a-icon/iconfont.ts index acb1fb7..cbb95d9 100644 --- a/src/components/a-icon/iconfont.ts +++ b/src/components/a-icon/iconfont.ts @@ -5,6 +5,13 @@ export const icons = { 'css_prefix_text': 'icon-', 'description': '', 'glyphs': [ + { + 'icon_id': '524416', + 'name': '重置密码', + 'font_class': 'zhongzhimima', + 'unicode': 'e660', + 'unicode_decimal': 58976, + }, { 'icon_id': '8242394', 'name': '运单轨迹', diff --git a/src/components/a-icon/iconfont.ttf b/src/components/a-icon/iconfont.ttf index 9f703ad..ba9b6e8 100644 Binary files a/src/components/a-icon/iconfont.ttf and b/src/components/a-icon/iconfont.ttf differ diff --git a/src/components/a-icon/iconfont.woff b/src/components/a-icon/iconfont.woff index af57ec4..3cff0b0 100644 Binary files a/src/components/a-icon/iconfont.woff and b/src/components/a-icon/iconfont.woff differ diff --git a/src/components/a-icon/iconfont.woff2 b/src/components/a-icon/iconfont.woff2 index bbe7408..b69b719 100644 Binary files a/src/components/a-icon/iconfont.woff2 and b/src/components/a-icon/iconfont.woff2 differ diff --git a/src/dts/components.d.ts b/src/dts/components.d.ts index 3b5e9cb..0f866c9 100644 --- a/src/dts/components.d.ts +++ b/src/dts/components.d.ts @@ -5,7 +5,6 @@ // ------ // Generated by unplugin-vue-components // Read more: https://github.com/vuejs/core/pull/3399 -import { GlobalComponents } from 'vue' export {} @@ -49,7 +48,6 @@ declare module 'vue' { ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSelectV2: typeof import('element-plus/es')['ElSelectV2'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] @@ -108,7 +106,6 @@ declare global { const ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] const ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] const ElSelect: typeof import('element-plus/es')['ElSelect'] - const ElSelectV2: typeof import('element-plus/es')['ElSelectV2'] const ElSwitch: typeof import('element-plus/es')['ElSwitch'] const ElTable: typeof import('element-plus/es')['ElTable'] const ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] @@ -122,4 +119,4 @@ declare global { const ElUpload: typeof import('element-plus/es')['ElUpload'] const RouterLink: typeof import('vue-router')['RouterLink'] const RouterView: typeof import('vue-router')['RouterView'] -} \ No newline at end of file +} diff --git a/src/pages/cst/customer/CustomerForm.vue b/src/pages/cst/customer/CustomerForm.vue index c3f813f..70fd4da 100644 --- a/src/pages/cst/customer/CustomerForm.vue +++ b/src/pages/cst/customer/CustomerForm.vue @@ -52,7 +52,7 @@ const props = withDefaults(defineProps<{ const formPanelIns = useTemplateRef('formPanel') const status = ref<'add' | 'modify'>('add') const formPanelProps = buildFormPanelProps({ - title: status.value === 'add' ? '新建客户' : '修改客户信息', + title: '', detailsLoader(id?: string) { if (Strings.isBlank(id)) { status.value = 'add' @@ -85,6 +85,7 @@ const formPanelProps = buildFormPanelProps({ defineExpose({ open(data?: CustomerTypes.SearchCustomerResult) { formPanelIns.value?.open(data?.id) + formPanelProps.title = status.value === 'add' ? '新建客户' : '修改客户信息' }, }) diff --git a/src/pages/cst/customer/constants.ts b/src/pages/cst/customer/constants.ts index f78d979..dcbfde2 100644 --- a/src/pages/cst/customer/constants.ts +++ b/src/pages/cst/customer/constants.ts @@ -27,6 +27,10 @@ const orgCategoryList = [ ] as const const identityCategoryList = [ + { + val: 'PingTai', + txt: '平台', + }, { val: 'ChanFei', txt: '产废方', diff --git a/src/pages/cst/customer/customer.d.ts b/src/pages/cst/customer/customer.d.ts index 30ea766..0b43854 100644 --- a/src/pages/cst/customer/customer.d.ts +++ b/src/pages/cst/customer/customer.d.ts @@ -3,7 +3,8 @@ export {} declare global { namespace CustomerTypes { interface SearchCustomerParam extends G.PageParam { - username: string + username?: string + keywords?: string // 客户姓名 nickname?: string // 客户联系电话 @@ -13,7 +14,7 @@ declare global { identityCategory?: string // 结算方式,YueJie-->月结、YuE-->余额、XianFu-->现付 settlementWay?: string - regdateTimes: [ string | undefined, string | undefined ] + regdateTimes?: [ string | undefined, string | undefined ] regdateStart?: string regdateEnd?: string } diff --git a/src/pages/cst/customer/page.ts b/src/pages/cst/customer/page.ts deleted file mode 100644 index 5c5ebbd..0000000 --- a/src/pages/cst/customer/page.ts +++ /dev/null @@ -1,3 +0,0 @@ -export default { - component: () => import('@/pages/cst/customer/Customer.vue'), -} as RouterTypes.RouteConfig \ No newline at end of file diff --git a/src/pages/cst/customer/purchaser/Purchaser.vue b/src/pages/cst/customer/purchaser/Purchaser.vue index ae54efb..75d8d88 100644 --- a/src/pages/cst/customer/purchaser/Purchaser.vue +++ b/src/pages/cst/customer/purchaser/Purchaser.vue @@ -31,6 +31,9 @@