diff --git a/src/App.vue b/src/App.vue index 6e00cea..eacffaf 100644 --- a/src/App.vue +++ b/src/App.vue @@ -183,17 +183,30 @@ // 排除移动端电子签名页,不做签名校验 const currentPath = router.currentRoute.value?.path || '' const isOnMobileSignature = currentPath.startsWith('/auth/signature/mobile') - if (!isOnMobileSignature && (data.user.sign_img == null || data.user.sign_img == '')) { - ElMessageBox.alert('请前往个人中心完成签名操作!', '提醒', { - confirmButtonText: '确定', - callback: () => { - if (systemsid == '1') { - router.push('/admin/user/user_info') - } else { - router.push('/system/user-center') + if (!isOnMobileSignature) { + if (data.user.sign_img == null || data.user.sign_img == '') { + ElMessageBox.alert('请前往个人中心完成签名操作!', '提醒', { + confirmButtonText: '确定', + callback: () => { + if (systemsid == '1') { + router.push('/admin/user/user_info') + } else { + router.push('/system/user-center') + } } - } - }) + }) + } else if (data.user.email == null || data.user.email == '') { + ElMessageBox.alert('邮箱没有填写!请前往个人中心补充邮箱!', '提醒', { + confirmButtonText: '确定', + callback: () => { + if (systemsid == '1') { + router.push('/admin/user/user_info') + } else { + router.push('/system/user-center') + } + } + }) + } } userStore.setUserInfo(data) } catch (error) { diff --git a/src/api/crmpc/vehicleApi.ts b/src/api/crmpc/vehicleApi.ts index db43ffa..dc314b8 100644 --- a/src/api/crmpc/vehicleApi.ts +++ b/src/api/crmpc/vehicleApi.ts @@ -64,4 +64,35 @@ export class vehicleService { params }) } + // 改装管理 + static getModificationList(params: Api.Common.PaginatingParams & any) { + return request.get({ + url: '/crm/modification/list', + params + }) + } + static modificationAdd(params: any) { + return request.post({ + url: '/crm/modification/store', + params + }) + } + static modificationDetail(params: any) { + return request.get({ + url: '/crm/modification/show', + params + }) + } + static modificationEdit(params: any) { + return request.post({ + url: '/crm/modification/update', + params + }) + } + static modificationDelete(params: any) { + return request.post({ + url: '/crm/modification/destroy', + params + }) + } } diff --git a/src/components/custom/OrderDetailContent.vue b/src/components/custom/OrderDetailContent.vue index c0d1aaf..3440faa 100644 --- a/src/components/custom/OrderDetailContent.vue +++ b/src/components/custom/OrderDetailContent.vue @@ -63,9 +63,9 @@ FOB运费 港杂费 海运费 - 单价(美金) - 总价(美金) - 利润(美金) + 单价 + 总价 + 利润 diff --git a/src/composables/useStockingForm.ts b/src/composables/useStockingForm.ts index 5851e7d..15ffb52 100644 --- a/src/composables/useStockingForm.ts +++ b/src/composables/useStockingForm.ts @@ -171,7 +171,7 @@ export function useStockingForm(isFinal = false, stockingId?: string | number) { object_id: stockingId || '0', contract: '', contract_url: '', - pick_up_date:'', + pick_up_date: '', collect_all_date: '' }) @@ -183,10 +183,10 @@ export function useStockingForm(isFinal = false, stockingId?: string | number) { mileage: 0, listing_price: undefined, listing_price_currency: 'CNY', - listing_price_currency_snapshot: '', + listing_price_currency_snapshot: '人民币', reduction_price: undefined, reduction_price_currency: 'CNY', - reduction_price_currency_snapshot: '', + reduction_price_currency_snapshot: '人民币', color_interior_code: '', color_interior_snapshot: '', color_exterior_code: '', @@ -197,38 +197,38 @@ export function useStockingForm(isFinal = false, stockingId?: string | number) { port_misc_fee: '', ocean_freight: '', ocean_freight_currency: 'CNY', - ocean_freight_currency_snapshot: '', + ocean_freight_currency_snapshot: '人民币', retrofit_fee: '', total_price: undefined, official_price: undefined, discount_price: undefined, fob_fee: undefined, fob_fee_currency: 'CNY', - fob_fee_currency_snapshot: '', + fob_fee_currency_snapshot: '人民币', helper_fee: undefined, helper_fee_currency: 'CNY', - helper_fee_currency_snapshot: '', + helper_fee_currency_snapshot: '人民币', domestic_freight: undefined, domestic_freight_currency: 'CNY', - domestic_freight_currency_snapshot: '', + domestic_freight_currency_snapshot: '人民币', port_fee: undefined, port_fee_currency: 'CNY', - port_fee_currency_snapshot: '', + port_fee_currency_snapshot: '人民币', unit_price_currency: 'CNY', - unit_price_currency_snapshot: '', + unit_price_currency_snapshot: '人民币', total_price_currency: 'CNY', - total_price_currency_snapshot: '', + total_price_currency_snapshot: '人民币', guide_price_currency: 'CNY', - guide_price_currency_snapshot: '', + guide_price_currency_snapshot: '人民币', discount: undefined, discount_currency: 'CNY', - discount_currency_snapshot: '', + discount_currency_snapshot: '人民币', contract_rate: 7.16, profit: undefined, modify_ids: [], modify_list: [], modify_fee_currency: 'CNY', - modify_fee_currency_snapshot: '' + modify_fee_currency_snapshot: '人民币' }) // 创建新的收款项 @@ -237,7 +237,7 @@ export function useStockingForm(isFinal = false, stockingId?: string | number) { remit_country_name_snapshot: '', remit_date: '', currency_code: 'CNY', - currency_name_snapshot: '', + currency_name_snapshot: '人民币', account_id: '', account_name_snapshot: '', remitter_name: '', diff --git a/src/views/admin/system/menu/index.vue b/src/views/admin/system/menu/index.vue index 8b79b48..350943d 100644 --- a/src/views/admin/system/menu/index.vue +++ b/src/views/admin/system/menu/index.vue @@ -190,7 +190,11 @@ - + diff --git a/src/views/admin/user/user_info.vue b/src/views/admin/user/user_info.vue index 1cd090f..687f10c 100644 --- a/src/views/admin/user/user_info.vue +++ b/src/views/admin/user/user_info.vue @@ -319,11 +319,11 @@ label: '未知' }, { - value: '1', + value: 1, label: '男' }, { - value: '2', + value: 2, label: '女' } ] diff --git a/src/views/admin/vehicle/brand.vue b/src/views/admin/vehicle/brand.vue index a7262cb..c4f7891 100644 --- a/src/views/admin/vehicle/brand.vue +++ b/src/views/admin/vehicle/brand.vue @@ -79,11 +79,12 @@
@@ -231,10 +232,9 @@ disabled /> - - + @@ -418,7 +418,6 @@ status: 1 }) const seriesRules = reactive({ - series_code: [{ required: true, message: '请输入系列编码', trigger: 'blur' }], series_name: [{ required: true, message: '请输入系列名称', trigger: 'blur' }] }) @@ -488,7 +487,6 @@ if (seriesDialogType.value === 'add') { const { message } = await vehicleService.seriesAdd({ brand_id: activeBrand.value.id, - series_code: seriesForm.series_code, series_name: seriesForm.series_name, description: seriesForm.description, sort: seriesForm.sort, @@ -499,7 +497,6 @@ const { message } = await vehicleService.seriesEdit({ id: seriesForm.id, brand_id: activeBrand.value.id, - series_code: seriesForm.series_code, series_name: seriesForm.series_name, description: seriesForm.description, sort: seriesForm.sort, diff --git a/src/views/admin/vehicle/color.vue b/src/views/admin/vehicle/color.vue index 307b524..f1a373d 100644 --- a/src/views/admin/vehicle/color.vue +++ b/src/views/admin/vehicle/color.vue @@ -105,17 +105,17 @@ width="600px" > - - + + - - - - + + 外观颜色 + 内饰颜色 + @@ -164,7 +164,6 @@ // 表单验证规则 const rules = reactive({ - color_code: [{ required: true, message: '请输入颜色编码', trigger: 'blur' }], color_text: [{ required: true, message: '请输入颜色名称', trigger: 'blur' }], type: [{ required: true, message: '请选择颜色类型', trigger: 'change' }] }) @@ -287,7 +286,6 @@ if (dialogType.value === 'add') { // 新增 const { message } = await vehicleService.colorAdd({ - color_code: form.color_code, color_text: form.color_text, type: form.type, status: form.status, @@ -298,7 +296,6 @@ // 编辑 const { message } = await vehicleService.colorEdit({ id: form.id, - color_code: form.color_code, color_text: form.color_text, type: form.type, status: form.status, diff --git a/src/views/admin/vehicle/modification.vue b/src/views/admin/vehicle/modification.vue index a1afc8f..f8b2f4f 100644 --- a/src/views/admin/vehicle/modification.vue +++ b/src/views/admin/vehicle/modification.vue @@ -87,8 +87,8 @@ width="600px" > - - + + @@ -149,7 +149,6 @@ // 表单验证规则 const rules = reactive({ - code: [{ required: true, message: '请输入改装项目编码', trigger: 'blur' }], name: [{ required: true, message: '请输入改装项目名称', trigger: 'blur' }], type: [{ required: true, message: '请选择改装类型', trigger: 'change' }] }) @@ -263,7 +262,6 @@ if (dialogType.value === 'add') { // 新增 const { message } = await vehicleService.modificationAdd({ - code: form.code, name: form.name, type: form.type, status: form.status, @@ -274,7 +272,6 @@ // 编辑 const { message } = await vehicleService.modificationEdit({ id: form.id, - code: form.code, name: form.name, type: form.type, status: form.status, diff --git a/src/views/auth/login/index.vue b/src/views/auth/login/index.vue index ade6b34..83e8c33 100644 --- a/src/views/auth/login/index.vue +++ b/src/views/auth/login/index.vue @@ -36,11 +36,11 @@