diff --git a/src/views/integrated/visitorUser/index.vue b/src/views/integrated/visitorUser/index.vue index aaa8ee9..da607d3 100644 --- a/src/views/integrated/visitorUser/index.vue +++ b/src/views/integrated/visitorUser/index.vue @@ -32,7 +32,7 @@ @queryTable="getDataList"> - @@ -45,7 +45,7 @@ - + @@ -136,4 +136,4 @@ const handleDelete = async (ids: string[]) => { useMessage().error(err.msg); } }; - \ No newline at end of file + diff --git a/src/views/integrated/visitors/form.vue b/src/views/integrated/visitors/form.vue index c499f35..0942077 100644 --- a/src/views/integrated/visitors/form.vue +++ b/src/views/integrated/visitors/form.vue @@ -31,8 +31,8 @@ - - + + @@ -61,13 +61,13 @@ - - + + - - + + @@ -113,16 +113,17 @@ const form = reactive({ idCard: '', description: '', checkStatus: '', - deptId: '', + deptName: '', userName: '', carId: '', companyName: '', peopleNumber: '', - vStartDate: '', - vEndDate: '', + vstartDate: '', + vendDate: '', isDrive: '', processInstanceId: '', checkReason: '', + type: '1', // 主动申请类型 }); // 定义校验规则 diff --git a/src/views/integrated/visitors/index.vue b/src/views/integrated/visitors/index.vue index 8d485dc..5c9778e 100644 --- a/src/views/integrated/visitors/index.vue +++ b/src/views/integrated/visitors/index.vue @@ -19,14 +19,14 @@
- - 新 增 - - - 删除 - + + + + + + + + @@ -41,32 +41,53 @@ - + - + - - - - - - - + - + - + - + - + - + - + - + - +
{ if (!chartContainer.value) return; - + chartInstance = echarts.init(chartContainer.value); updateChart(); }; @@ -39,7 +39,7 @@ const initChart = () => { // 更新图表 const updateChart = () => { if (!chartInstance) return; - + const option = getChartOption(); chartInstance.setOption(option, true); }; @@ -79,7 +79,7 @@ const getChartOption = () => { ...item, })), }; - + case 'bar': return { ...baseOption, @@ -95,7 +95,7 @@ const getChartOption = () => { ...item, })), }; - + case 'pie': return { ...baseOption, @@ -121,7 +121,7 @@ const getChartOption = () => { }, }], }; - + case 'area': return { ...baseOption, @@ -139,7 +139,7 @@ const getChartOption = () => { ...item, })), }; - + default: return baseOption; } diff --git a/src/views/supermarketerp/report/jsxs/components/SummaryCard.vue b/src/views/supermarketerp/report/jsxs/components/SummaryCard.vue index e2528cf..e2174a6 100644 --- a/src/views/supermarketerp/report/jsxs/components/SummaryCard.vue +++ b/src/views/supermarketerp/report/jsxs/components/SummaryCard.vue @@ -46,17 +46,17 @@ const formattedValue = computed(() => { if (typeof props.value === 'string') { return props.value; } - + switch (props.format) { case 'currency': return new Intl.NumberFormat('zh-CN', { style: 'currency', currency: 'CNY', }).format(props.value); - + case 'percent': return `${props.value.toFixed(2)}%`; - + case 'number': default: return new Intl.NumberFormat('zh-CN').format(props.value);