From f78fae4c3fdc85f2a16530ff054204eefcbbb00d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 25 八月 2026 18:53:10 +0800
Subject: [PATCH] Merge branch 'dev_天津_建诚恒商贸' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_建诚恒商贸
---
src/views/collaborativeApproval/rulesRegulationsManagement/index.vue | 8
src/utils/ruoyi.js | 41 ++++
src/views/basicData/parameterMaintenance/index.vue | 3
src/views/qualityManagement/rawMaterialInspection/index.vue | 5
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue | 2
src/views/collaborativeApproval/sealManagement/index.vue | 8
src/views/inventoryManagement/dispatchLog/Record.vue | 6
src/views/productionManagement/productionTraceability/index.vue | 14
src/views/equipmentManagement/ledger/index.vue | 2
src/views/inventoryManagement/stockManagement/Record.vue | 10
src/views/inventoryManagement/stockManagement/Unqualified.vue | 8
src/views/collaborativeApproval/knowledgeBase/index.vue | 92 +++++----
src/views/inventoryManagement/receiptManagement/Record.vue | 8
src/views/equipmentManagement/upkeep/index.vue | 6
src/views/personnelManagement/socialSecuritySet/index.vue | 2
src/views/equipmentManagement/spareParts/index.vue | 2
src/views/personnelManagement/employeeRecord/index.vue | 16
src/views/equipmentManagement/repair/Modal/RepairModal.vue | 13 +
src/views/productionManagement/productionCosting/index.vue | 40 ++--
src/components/PIMTable/PIMTable.vue | 5
src/views/inventoryManagement/stockManagement/Qualified.vue | 8
src/views/equipmentManagement/inspectionManagement/index.vue | 2
src/views/financialManagement/receivable/salesReturn.vue | 2
src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js | 8
src/views/procurementManagement/procurementLedger/index.vue | 19 -
src/views/equipmentManagement/measurementEquipment/index.vue | 12
src/views/productionManagement/productionReporting/index.vue | 11
src/views/reportAnalysis/reportManagement/index.vue | 138 +++++++-------
src/views/reportAnalysis/taxComparison/index.vue | 8
src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue | 12
src/views/personnelManagement/employeeRecord/components/JobInfoSection.vue | 2
src/views/inventoryManagement/stockReport/index.vue | 15 +
src/views/financialManagement/payable/purchaseReturn.vue | 2
src/views/safeProduction/dangerInvestigation/index.vue | 6
34 files changed, 318 insertions(+), 218 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index 74615af..0045336 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -112,6 +112,10 @@
{{ formatters(scope.row[item.prop], item.formatData) }}
</el-tag>
</div>
+ <!-- 鏃堕棿绫诲瀷 -->
+ <div v-else-if="item.dataType === 'date'">
+ {{ scope.row[item.prop] ? dayjs(scope.row[item.prop]).format('YYYY-MM-DD') : '' }}
+ </div>
<!-- 鎸夐挳 -->
<div v-else-if="item.dataType == 'action'"
@click.stop>
@@ -204,6 +208,7 @@
import pagination from "./Pagination.vue";
import { computed, ref, inject, getCurrentInstance } from "vue";
import { ElMessage } from "element-plus";
+ import dayjs from "dayjs";
// 鑾峰彇鍏ㄥ眬鐨� uploadHeader
const { proxy } = getCurrentInstance();
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 0d72c1a..21d3e65 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -4,6 +4,47 @@
*/
// 鏃ユ湡鏍煎紡鍖�
+export function parseDate(time, pattern) {
+ if (arguments.length === 0 || !time) {
+ return null
+ }
+ const format = pattern || '{y}-{m}-{d}'
+ let date
+ if (typeof time === 'object') {
+ date = time
+ } else {
+ if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+ time = parseInt(time)
+ } else if (typeof time === 'string') {
+ time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '')
+ }
+ if ((typeof time === 'number') && (time.toString().length === 10)) {
+ time = time * 1000
+ }
+ date = new Date(time)
+ }
+ const formatObj = {
+ y: date.getFullYear(),
+ m: date.getMonth() + 1,
+ d: date.getDate(),
+ h: date.getHours(),
+ i: date.getMinutes(),
+ s: date.getSeconds(),
+ a: date.getDay()
+ }
+ const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+ let value = formatObj[key]
+ // Note: getDay() returns 0 on Sunday
+ if (key === 'a') { return ['鏃�', '涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�'][value] }
+ if (result.length > 0 && value < 10) {
+ value = '0' + value
+ }
+ return value || 0
+ })
+ return time_str
+}
+
+// 鏃ユ湡鏍煎紡鍖�
export function parseTime(time, pattern) {
if (arguments.length === 0 || !time) {
return null
diff --git a/src/views/basicData/parameterMaintenance/index.vue b/src/views/basicData/parameterMaintenance/index.vue
index 38ddd4f..01b604d 100644
--- a/src/views/basicData/parameterMaintenance/index.vue
+++ b/src/views/basicData/parameterMaintenance/index.vue
@@ -302,6 +302,7 @@
{
label: "鍒涘缓鏃堕棿",
prop: "createTime",
+ dataType:"date"
},
{
label: "鎿嶄綔",
@@ -374,7 +375,7 @@
const formCreateTimeDate = computed({
get: () => (formData.createTime ? String(formData.createTime).split(" ")[0] : ""),
set: (value) => {
- formData.createTime = value ? `${value} ${dayjs().format("HH:mm:ss")}` : "";
+ formData.createTime = value ? dayjs(value).format("YYYY-MM-DD") : "";
},
});
// const productTypes = ref([]);
diff --git a/src/views/collaborativeApproval/knowledgeBase/index.vue b/src/views/collaborativeApproval/knowledgeBase/index.vue
index f50d06b..7cd9cb3 100644
--- a/src/views/collaborativeApproval/knowledgeBase/index.vue
+++ b/src/views/collaborativeApproval/knowledgeBase/index.vue
@@ -127,11 +127,11 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="浣跨敤娆℃暟" prop="usageCount">
- <el-input-number v-model="form.usageCount" :min="0" style="width: 100%" />
- </el-form-item>
- </el-col>
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="浣跨敤娆℃暟" prop="usageCount">-->
+<!-- <el-input-number v-model="form.usageCount" :min="0" style="width: 100%" />-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
</el-row>
</el-form>
</FormDialog>
@@ -163,14 +163,14 @@
{{ getEfficiencyLabel(currentKnowledge.efficiency) }}
</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="浣跨敤娆℃暟">
- <el-tag type="info">{{ currentKnowledge.usageCount }} 娆�</el-tag>
- </el-descriptions-item>
+<!-- <el-descriptions-item label="浣跨敤娆℃暟">-->
+<!-- <el-tag type="info">{{ currentKnowledge.usageCount }} 娆�</el-tag>-->
+<!-- </el-descriptions-item>-->
<el-descriptions-item label="鍒涘缓浜�">
{{ currentKnowledge.creator }}
</el-descriptions-item>
<el-descriptions-item label="鍒涘缓鏃堕棿">
- {{ currentKnowledge.createTime }}
+ {{dayjs(currentKnowledge.createTime).format("YYYY-MM-DD")}}
</el-descriptions-item>
</el-descriptions>
@@ -202,19 +202,19 @@
<h4>浣跨敤缁熻</h4>
<div class="usage-stats">
<el-row :gutter="20">
- <el-col :span="8">
- <div class="stat-item">
- <div class="stat-number">{{ currentKnowledge.usageCount }}</div>
- <div class="stat-label">浣跨敤娆℃暟</div>
- </div>
- </el-col>
- <el-col :span="8">
+<!-- <el-col :span="8">-->
+<!-- <div class="stat-item">-->
+<!-- <div class="stat-number">{{ currentKnowledge.usageCount }}</div>-->
+<!-- <div class="stat-label">浣跨敤娆℃暟</div>-->
+<!-- </div>-->
+<!-- </el-col>-->
+ <el-col :span="12">
<div class="stat-item">
<div class="stat-number">{{ getEfficiencyScore(currentKnowledge.efficiency) }}%</div>
<div class="stat-label">鏁堢巼鎻愬崌</div>
</div>
</el-col>
- <el-col :span="8">
+ <el-col :span="12">
<div class="stat-item">
<div class="stat-number">{{ getTimeSaved(currentKnowledge.efficiency) }}</div>
<div class="stat-label">骞冲潎鑺傜渷鏃堕棿</div>
@@ -296,7 +296,7 @@
<span v-else style="color: #909399">-</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="涓婁紶鏃堕棿" width="180" />
+ <el-table-column prop="createTime" label="涓婁紶鏃堕棿" width="120" :formatter="formatDate" />
<el-table-column label="鎿嶄綔" width="150" align="center">
<template #default="{ row }">
<el-button
@@ -386,6 +386,11 @@
import useUserStore from '@/store/modules/user';
import { userListNoPageByTenantId } from '@/api/system/user.js';
import { getToken } from "@/utils/auth";
+import dayjs from "dayjs";
+import { parseDate } from "@/utils/ruoyi";
+
+// 鏃ユ湡鍥炴樉鏍煎紡鍖栵紙YYYY-MM-DD锛�
+const formatDate = (row, column, cellValue) => parseDate(cellValue) || '-';
// 琛ㄥ崟楠岃瘉瑙勫垯
const rules = {
@@ -528,24 +533,24 @@
return typeMap[params] || "info";
}
},
- {
- label: "鏂囦欢鏁伴噺",
- prop: "fileCount",
- width: 100,
- align: "center"
- },
- {
- label: "鍒囩墖鏁伴噺",
- prop: "totalChunkCount",
- width: 100,
- align: "center"
- },
- {
- label: "浣跨敤娆℃暟",
- prop: "usageCount",
- width: 100,
- align: "center"
- },
+ // {
+ // label: "鏂囦欢鏁伴噺",
+ // prop: "fileCount",
+ // width: 100,
+ // align: "center"
+ // },
+ // {
+ // label: "鍒囩墖鏁伴噺",
+ // prop: "totalChunkCount",
+ // width: 100,
+ // align: "center"
+ // },
+ // {
+ // label: "浣跨敤娆℃暟",
+ // prop: "usageCount",
+ // width: 100,
+ // align: "center"
+ // },
{
label: "鍒涘缓浜�",
prop: "creator",
@@ -555,6 +560,7 @@
label: "鍒涘缓鏃堕棿",
prop: "createTime",
width: 180,
+ dataType:"date"
},
{
dataType: "action",
@@ -577,13 +583,13 @@
openFilesDialog(row);
}
},
- {
- name: "闂瓟",
- type: "text",
- clickFun: (row) => {
- openChatDialog(row);
- }
- },
+ // {
+ // name: "闂瓟",
+ // type: "text",
+ // clickFun: (row) => {
+ // openChatDialog(row);
+ // }
+ // },
{
name: "璇︽儏",
type: "text",
diff --git a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
index f7ba9d9..0d03b33 100644
--- a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
+++ b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
@@ -144,7 +144,7 @@
<el-descriptions-item label="鍒嗙被">{{ getCategoryText(currentRegulationDetail.category) }}</el-descriptions-item>
<el-descriptions-item label="鐗堟湰">{{ currentRegulationDetail.version }}</el-descriptions-item>
<el-descriptions-item label="鍙戝竷浜�">{{ currentRegulationDetail.createUserName }}</el-descriptions-item>
- <el-descriptions-item label="鍙戝竷鏃堕棿">{{ currentRegulationDetail.createTime }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戝竷鏃堕棿">{{ formatDate(currentRegulationDetail.createTime) }}</el-descriptions-item>
</el-descriptions>
<div class="mt-20">
<h4>鍒跺害鍐呭</h4>
@@ -235,6 +235,10 @@
addRuleFile,
} from "@/api/collaborativeApproval/rulesRegulationsManagementFile.js";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
+ import { parseDate } from "@/utils/ruoyi";
+
+ // 鏃ユ湡鍥炴樉鏍煎紡鍖栵紙YYYY-MM-DD锛�
+ const formatDate = value => parseDate(value) || "-";
// 鍝嶅簲寮忔暟鎹�
const operationType = ref("add");
@@ -309,7 +313,7 @@
},
{ label: "鐗堟湰", prop: "version", width: 120 },
{ label: "鍙戝竷浜�", prop: "createUserName", width: 120 },
- { label: "鍙戝竷鏃堕棿", prop: "createTime", width: 180 },
+ { label: "鍙戝竷鏃堕棿", prop: "createTime", width: 180,dataType: "date" },
{
label: "鐘舵��",
prop: "status",
diff --git a/src/views/collaborativeApproval/sealManagement/index.vue b/src/views/collaborativeApproval/sealManagement/index.vue
index a06f6d5..5ebe27c 100644
--- a/src/views/collaborativeApproval/sealManagement/index.vue
+++ b/src/views/collaborativeApproval/sealManagement/index.vue
@@ -118,7 +118,7 @@
<el-descriptions-item label="鐢宠浜�">{{ currentSealDetail.createUserName }}</el-descriptions-item>
<el-descriptions-item label="鎵�灞為儴闂�">{{ currentSealDetail.department }}</el-descriptions-item>
<el-descriptions-item label="鐢ㄥ嵃绫诲瀷">{{ getSealTypeText(currentSealDetail.sealType) }}</el-descriptions-item>
- <el-descriptions-item label="鐢宠鏃堕棿">{{ currentSealDetail.createTime }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠鏃堕棿">{{ formatDate(currentSealDetail.createTime) }}</el-descriptions-item>
<el-descriptions-item label="鐘舵��">
<el-tag :type="getStatusType(currentSealDetail.status)">
{{ getStatusText(currentSealDetail.status) }}
@@ -163,6 +163,10 @@
import AttachmentUploadFile from '@/components/AttachmentUpload/file/index.vue'
import FilePreview from '@/components/filePreview/index.vue'
import download from '@/plugins/download.js'
+import { parseDate } from '@/utils/ruoyi'
+
+// 鏃ユ湡鍥炴樉鏍煎紡鍖栵紙YYYY-MM-DD锛�
+const formatDate = value => parseDate(value) || '-'
// 鍝嶅簲寮忔暟鎹�
// 鐢ㄥ嵃鐢宠鐩稿叧
@@ -252,7 +256,7 @@
formatData: (v) => getSealTypeText(v),
formatType: () => 'info'
},
- { label: '鐢宠鏃堕棿', prop: 'createTime', width: 180 },
+ { label: '鐢宠鏃堕棿', prop: 'createTime', width: 180,dataType: "date" },
{
label: '鐘舵��',
prop: 'status',
diff --git a/src/views/equipmentManagement/inspectionManagement/index.vue b/src/views/equipmentManagement/inspectionManagement/index.vue
index da8ac99..e254d0d 100644
--- a/src/views/equipmentManagement/inspectionManagement/index.vue
+++ b/src/views/equipmentManagement/inspectionManagement/index.vue
@@ -224,7 +224,7 @@
{ prop: "registrant", label: "鐧昏浜�", minWidth: 120 },
{
prop: "createTime", label: "鐧昏鏃ユ湡", minWidth: 180,
- formatData: cell => { if (!cell) return "-"; try { return dayjs(cell).format("YYYY-MM-DD HH:mm:ss"); } catch { return cell; } },
+ formatData: cell => { if (!cell) return "-"; try { return dayjs(cell).format("YYYY-MM-DD"); } catch { return cell; } },
},
{ prop: "abnormalDescription", label: "寮傚父鎻忚堪", minWidth: 150 },
]);
diff --git a/src/views/equipmentManagement/ledger/index.vue b/src/views/equipmentManagement/ledger/index.vue
index af10532..0288c3f 100644
--- a/src/views/equipmentManagement/ledger/index.vue
+++ b/src/views/equipmentManagement/ledger/index.vue
@@ -127,7 +127,7 @@
<el-descriptions-item label="鍚◣鎬讳环">{{ detailData.taxIncludingPriceTotal }}</el-descriptions-item>
<el-descriptions-item label="绋庣巼(%)">{{ detailData.taxRate }}</el-descriptions-item>
<el-descriptions-item label="涓嶅惈绋庢�讳环">{{ detailData.unTaxIncludingPriceTotal }}</el-descriptions-item>
- <el-descriptions-item label="褰曞叆鏃ユ湡">{{ detailData.createTime }}</el-descriptions-item>
+ <el-descriptions-item label="褰曞叆鏃ユ湡">{{ detailData.createTime ? dayjs(detailData.createTime).format('YYYY-MM-DD') : '' }}</el-descriptions-item>
<el-descriptions-item label="棰勮杩愯鏃堕棿">{{ detailData.planRuntimeTime ? dayjs(detailData.planRuntimeTime).format('YYYY-MM-DD') : '' }}</el-descriptions-item>
<el-descriptions-item label="璁惧鍥剧墖" :span="2">
<div v-if="detailData.storageBlobVOs && detailData.storageBlobVOs.length > 0" style="display: flex; gap: 10px; flex-wrap: wrap;">
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/repair/Modal/RepairModal.vue b/src/views/equipmentManagement/repair/Modal/RepairModal.vue
index 4a10071..7390832 100644
--- a/src/views/equipmentManagement/repair/Modal/RepairModal.vue
+++ b/src/views/equipmentManagement/repair/Modal/RepairModal.vue
@@ -90,8 +90,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="楠屾敹鏃堕棿">
- <el-input v-model="form.acceptanceTime"
- disabled />
+ <el-date-picker
+ v-model="form.acceptanceTime"
+ type="date"
+ value-format="YYYY-MM-DD"
+ :disabled="true"
+ ></el-date-picker>
+
</el-form-item>
</el-col>
<el-col :span="24">
@@ -199,7 +204,9 @@
form.storageBlobDTOs = data.storageBlobVOs || [];
form.maintenanceName = data.maintenanceName;
form.acceptanceName = data.acceptanceName;
- form.acceptanceTime = data.acceptanceTime;
+ form.acceptanceTime = data.acceptanceTime
+ ? dayjs(data.acceptanceTime).format("YYYY-MM-DD")
+ : undefined;
form.acceptanceRemark = data.acceptanceRemark;
};
diff --git a/src/views/equipmentManagement/spareParts/index.vue b/src/views/equipmentManagement/spareParts/index.vue
index 131e1d5..b663187 100644
--- a/src/views/equipmentManagement/spareParts/index.vue
+++ b/src/views/equipmentManagement/spareParts/index.vue
@@ -243,7 +243,7 @@
{ label: "澶囦欢鍚嶇О", prop: "sparePartsName" },
{ label: "棰嗙敤鏁伴噺", prop: "quantity" },
{ label: "鎿嶄綔浜�", prop: "operator" },
- { label: "鏃堕棿", prop: "createTime" },
+ { label: "鏃堕棿", prop: "createTime",dataType:"date" },
]);
const handleTabChange = async (name) => {
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 43474d7..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">
@@ -422,7 +422,7 @@
label: "鐧昏鏃ユ湡",
minWidth: 100,
formatData: cell =>
- cell ? dayjs(cell).format("YYYY-MM-DD HH:mm:ss") : "-",
+ cell ? dayjs(cell).format("YYYY-MM-DD") : "-",
},
{
fixed: "right",
@@ -482,7 +482,7 @@
align: "center",
prop: "maintenanceActuallyTime",
formatData: cell =>
- cell ? dayjs(cell).format("YYYY-MM-DD HH:mm:ss") : "-",
+ cell ? dayjs(cell).format("YYYY-MM-DD") : "-",
},
{
label: "淇濆吇缁撴灉",
diff --git a/src/views/financialManagement/payable/purchaseReturn.vue b/src/views/financialManagement/payable/purchaseReturn.vue
index 4171df2..8d42a2e 100644
--- a/src/views/financialManagement/payable/purchaseReturn.vue
+++ b/src/views/financialManagement/payable/purchaseReturn.vue
@@ -85,7 +85,7 @@
{ label: "閫�璐у崟鍙�", prop: "returnNo", minWidth: "150" },
{ label: "渚涘簲鍟�", prop: "supplierName", minWidth: "180" },
{ label: "鍏宠仈鍏ュ簱鍗曞彿", prop: "inboundBatches", minWidth: "150" },
- { label: "閫�璐ф棩鏈�", prop: "preparedAt", minWidth: "170" },
+ { label: "閫�璐ф棩鏈�", prop: "preparedAt", minWidth: "170",dataType: "date"},
{
label: "閫�娆炬�婚",
prop: "totalAmount",
diff --git a/src/views/financialManagement/receivable/salesReturn.vue b/src/views/financialManagement/receivable/salesReturn.vue
index afe363c..d6af451 100644
--- a/src/views/financialManagement/receivable/salesReturn.vue
+++ b/src/views/financialManagement/receivable/salesReturn.vue
@@ -77,7 +77,7 @@
{ label: "閫�璐у崟鍙�", prop: "returnNo", minWidth: "150" },
{ label: "瀹㈡埛鍚嶇О", prop: "customerName", minWidth: "180" },
{ label: "鍏宠仈鍙戣揣鍗曞彿", prop: "shippingNo", minWidth: "150" },
- { label: "閫�璐ф棩鏈�", prop: "makeTime", minWidth: "170" },
+ { label: "閫�璐ф棩鏈�", prop: "makeTime", minWidth: "170",dataType: "date" },
{
label: "閫�娆炬�婚",
prop: "refundAmount",
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 5a056d6..fe05536 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -108,7 +108,11 @@
show-overflow-tooltip />
<el-table-column label="鍑哄簱鏃ユ湡"
prop="createTime"
- show-overflow-tooltip />
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.createTime ? scope.row.createTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column label="浜у搧澶х被"
prop="productName"
show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 0a01def..07a3029 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -107,9 +107,11 @@
prop="inboundBatches"
width="200"
show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鏃堕棿"
- prop="createTime"
- show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鏃堕棿" show-overflow-tooltip>
+ <template #default="scope">
+ {{ scope.row.createTime ? scope.row.createTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column label="浜у搧澶х被"
prop="productName"
show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue b/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
index a835ef4..7d66307 100644
--- a/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
+++ b/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
@@ -50,11 +50,13 @@
show-overflow-tooltip
/>
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
- <el-table-column
- label="鏈�杩戞洿鏂版椂闂�"
- prop="updateTime"
- show-overflow-tooltip
- />
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�"
+ prop="updateTime"
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" min-width="180" align="center">
<template #default="scope">
<el-button
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 4286772..a1f96f4 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -31,7 +31,13 @@
<el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
<el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
- <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�"
+ prop="updateTime"
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" min-width="90" align="center">
<template #default="scope">
<el-button link type="primary" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
diff --git a/src/views/inventoryManagement/stockManagement/Record.vue b/src/views/inventoryManagement/stockManagement/Record.vue
index 934ae06..8add895 100644
--- a/src/views/inventoryManagement/stockManagement/Record.vue
+++ b/src/views/inventoryManagement/stockManagement/Record.vue
@@ -99,15 +99,19 @@
<el-table-column label="涓嶅悎鏍煎喕缁撴暟閲�"
prop="unQualifiedLockedQuantity"
show-overflow-tooltip />
- <el-table-column label="搴撳瓨棰勮鏁伴噺"
+ <!-- <el-table-column label="搴撳瓨棰勮鏁伴噺"
prop="warnNum"
- show-overflow-tooltip />
+ show-overflow-tooltip /> -->
<el-table-column label="澶囨敞"
prop="remark"
show-overflow-tooltip />
<el-table-column label="鏈�杩戞洿鏂版椂闂�"
prop="updateTime"
- show-overflow-tooltip />
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column fixed="right"
label="鎿嶄綔"
min-width="80"
diff --git a/src/views/inventoryManagement/stockManagement/Unqualified.vue b/src/views/inventoryManagement/stockManagement/Unqualified.vue
index 55662be..6c36f26 100644
--- a/src/views/inventoryManagement/stockManagement/Unqualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Unqualified.vue
@@ -26,7 +26,13 @@
<el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
<el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
- <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�"
+ prop="updateTime"
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" min-width="90" align="center">
<template #default="scope">
<el-button link type="primary" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index 26bc8a0..615e943 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -152,7 +152,11 @@
prop="createTime"
width="200"
show-overflow-tooltip
- v-if="searchForm.reportType !== 'inout'" />
+ v-if="searchForm.reportType !== 'inout'" >
+ <template #default="scope">
+ {{ getDate(scope.row.createTime) }}
+ </template>
+ </el-table-column>
<el-table-column label="鍏ュ簱鎵规"
prop="inboundBatches"
width="180"
@@ -216,6 +220,7 @@
import { ref, reactive, onMounted, nextTick, getCurrentInstance } from "vue";
import { ElMessage } from "element-plus";
import * as echarts from "echarts";
+ import dayjs from "dayjs";
import pagination from "@/components/PIMTable/Pagination.vue";
import {
getStockInventoryInAndOutReportList,
@@ -261,6 +266,14 @@
);
};
+ const getDate = val =>{
+ console.log(val)
+ if(!val){
+ return "--"
+ }
+ return dayjs(val).isValid() ? dayjs(val).format('YYYY鈥慚M鈥慏D') : '--'
+ }
+
// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
const fetchStockRecordTypeOptions = () => {
findAllQualifiedStockInRecordTypeOptions().then(res => {
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
index 58b612b..d057f16 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
@@ -50,7 +50,7 @@
<el-descriptions-item label="鍙戣揣璁㈠崟鍙�">{{ detailData.shippingInfo.shippingNo || "--" }}</el-descriptions-item>
<el-descriptions-item label="瀹㈡埛鍚嶇О">{{ detailData.shippingInfo.customerName || "--" }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣绫诲瀷">{{ detailData.shippingInfo.type || "--" }}</el-descriptions-item>
- <el-descriptions-item label="鍙戣揣鏃ユ湡">{{ detailData.shippingInfo.shippingDateDate || "--" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣揣鏃ユ湡">{{ detailData.shippingInfo.shippingDate || "--" }}</el-descriptions-item>
<el-descriptions-item label="瀹℃牳鐘舵��">{{ detailData.shippingInfo.status || "--" }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ detailData.shippingInfo.shippingCarNumber || "--" }}</el-descriptions-item>
<el-descriptions-item label="蹇�掑叕鍙�">{{ detailData.shippingInfo.expressCompany || "--" }}</el-descriptions-item>
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js b/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
index 727f896..285309f 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
@@ -159,16 +159,18 @@
if (val == null || val === "") return "";
if (Array.isArray(val) && val.length >= 3) {
const [y, m, d, h = 0, min = 0, s = 0] = val;
- return dayjs(new Date(y, m - 1, d, h, min, s)).format("YYYY-MM-DD HH:mm:ss");
+ // return dayjs(new Date(y, m - 1, d, h, min, s)).format("YYYY-MM-DD HH:mm:ss");
+ return dayjs(new Date(y, m - 1, d, h, min, s)).format("YYYY-MM-DD");
+
}
if (typeof val === "number") {
const d = val > 1e12 ? dayjs(val) : dayjs.unix(val);
- return d.isValid() ? d.format("YYYY-MM-DD HH:mm:ss") : "";
+ return d.isValid() ? d.format("YYYY-MM-DD") : "";
}
const s = String(val).trim();
if (!s) return "";
const parsed = dayjs(s.includes("T") ? s : s.replace(/-/g, "/"));
- return parsed.isValid() ? parsed.format("YYYY-MM-DD HH:mm:ss") : s;
+ return parsed.isValid() ? parsed.format("YYYY-MM-DD") : s;
}
export function formatDisplayTime(val) {
diff --git a/src/views/personnelManagement/employeeRecord/components/JobInfoSection.vue b/src/views/personnelManagement/employeeRecord/components/JobInfoSection.vue
index be33436..b07c258 100644
--- a/src/views/personnelManagement/employeeRecord/components/JobInfoSection.vue
+++ b/src/views/personnelManagement/employeeRecord/components/JobInfoSection.vue
@@ -10,7 +10,7 @@
<!-- 绗竴琛岋細鍚堝悓寮�濮� / 鍚堝悓缁撴潫 / 璇曠敤鏈� / 杞 -->
<el-row :gutter="24">
<el-col :span="6">
- <el-form-item label="鍏ヨ亴鏃ユ湡" prop="contractStartTime">
+ <el-form-item label="鍚堝悓寮�濮嬫棩鏈�" prop="contractStartTime">
<el-date-picker
v-model="form.contractStartTime"
type="date"
diff --git a/src/views/personnelManagement/employeeRecord/index.vue b/src/views/personnelManagement/employeeRecord/index.vue
index b5a7af7..5372de0 100644
--- a/src/views/personnelManagement/employeeRecord/index.vue
+++ b/src/views/personnelManagement/employeeRecord/index.vue
@@ -176,17 +176,17 @@
width: 120,
},
{
- label: "鍏ヨ亴鏃ユ湡",
+ label: "鍚堝悓寮�濮嬫棩鏈�",
prop: "contractStartTime",
width: 120,
},
- {
- label: "杞鏃ユ湡",
- prop: "positiveDate",
- width: 120,
- dataType: "slot",
- slot: "positiveDate",
- },
+ // {
+ // label: "杞鏃ユ湡",
+ // prop: "positiveDate",
+ // width: 120,
+ // dataType: "slot",
+ // slot: "positiveDate",
+ // },
{
label: "骞撮緞",
prop: "age",
diff --git a/src/views/personnelManagement/socialSecuritySet/index.vue b/src/views/personnelManagement/socialSecuritySet/index.vue
index 1f3f104..8329b9c 100644
--- a/src/views/personnelManagement/socialSecuritySet/index.vue
+++ b/src/views/personnelManagement/socialSecuritySet/index.vue
@@ -65,7 +65,7 @@
{ label: "淇濋櫓绫诲瀷", prop: "insuranceTypes", width: 120 },
{ label: "浣跨敤鑼冨洿", prop: "deptNames", width: 120 },
{ label: "澶囨敞", prop: "remark", minWidth: 120 },
- { label: "鍒涘缓鏃堕棿", prop: "createTime", width: 160 },
+ { label: "鍒涘缓鏃堕棿", prop: "createTime", width: 160,dataType: "date" },
{ label: "鍒涘缓浜�", prop: "createUserName", width: 100 },
{
dataType: "action",
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 2d42b57..bbe8ef3 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -147,10 +147,10 @@
prop="purchaseContractNumber"
width="160"
show-overflow-tooltip />
- <el-table-column label="閿�鍞悎鍚屽彿"
- prop="salesContractNo"
- width="160"
- show-overflow-tooltip />
+<!-- <el-table-column label="閿�鍞悎鍚屽彿"-->
+<!-- prop="salesContractNo"-->
+<!-- width="160"-->
+<!-- show-overflow-tooltip />-->
<el-table-column label="渚涘簲鍟嗗悕绉�"
prop="supplierName"
width="160"
@@ -938,16 +938,7 @@
},
});
const { form, rules } = toRefs(data);
- const { form: searchForm } = useFormData({
- ...data.searchForm,
- // 璁剧疆褰曞叆鏃ユ湡鑼冨洿涓哄綋澶�
- entryDate: [
- dayjs().startOf("day").format("YYYY-MM-DD"),
- dayjs().endOf("day").format("YYYY-MM-DD"),
- ],
- entryDateStart: dayjs().startOf("day").format("YYYY-MM-DD"),
- entryDateEnd: dayjs().endOf("day").format("YYYY-MM-DD"),
- });
+ const { form: searchForm } = useFormData(data.searchForm);
// 浜у搧琛ㄥ崟寮规鏁版嵁
const productFormVisible = ref(false);
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 fa4e163..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",
@@ -236,6 +236,7 @@
label: "鍒涘缓鏃堕棿",
prop: "createTime",
width: 120,
+ dataType: "date"
},
{
dataType: "action",
diff --git a/src/views/productionManagement/productionTraceability/index.vue b/src/views/productionManagement/productionTraceability/index.vue
index 53ff013..39db220 100644
--- a/src/views/productionManagement/productionTraceability/index.vue
+++ b/src/views/productionManagement/productionTraceability/index.vue
@@ -56,7 +56,7 @@
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="瀹㈡埛鍚嶇О">{{ rowData.productionOrderDto?.customerName || '-' }}</el-descriptions-item>
- <el-descriptions-item label="寮�濮嬫棩鏈�">{{ parseTime(rowData.productionOrderDto?.startTime) || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="寮�濮嬫棩鏈�">{{ parseDate(rowData.productionOrderDto?.startTime) || '-' }}</el-descriptions-item>
<el-descriptions-item label="瀹屾垚杩涘害">
<el-progress :percentage="rowData.productionOrderDto?.completionStatus>=100?100:rowData.productionOrderDto?.completionStatus"
:color="customColors(rowData.productionOrderDto?.completionStatus)"
@@ -144,8 +144,8 @@
<el-descriptions-item label="鐢熶骇宸ュ崟鍙�">{{ detailData.workOrder.workOrderNo || '-' }}</el-descriptions-item>
<el-descriptions-item label="璁″垝鏁伴噺">{{ detailData.workOrder.planQuantity || 0 }}</el-descriptions-item>
<el-descriptions-item label="瀹屾垚鏁伴噺">{{ detailData.workOrder.completeQuantity || 0 }}</el-descriptions-item>
- <el-descriptions-item label="瀹為檯寮�濮嬫椂闂�">{{ parseTime(detailData.workOrder.actualStartTime) || '-' }}</el-descriptions-item>
- <el-descriptions-item label="瀹為檯缁撴潫鏃堕棿">{{ parseTime(detailData.workOrder.actualEndTime) || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為檯寮�濮嬫椂闂�">{{ parseDate(detailData.workOrder.actualStartTime) || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為檯缁撴潫鏃堕棿">{{ parseDate(detailData.workOrder.actualEndTime) || '-' }}</el-descriptions-item>
<!-- <el-descriptions-item label="瀹屾垚杩涘害">
<el-progress :percentage="detailData.workOrder.completionStatus >= 100 ? 100 : (detailData.workOrder.completionStatus || 0)"
:color="customColors(detailData.workOrder.completionStatus)"
@@ -169,7 +169,7 @@
<el-table-column label="鍒涘缓鏃堕棿"
align="center">
<template #default="{ row }">
- {{ parseTime(row.createTime) }}
+ {{ parseDate(row.createTime) }}
</template>
</el-table-column>
<el-table-column label="宸ユ椂锛坔锛�"
@@ -242,10 +242,10 @@
:key="record.id"
class="quality-record-block">
<div class="detail-section">
- <h3 class="section-title">妫�娴嬭褰� {{ index + 1 }} - {{ parseTime(record.createTime) }}</h3>
+ <h3 class="section-title">妫�娴嬭褰� {{ index + 1 }} - {{ parseDate(record.createTime) }}</h3>
<el-descriptions :column="3"
border>
- <el-descriptions-item label="妫�娴嬫棩鏈�">{{ parseTime(record.createTime) || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="妫�娴嬫棩鏈�">{{ parseDate(record.createTime) || '-' }}</el-descriptions-item>
<el-descriptions-item label="鎶ュ伐鍗曞彿">{{ record.reportNo || '-' }}</el-descriptions-item>
<el-descriptions-item label="妫�楠屽憳">{{ record.userName || '-' }}</el-descriptions-item>
<el-descriptions-item label="浜у搧鍚嶇О">{{ record.productName || '-' }}</el-descriptions-item>
@@ -299,7 +299,7 @@
import { ref, reactive, onMounted, computed } from "vue";
import { useRoute, useRouter } from "vue-router";
import { ElMessage } from "element-plus";
- import { parseTime } from "@/utils/ruoyi";
+ import { parseDate } from "@/utils/ruoyi";
import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
import {
getOrderDetail,
diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index 6d2acd5..2998f3a 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -197,11 +197,6 @@
width: 120,
},
{
- label: "妫�娴嬪崟浣�",
- prop: "checkCompany",
- width: 120,
- },
- {
label: "妫�娴嬬粨鏋�",
prop: "checkResult",
dataType: "tag",
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/safeProduction/dangerInvestigation/index.vue b/src/views/safeProduction/dangerInvestigation/index.vue
index a278058..4caac4e 100644
--- a/src/views/safeProduction/dangerInvestigation/index.vue
+++ b/src/views/safeProduction/dangerInvestigation/index.vue
@@ -69,7 +69,11 @@
show-overflow-tooltip />
<el-table-column label="涓婃姤鏃堕棿"
prop="createTime"
- show-overflow-tooltip />
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.createTime ? scope.row.createTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column label="鏁存敼瀹屾垚鏈熼檺"
prop="rectifyTime"
width="120"
--
Gitblit v1.9.3