From b21afc26b596a5a7cb77b36cd96f6e0df91637eb Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 26 八月 2026 14:21:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸
---
src/views/equipmentManagement/upkeep/index.vue | 2
src/views/system/role/index.vue | 10
src/views/collaborativeApproval/rulesRegulationsManagement/index.vue | 11 +
src/views/system/dept/index.vue | 2
src/views/system/post/index.vue | 2
src/views/productionManagement/productionCosting/index.vue | 40 +++---
src/views/monitor/logininfor/index.vue | 6
src/views/monitor/operlog/index.vue | 20 ++-
src/views/equipmentManagement/measurementEquipment/index.vue | 12 +-
src/views/basicData/customerFile/index.vue | 50 ++++----
src/views/productionManagement/productionReporting/index.vue | 10
src/views/reportAnalysis/reportManagement/index.vue | 138 +++++++++++-----------
src/views/reportAnalysis/taxComparison/index.vue | 8
src/views/system/dict/data.vue | 2
src/views/collaborativeApproval/knowledgeBase/index.vue | 16 +-
src/views/system/dict/index.vue | 2
16 files changed, 175 insertions(+), 156 deletions(-)
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index 7091a02..c314cd8 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -738,16 +738,16 @@
prop: "contactPhone",
width: 150,
},
- {
- label: "璺熻繘杩涘害",
- prop: "followUpLevel",
- width: 120,
- },
- {
- label: "璺熻繘鏃堕棿",
- prop: "followUpTime",
- width: 120,
- },
+ // {
+ // label: "璺熻繘杩涘害",
+ // prop: "followUpLevel",
+ // width: 120,
+ // },
+ // {
+ // label: "璺熻繘鏃堕棿",
+ // prop: "followUpTime",
+ // width: 120,
+ // },
{
label: "閾惰鍩烘湰鎴�",
prop: "basicBankAccount",
@@ -795,7 +795,7 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 290,
+ width: 130,
operation: [
{
name: "缂栬緫",
@@ -804,20 +804,20 @@
openForm("edit", row);
},
},
- {
- name: "娣诲姞娲借皥杩涘害",
- type: "text",
- clickFun: row => {
- openNegotiationDialog(row);
- },
- },
- {
- name: "鍥炶鎻愰啋",
- type: "text",
- clickFun: row => {
- openReminderDialog(row);
- },
- },
+ // {
+ // name: "娣诲姞娲借皥杩涘害",
+ // type: "text",
+ // clickFun: row => {
+ // openNegotiationDialog(row);
+ // },
+ // },
+ // {
+ // name: "鍥炶鎻愰啋",
+ // type: "text",
+ // clickFun: row => {
+ // openReminderDialog(row);
+ // },
+ // },
{
name: "璇︽儏",
type: "text",
diff --git a/src/views/collaborativeApproval/knowledgeBase/index.vue b/src/views/collaborativeApproval/knowledgeBase/index.vue
index 7cd9cb3..71d7a4e 100644
--- a/src/views/collaborativeApproval/knowledgeBase/index.vue
+++ b/src/views/collaborativeApproval/knowledgeBase/index.vue
@@ -282,14 +282,14 @@
<el-table :data="fileList" style="margin-top: 20px" border>
<el-table-column prop="fileName" label="鏂囦欢鍚�" show-overflow-tooltip />
<el-table-column prop="fileType" label="鏂囦欢绫诲瀷" width="100" />
- <el-table-column label="鍚戦噺鍖栫姸鎬�" width="120">
- <template #default="{ row }">
- <el-tag :type="getStatusType(row.vectorStatus)">
- {{ getStatusText(row.vectorStatus) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="chunkCount" label="鍒囩墖鏁�" width="100" align="center" />
+<!-- <el-table-column label="鍚戦噺鍖栫姸鎬�" width="120">-->
+<!-- <template #default="{ row }">-->
+<!-- <el-tag :type="getStatusType(row.vectorStatus)">-->
+<!-- {{ getStatusText(row.vectorStatus) }}-->
+<!-- </el-tag>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column prop="chunkCount" label="鍒囩墖鏁�" width="100" align="center" />-->
<el-table-column label="閿欒淇℃伅" width="200" show-overflow-tooltip>
<template #default="{ row }">
<span v-if="row.vectorError" style="color: #f56c6c">{{ row.vectorError }}</span>
diff --git a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
index 0d03b33..84fadf2 100644
--- a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
+++ b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
@@ -169,7 +169,13 @@
width="100" />
<el-table-column prop="updateTime"
label="鏇存柊鏃堕棿"
- width="180" />
+ width="180" >
+ <template #default="scope">
+ <el-text>
+ {{scope.row.updateTime?dayjs(scope.row.updateTime).format("YYYY-MM-DD"):"--"}}
+ </el-text>
+ </template>
+ </el-table-column>
<el-table-column prop="createUserName"
label="鏇存柊浜�"
width="120" />
@@ -228,6 +234,7 @@
addReadingStatus,
updateReadingStatus,
} from "@/api/collaborativeApproval/sealManagement.js";
+ import dayjs from "dayjs";
const FileList = defineAsyncComponent(() => import("@/components/Dialog/FileList.vue"));
import {
listRuleFiles,
@@ -455,7 +462,7 @@
const viewVersionHistory = row => {
showVersionHistoryDialog.value = true;
const params = {
- category: row.category,
+ title: row.title,
};
listRuleManagement(page, params).then(res => {
if (res.code == 200) {
diff --git a/src/views/equipmentManagement/measurementEquipment/index.vue b/src/views/equipmentManagement/measurementEquipment/index.vue
index 007eef6..18ddc16 100644
--- a/src/views/equipmentManagement/measurementEquipment/index.vue
+++ b/src/views/equipmentManagement/measurementEquipment/index.vue
@@ -114,12 +114,12 @@
width: 200,
align: "center",
},
- {
- label: "璇佷功缂栧彿",
- prop: "model",
- width: 200,
- align: "center",
- },
+ // {
+ // label: "璇佷功缂栧彿",
+ // prop: "model",
+ // width: 200,
+ // align: "center",
+ // },
{
label: "鏈�鏂伴壌瀹氭棩鏈�",
prop: "mostDate",
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 61fe1a6..7a834b9 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -172,7 +172,7 @@
<el-table-column label="瀹為檯淇濆吇浜�" prop="maintenanceActuallyName" align="center" />
<el-table-column label="瀹為檯淇濆吇鏃ユ湡" align="center">
<template #default="{ row }">
- {{ row.maintenanceActuallyTime ? dayjs(row.maintenanceActuallyTime).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+ {{ row.maintenanceActuallyTime ? dayjs(row.maintenanceActuallyTime).format('YYYY-MM-DD') : '-' }}
</template>
</el-table-column>
<el-table-column label="淇濆吇缁撴灉" align="center">
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 5603f91..b04a90a 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -95,7 +95,11 @@
<el-table ref="logininforRef" v-loading="loading" :data="logininforList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="璁块棶缂栧彿" align="center" prop="infoId" />
+ <el-table-column label="璁块棶缂栧彿" align="center">
+ <template #default="scope">
+ <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鐢ㄦ埛鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="鍦板潃" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
<el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 92f9c35..9c4f8d0 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -61,7 +61,7 @@
<el-form-item label="鎿嶄綔鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
- value-format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -109,7 +109,11 @@
<el-table ref="operlogRef" v-loading="loading" :data="operlogList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column type="selection" width="50" align="center" />
- <el-table-column label="鏃ュ織缂栧彿" align="center" prop="operId" />
+ <el-table-column label="鏃ュ織缂栧彿" align="center">
+ <template #default="scope">
+ <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="绯荤粺妯″潡" align="center" prop="title" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔绫诲瀷" align="center" prop="businessType">
<template #default="scope">
@@ -125,7 +129,7 @@
</el-table-column>
<el-table-column label="鎿嶄綔鏃ユ湡" align="center" prop="operTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']">
<template #default="scope">
- <span>{{ parseTime(scope.row.operTime) }}</span>
+ <span>{{ dayjs(form.operTime).format("YYYY-MM-DD") }}</span>
</template>
</el-table-column>
<el-table-column label="娑堣�楁椂闂�" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
@@ -145,6 +149,7 @@
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
+ :page-sizes="[10, 20, 30, 50, 100, 200]"
@pagination="getList"
/>
@@ -165,9 +170,9 @@
<el-col :span="24">
<el-form-item label="鎿嶄綔鏂规硶锛�">{{ form.method }}</el-form-item>
</el-col>
- <el-col :span="24">
- <el-form-item label="璇锋眰鍙傛暟锛�">{{ form.operParam }}</el-form-item>
- </el-col>
+<!-- <el-col :span="24">-->
+<!-- <el-form-item label="璇锋眰鍙傛暟锛�">{{ form.operParam }}</el-form-item>-->
+<!-- </el-col>-->
<el-col :span="24">
<el-form-item label="杩斿洖鍙傛暟锛�">{{ form.jsonResult }}</el-form-item>
</el-col>
@@ -181,7 +186,7 @@
<el-form-item label="娑堣�楁椂闂达細">{{ form.costTime }}姣</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鎿嶄綔鏃堕棿锛�">{{ parseTime(form.operTime) }}</el-form-item>
+ <el-form-item label="鎿嶄綔鏃堕棿锛�">{{ dayjs(form.operTime).format("YYYY-MM-DD") }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="寮傚父淇℃伅锛�" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
@@ -200,6 +205,7 @@
<script setup name="Operlog">
import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog"
import {onMounted} from "vue";
+import dayjs from "dayjs";
const { proxy } = getCurrentInstance()
const { sys_oper_type, sys_common_status } = proxy.useDict("sys_oper_type","sys_common_status")
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index 3e79b93..75ffce7 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -124,26 +124,26 @@
prop: "process",
minWidth: 100,
},
- {
- label: "宸ユ椂锛坔锛�",
- prop: "workHour",
- minWidth: 100,
- },
+ // {
+ // label: "宸ユ椂锛坔锛�",
+ // prop: "workHour",
+ // minWidth: 100,
+ // },
{
label: "鐢熶骇鏁伴噺",
prop: "quantity",
minWidth: 100,
},
- {
- label: "宸ユ椂瀹氶",
- prop: "workHours",
- minWidth: 100,
- },
- {
- label: "宸ヨ祫",
- prop: "wages",
- minWidth: 100,
- },
+ // {
+ // label: "宸ユ椂瀹氶",
+ // prop: "workHours",
+ // minWidth: 100,
+ // },
+ // {
+ // label: "宸ヨ祫",
+ // prop: "wages",
+ // minWidth: 100,
+ // },
]);
// 宸︿晶姹囨�诲彴璐﹀垪锛堢敓浜т汉銆佷骇閲忋�佸伐璧勩�佸悎鏍肩巼锛�
@@ -158,11 +158,11 @@
prop: "finishedNum",
minWidth: 100,
},
- {
- label: "宸ヨ祫",
- prop: "wages",
- minWidth: 100,
- },
+ // {
+ // label: "宸ヨ祫",
+ // prop: "wages",
+ // minWidth: 100,
+ // },
{
label: "鍚堟牸鐜�",
prop: "outputRate",
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 28edda2..db5a34d 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -186,11 +186,11 @@
prop: "nickName",
width: 120,
},
- {
- label: "宸ユ椂锛坔锛�",
- width: 100,
- prop: "workHour",
- },
+ // {
+ // label: "宸ユ椂锛坔锛�",
+ // width: 100,
+ // prop: "workHour",
+ // },
{
label: "宸ュ簭",
prop: "process",
diff --git a/src/views/reportAnalysis/reportManagement/index.vue b/src/views/reportAnalysis/reportManagement/index.vue
index cd8ddd5..f7b6a17 100644
--- a/src/views/reportAnalysis/reportManagement/index.vue
+++ b/src/views/reportAnalysis/reportManagement/index.vue
@@ -37,30 +37,30 @@
</div>
</div>
</div>
- <div class="typeNum">
- <div class="typeNum-left">
- <img src="~@/assets/images/chartCard2.svg" alt="鍥捐〃"
- style="width: 40px; height: 40px; object-fit: contain;">
- <div class="typeNum-left-text" style="color: #5EB334;">鍗婃垚鍝�</div>
- </div>
- <div class="typeNum-center">
- <div class="typeNum-leftLine2">-</div>
- <div class="typeNum-rightLine2"></div>
- </div>
- <div class="typeNum-right">
- <div class="typeNum-right-top">
- <div class="typeNum-right-top-name">鎬绘暟閲�</div>
- <div class="typeNum-right-top-text">{{ getInspectStatValue(1, 'totalCount') }} <span
- class="unit">涓�</span></div>
- </div>
- <div class="typeNum-right-bottom">
- <div class="typeNum-right-top-name">宸插畬鎴愭暟</div>
- <div class="typeNum-right-top-text">{{ getInspectStatValue(1, 'completedCount') }} <span
- class="unit">涓�</span>
- </div>
- </div>
- </div>
- </div>
+<!-- <div class="typeNum">-->
+<!-- <div class="typeNum-left">-->
+<!-- <img src="~@/assets/images/chartCard2.svg" alt="鍥捐〃"-->
+<!-- style="width: 40px; height: 40px; object-fit: contain;">-->
+<!-- <div class="typeNum-left-text" style="color: #5EB334;">鍗婃垚鍝�</div>-->
+<!-- </div>-->
+<!-- <div class="typeNum-center">-->
+<!-- <div class="typeNum-leftLine2">-</div>-->
+<!-- <div class="typeNum-rightLine2"></div>-->
+<!-- </div>-->
+<!-- <div class="typeNum-right">-->
+<!-- <div class="typeNum-right-top">-->
+<!-- <div class="typeNum-right-top-name">鎬绘暟閲�</div>-->
+<!-- <div class="typeNum-right-top-text">{{ getInspectStatValue(1, 'totalCount') }} <span-->
+<!-- class="unit">涓�</span></div>-->
+<!-- </div>-->
+<!-- <div class="typeNum-right-bottom">-->
+<!-- <div class="typeNum-right-top-name">宸插畬鎴愭暟</div>-->
+<!-- <div class="typeNum-right-top-text">{{ getInspectStatValue(1, 'completedCount') }} <span-->
+<!-- class="unit">涓�</span>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="typeNum">
<div class="typeNum-left">
<img src="~@/assets/images/chartCard3.svg" alt="鍥捐〃"
@@ -123,31 +123,31 @@
</div>
</div>
</div>
- <div class="quality-card green-card">
- <div class="quality-card-title">
- <img src="~@/assets/images/chartCard2.svg" alt="鍗婃垚鍝�"
- style="width: 24px; height: 24px; margin-right: 8px;">
- 鍗婃垚鍝佸悎鏍肩巼
- </div>
- <div class="quality-card-content">
- <div class="quality-item">
- <div>
- <div class="quality-item-label blue-label">瀹屾垚鐜�</div>
- <div class="quality-item-tip">鍗犳瘮</div>
- <div class="quality-item-value">{{ getPassRateStatValue(1, 'completionRate') }}</div>
- </div>
- <div class="quality-item-chart" ref="semiCompletionChart"></div>
- </div>
- <div class="quality-item">
- <div>
- <div class="quality-item-label green-label">鍚堟牸鐜�</div>
- <div class="quality-item-tip">鍗犳瘮</div>
- <div class="quality-item-value">{{ getPassRateStatValue(1, 'passRate') }}</div>
- </div>
- <div class="quality-item-chart" ref="semiQualityChart"></div>
- </div>
- </div>
- </div>
+<!-- <div class="quality-card green-card">-->
+<!-- <div class="quality-card-title">-->
+<!-- <img src="~@/assets/images/chartCard2.svg" alt="鍗婃垚鍝�"-->
+<!-- style="width: 24px; height: 24px; margin-right: 8px;">-->
+<!-- 鍗婃垚鍝佸悎鏍肩巼-->
+<!-- </div>-->
+<!-- <div class="quality-card-content">-->
+<!-- <div class="quality-item">-->
+<!-- <div>-->
+<!-- <div class="quality-item-label blue-label">瀹屾垚鐜�</div>-->
+<!-- <div class="quality-item-tip">鍗犳瘮</div>-->
+<!-- <div class="quality-item-value">{{ getPassRateStatValue(1, 'completionRate') }}</div>-->
+<!-- </div>-->
+<!-- <div class="quality-item-chart" ref="semiCompletionChart"></div>-->
+<!-- </div>-->
+<!-- <div class="quality-item">-->
+<!-- <div>-->
+<!-- <div class="quality-item-label green-label">鍚堟牸鐜�</div>-->
+<!-- <div class="quality-item-tip">鍗犳瘮</div>-->
+<!-- <div class="quality-item-value">{{ getPassRateStatValue(1, 'passRate') }}</div>-->
+<!-- </div>-->
+<!-- <div class="quality-item-chart" ref="semiQualityChart"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="quality-card purple-card">
<div class="quality-card-title">
<img src="~@/assets/images/chartCard3.svg" alt="鎴愬搧"
@@ -202,10 +202,10 @@
<div class="chart-box-title">鍘熸潗鏂欐�绘暟</div>
<div class="chart-box-num">{{ getYearlyStatValue(0, 'totalCount') }}</div>
</div>
- <div class="inspection-chart-box">
- <div class="chart-box-title">鍗婃垚鍝佹�绘暟</div>
- <div class="chart-box-num">{{ getYearlyStatValue(1, 'totalCount') }}</div>
- </div>
+<!-- <div class="inspection-chart-box">-->
+<!-- <div class="chart-box-title">鍗婃垚鍝佹�绘暟</div>-->
+<!-- <div class="chart-box-num">{{ getYearlyStatValue(1, 'totalCount') }}</div>-->
+<!-- </div>-->
<div class="inspection-chart-box">
<div class="chart-box-title">鎴愬搧鎬绘暟</div>
<div class="chart-box-num">{{ getYearlyStatValue(2, 'totalCount') }}</div>
@@ -266,7 +266,7 @@
<!-- Tab 閫夋嫨鍣� -->
<div class="tab-selector">
<div class="tab-item" :class="{ active: activeTab === 'raw' }" @click="activeTab = 'raw'">鍘熸潗鏂�</div>
- <div class="tab-item" :class="{ active: activeTab === 'semi' }" @click="activeTab = 'semi'">鍗婃垚鍝�</div>
+<!-- <div class="tab-item" :class="{ active: activeTab === 'semi' }" @click="activeTab = 'semi'">鍗婃垚鍝�</div>-->
<div class="tab-item" :class="{ active: activeTab === 'final' }" @click="activeTab = 'final'">鎴愬搧</div>
</div>
</el-card>
@@ -526,7 +526,8 @@
containLabel: true,
},
legend: {
- data: ["鍘熸潗鏂�", "鍗婃垚鍝�", "鎴愬搧"], // 鍥句緥鏁版嵁
+ // data: ["鍘熸潗鏂�", "鍗婃垚鍝�", "鎴愬搧"], // 鍥句緥鏁版嵁
+ data: ["鍘熸潗鏂�", "鎴愬搧"], // 鍥句緥鏁版嵁
icon: ["circle", "circle", "circle"],
itemWidth: 10, // 璁剧疆鍥炬爣瀹藉害
itemHeight: 10,
@@ -564,16 +565,16 @@
color: "#409EFF",
},
},
- {
- name: "鍗婃垚鍝�",
- type: "bar",
- barWidth: "15%",
-
- data: monthlyCompletionDetailsData.value.map(item => item.processCount),
- itemStyle: {
- color: "#67C23A",
- },
- },
+ // {
+ // name: "鍗婃垚鍝�",
+ // type: "bar",
+ // barWidth: "15%",
+ //
+ // data: monthlyCompletionDetailsData.value.map(item => item.processCount),
+ // itemStyle: {
+ // color: "#67C23A",
+ // },
+ // },
{
name: "鎴愬搧",
type: "bar",
@@ -607,7 +608,7 @@
radius: "70%",
data: [
{ value: getYearlyStatValue(0, 'totalCount'), name: "鍘熸潗鏂�", itemStyle: { color: "#1890FF" } },
- { value: getYearlyStatValue(1, 'totalCount'), name: "鍗婃垚鍝�", itemStyle: { color: "#F7BA1E" } },
+ // { value: getYearlyStatValue(1, 'totalCount'), name: "鍗婃垚鍝�", itemStyle: { color: "#F7BA1E" } },
{ value: getYearlyStatValue(2, 'totalCount'), name: "鎴愬搧", itemStyle: { color: "#14C9C9" } },
],
label: {
@@ -655,7 +656,8 @@
},
// 鍥句緥閰嶇疆
legend: {
- data: ["鍘熸潗鏂�", "鍗婃垚鍝�", "鎴愬搧"], // 鍥句緥鏁版嵁
+ // data: ["鍘熸潗鏂�", "鍗婃垚鍝�", "鎴愬搧"], // 鍥句緥鏁版嵁
+ data: ["鍘熸潗鏂�", "鎴愬搧"], // 鍥句緥鏁版嵁
icon: ["circle", "circle", "circle"],
itemWidth: 10, // 璁剧疆鍥炬爣瀹藉害
itemHeight: 10,
@@ -1161,7 +1163,7 @@
.typeNum {
height: 100%;
- width: 33.33%;
+ width: 50%;
display: flex;
align-items: center;
justify-content: center;
diff --git a/src/views/reportAnalysis/taxComparison/index.vue b/src/views/reportAnalysis/taxComparison/index.vue
index c28d2f6..338a1b6 100644
--- a/src/views/reportAnalysis/taxComparison/index.vue
+++ b/src/views/reportAnalysis/taxComparison/index.vue
@@ -2,7 +2,7 @@
<div class="app-container vat-page">
<el-row :gutter="20" class="vat-row">
<!-- 宸︿晶锛氬鍊肩◣鏄庣粏鍒楄〃 -->
- <el-col :span="15" class="vat-col">
+ <el-col :span="12" class="vat-col">
<el-card shadow="never" class="vat-card">
<template #header>
<div class="card-header">
@@ -27,9 +27,9 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="invoiceNo" label="鍙戠エ鍙�" min-width="140" show-overflow-tooltip />
+<!-- <el-table-column prop="invoiceNo" label="鍙戠エ鍙�" min-width="140" show-overflow-tooltip />-->
<el-table-column prop="salesContractNo" label="鍚堝悓鍙�" min-width="140" show-overflow-tooltip />
- <el-table-column prop="supplierName" label="渚涘簲鍟�" min-width="100" show-overflow-tooltip />
+<!-- <el-table-column prop="supplierName" label="渚涘簲鍟�" min-width="100" show-overflow-tooltip />-->
<el-table-column prop="customerName" label="瀹㈡埛" min-width="100" show-overflow-tooltip />
<el-table-column prop="invoiceDate" label="寮�绁ㄦ棩鏈�" width="110" align="center" />
<el-table-column prop="taxRate" label="绋庣巼" width="75" align="center">
@@ -62,7 +62,7 @@
</el-col>
<!-- 鍙充晶锛氭煴鐘跺姣斿浘 -->
- <el-col :span="9" class="vat-col">
+ <el-col :span="12" class="vat-col">
<el-card shadow="never" class="vat-card">
<template #header>
<span class="card-title">杩涢攢椤瑰鍊肩◣瀵规瘮</span>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index a177314..ee506b3 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -63,7 +63,7 @@
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="200">
<template #default="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index f4e2c6f..6d860f5 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -105,7 +105,7 @@
<el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template #default="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 6c67e1b..ff38b58 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -120,7 +120,7 @@
<el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template #default="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 0e80652..50b9804 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -90,7 +90,7 @@
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template #default="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="180" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 85ecf28..706504c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -108,11 +108,11 @@
></el-switch>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
- <template #default="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
+<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
+ <template #default="scope">
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="淇敼" placement="top" v-if="scope.row.roleId !== 1">
--
Gitblit v1.9.3