From d979f89c4b46729976aa44429922a910aeb5d8da Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 10 八月 2026 11:17:15 +0800
Subject: [PATCH] Merge branch 'dev_pro_山西_德益科技' of http://114.132.189.42:9002/r/product-inventory-management into dev_pro_山西_德益科技
---
src/views/salesManagement/deliveryLedger/index.vue | 8 +-
src/views/system/role/index.vue | 2
multiple/config.json | 4
src/views/system/dept/index.vue | 2
src/views/system/post/index.vue | 2
src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js | 3
src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js | 7 +
src/views/qualityManagement/rawMaterialInspection/index.vue | 5 -
src/views/qualityManagement/finalInspection/index.vue | 8 +-
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue | 4
src/views/officeProcessAutomation/ApproveManage/approve-template/useApproveTemplate.js | 7 -
src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js | 65 +++++++++++----
src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js | 8 ++
src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/useTravelReimburse.js | 7 +
src/views/procurementManagement/procurementLedger/index.vue | 54 ++++++------
src/views/system/menu/index.vue | 2
src/views/system/user/index.vue | 2
src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/useCostReimburse.js | 5
src/views/system/dict/data.vue | 2
src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/components/DetailPanel.vue | 9 +
src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/components/DetailPanel.vue | 11 ++
src/views/officeProcessAutomation/ApproveManage/approve-template/index.vue | 2
22 files changed, 130 insertions(+), 89 deletions(-)
diff --git a/multiple/config.json b/multiple/config.json
index f5037f2..5de33a0 100644
--- a/multiple/config.json
+++ b/multiple/config.json
@@ -18,8 +18,8 @@
"BTYX": {
"env": {
"VITE_APP_TITLE": "灞辫タ寰风泭绉戞妧鏈夐檺鍏徃",
- "VITE_BASE_API": "http://36.137.12.37:9000",
- "VITE_JAVA_API": "http://36.137.12.372:9001"
+ "VITE_BASE_API": "http://36.213.180.217:9035",
+ "VITE_JAVA_API": "http://36.213.180.217:9036"
},
"logo": "logo/DYKJLogo.png",
"favicon": "favicon/DYKJfavicon.ico"
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
index 721a5c2..395b94d 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
@@ -29,7 +29,7 @@
</el-descriptions-item>
<el-descriptions-item label="鍒涘缓鏃堕棿"
:span="2">
- {{ formatDisplayTime(row.createTime) }}
+ {{ formatDisplayDate(row.createTime) }}
</el-descriptions-item>
</el-descriptions>
</div>
@@ -74,7 +74,7 @@
<script setup>
import { computed } from "vue";
import { Paperclip } from "@element-plus/icons-vue";
- import { formatDisplayTime } from "../../approve-template/approveTemplateConstants.js";
+ import { formatDisplayDate } from "../../approve-template/approveTemplateConstants.js";
import {
approvalTypeLabel,
approvalTypeStyle,
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
index 67b9213..9264253 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
@@ -22,7 +22,7 @@
} from "../../ReimburseManage/shared/reimburseApproveBridge.js";
import {
fetchBusinessTypeOptions,
- formatDisplayTime,
+ formatDisplayDate,
mapEnabledFromApi,
unwrapTemplateList,
} from "../approve-template/approveTemplateConstants.js";
@@ -60,7 +60,8 @@
const submitTemplatesLoading = ref(false);
const submitTemplateCards = computed(() => {
- if (selectedBusinessType.value == null || selectedBusinessType.value === "") return [];
+ if (selectedBusinessType.value == null || selectedBusinessType.value === "")
+ return [];
return allSubmitTemplates.value.filter((card) =>
matchBusinessTypeValue(card.businessType, selectedBusinessType.value)
);
@@ -101,23 +102,36 @@
const isSubmitEdit = computed(() => submitDialog.mode === "edit");
const submitDialogTitle = computed(() => {
if (submitDialog.mode === "edit") {
- return `淇敼${activeTemplate.value?.label || submitForm.templateName || "瀹℃壒"}`;
+ return `淇敼${
+ activeTemplate.value?.label || submitForm.templateName || "瀹℃壒"
+ }`;
}
if (submitDialog.step === 1) return "閫夋嫨妯℃澘绫诲瀷";
- if (submitDialog.step === 2) return `閫夋嫨瀹℃壒妯℃澘${businessTypeLabel(selectedBusinessType.value) ? `锛�${businessTypeLabel(selectedBusinessType.value)}锛塦 : ""}`;
+ if (submitDialog.step === 2)
+ return `閫夋嫨瀹℃壒妯℃澘${
+ businessTypeLabel(selectedBusinessType.value)
+ ? `锛�${businessTypeLabel(selectedBusinessType.value)}锛塦
+ : ""
+ }`;
return `鎻愪氦${activeTemplate.value?.label || "瀹℃壒"}`;
});
- const selectedBusinessTypeLabel = computed(() => businessTypeLabel(selectedBusinessType.value));
+ const selectedBusinessTypeLabel = computed(() =>
+ businessTypeLabel(selectedBusinessType.value)
+ );
function businessTypeLabel(type) {
if (type == null || type === "") return "";
- const hit = submitBusinessTypeOptions.value.find((x) => matchBusinessTypeValue(x.value, type));
+ const hit = submitBusinessTypeOptions.value.find((x) =>
+ matchBusinessTypeValue(x.value, type)
+ );
return hit?.label || "";
}
function countTemplatesByBusinessType(type) {
- return allSubmitTemplates.value.filter((card) => matchBusinessTypeValue(card.businessType, type)).length;
+ return allSubmitTemplates.value.filter((card) =>
+ matchBusinessTypeValue(card.businessType, type)
+ ).length;
}
const activeTemplate = computed(() => submitForm.templateSnapshot || null);
@@ -130,7 +144,9 @@
});
const submitFormRules = computed(() => ({
- templateKey: [{ required: true, message: "璇烽�夋嫨瀹℃壒绫诲瀷", trigger: "change" }],
+ templateKey: [
+ { required: true, message: "璇烽�夋嫨瀹℃壒绫诲瀷", trigger: "change" },
+ ],
...buildFormPayloadRules(submitFormFields.value),
}));
@@ -164,7 +180,7 @@
label: "鍒涘缓鏃堕棿",
prop: "createTime",
width: 170,
- formatData: (v) => formatDisplayTime(v),
+ formatData: (v) => formatDisplayDate(v),
},
{
dataType: "action",
@@ -186,11 +202,11 @@
disabled: (row) => row.approvalStatus !== "pending" || !row.isApprove,
clickFun: (row) => openApprove(row),
},
- {
- name: "鍒犻櫎",
- type: "danger",
- clickFun: (row) => removeInstance(row),
- },
+ // {
+ // name: "鍒犻櫎",
+ // type: "danger",
+ // clickFun: (row) => removeInstance(row),
+ // },
],
},
]);
@@ -336,7 +352,9 @@
try {
await navigateToReimburseManageForEdit(proxy?.$router, moduleKey, rid);
} catch {
- ElMessage.warning("鏈壘鍒板樊鏃�/璐圭敤鎶ラ攢鑿滃崟璺敱锛岃浠庡乏渚ц彍鍗曡繘鍏ュ悗鍐嶇紪杈�");
+ ElMessage.warning(
+ "鏈壘鍒板樊鏃�/璐圭敤鎶ラ攢鑿滃崟璺敱锛岃浠庡乏渚ц彍鍗曡繘鍏ュ悗鍐嶇紪杈�"
+ );
}
return;
}
@@ -361,7 +379,9 @@
templateKey: String(card.id),
...applied,
businessType:
- applied.businessType ?? card.businessType ?? selectedBusinessType.value,
+ applied.businessType ??
+ card.businessType ??
+ selectedBusinessType.value,
});
submitDialog.step = 3;
} catch {
@@ -402,7 +422,9 @@
return false;
}
if (!activeTemplate.value) return false;
- const bindingCheck = validateTemplateBinding({ flowNodes: submitForm.flowNodes });
+ const bindingCheck = validateTemplateBinding({
+ flowNodes: submitForm.flowNodes,
+ });
if (!bindingCheck.ok) {
ElMessage.warning(bindingCheck.message);
return false;
@@ -441,7 +463,9 @@
return false;
}
if (!activeTemplate.value) return false;
- const bindingCheck = validateTemplateBinding({ flowNodes: submitForm.flowNodes });
+ const bindingCheck = validateTemplateBinding({
+ flowNodes: submitForm.flowNodes,
+ });
if (!bindingCheck.ok) {
ElMessage.warning(bindingCheck.message);
return false;
@@ -463,7 +487,10 @@
);
submitDialog.visible = false;
await fetchApprovalList();
- if (detailDialog.visible && detailRow.value?.id === submitForm.instanceId) {
+ if (
+ detailDialog.visible &&
+ detailRow.value?.id === submitForm.instanceId
+ ) {
const hit = tableData.value.find((r) => r.id === submitForm.instanceId);
if (hit) detailRow.value = { ...hit };
else detailDialog.visible = false;
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js b/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
index d6bec18..0418258 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-shared/approvalInstanceFormConfigTable.js
@@ -1,5 +1,6 @@
import { computed } from "vue";
import { businessApprovalStatusLabel, businessApprovalStatusTagType, formatFieldDisplayValue, resolveInstanceFormFields } from "../approve-list/approveListConstants.js";
+import { formatDisplayDate } from "../approve-template/approveTemplateConstants.js";
import { INSTANCE_NO_SEARCH_MODULE_KEYS, INSTANCE_NO_TABLE_COLUMN } from "./approvalInstanceListSearch.js";
/** 鍒楄〃/璇︽儏涓嶅洖鏄句负鐙珛鍒楃殑濉姤椤� key锛堥伩鍏嶈鐩栧疄渚嬬郴缁熷瓧娈碉級 */
@@ -94,7 +95,7 @@
...formCols,
...extraColumns,
...afterFormColumns,
- { label: "鍒涘缓鏃堕棿", prop: "createTime", width: 170 },
+ { label: "鍒涘缓鏃堕棿", prop: "createTime", width: 120, formatData: v => formatDisplayDate(v) },
{
label: "瀹℃壒鐘舵��",
prop: "approvalStatus",
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js b/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
index 727f896..a79b502 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
@@ -176,6 +176,14 @@
return t || "鈥�";
}
+/** 浠呭睍绀烘棩鏈燂紙鎶规帀鏃跺垎绉掞級 */
+export function formatDisplayDate(val) {
+ const t = normalizeTimeValue(val);
+ if (!t) return "鈥�";
+ const parsed = dayjs(t.replace(/-/g, "/"));
+ return parsed.isValid() ? parsed.format("YYYY-MM-DD") : t;
+}
+
/** 璇︽儏鎺ュ彛 data 瑙ｅ寘 */
export function unwrapTemplateDetail(res) {
const data = res?.data ?? res;
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-template/index.vue b/src/views/officeProcessAutomation/ApproveManage/approve-template/index.vue
index d094c13..69116d0 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-template/index.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-template/index.vue
@@ -272,8 +272,6 @@
<el-descriptions-item label="鍒涘缓鏃堕棿">{{ formatDisplayTime(detailRow.createdTime) }}</el-descriptions-item>
- <el-descriptions-item label="鏇存柊鏃堕棿">{{ formatDisplayTime(detailRow.updatedTime) }}</el-descriptions-item>
-
</el-descriptions>
<el-divider content-position="left">濉姤椤癸紙{{ detailFormConfig.fields?.length || 0 }} 椤癸級</el-divider>
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-template/useApproveTemplate.js b/src/views/officeProcessAutomation/ApproveManage/approve-template/useApproveTemplate.js
index 61aa6c0..a961845 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-template/useApproveTemplate.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-template/useApproveTemplate.js
@@ -126,13 +126,6 @@
formatData: (v) => formatDisplayTime(v),
},
{
- label: "鏇存柊鏃堕棿",
- prop: "updatedTime",
- width: 170,
- showOverflowTooltip: true,
- formatData: (v) => formatDisplayTime(v),
- },
- {
dataType: "action",
label: "鎿嶄綔",
align: "center",
diff --git a/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/components/DetailPanel.vue b/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/components/DetailPanel.vue
index 4db16a7..c971a1a 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/components/DetailPanel.vue
+++ b/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/components/DetailPanel.vue
@@ -6,7 +6,7 @@
<el-tag :type="statusTagType(row.approvalResult)" size="small">{{ statusLabel(row.approvalResult) }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="璐圭敤绫诲瀷">{{ expenseCategoryLabel(row.expenseCategory) }}</el-descriptions-item>
- <el-descriptions-item label="鐢宠鏃堕棿">{{ row.applyTime || row.createTime || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠鏃堕棿">{{ dateOnly(row.applyTime || row.createTime) }}</el-descriptions-item>
<el-descriptions-item label="鍛樺伐缂栧彿">{{ row.employeeNo || row.applicantNo || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鍛樺伐濮撳悕">{{ row.employeeName || row.applicantName || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鎶ラ攢鍘熷洜" :span="2">{{ row.reimburseReason || "鈥�" }}</el-descriptions-item>
@@ -17,7 +17,7 @@
<el-descriptions-item v-if="row.rejectReason" label="椹冲洖鍘熷洜" :span="2">
<span class="reject-text">{{ row.rejectReason }}</span>
</el-descriptions-item>
- <el-descriptions-item label="鍒涘缓鏃堕棿" :span="2">{{ row.createTime || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍒涘缓鏃堕棿" :span="2">{{ dateOnly(row.createTime) }}</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">鎶ラ攢鏄庣粏</el-divider>
@@ -43,12 +43,17 @@
<script setup>
import { computed } from "vue";
+import { formatReimbursementDate } from "../../shared/finReimbursementMappers.js";
import { expenseCategoryLabel, expenseSubjectLabel, statusLabel, statusTagType } from "../costReimburseUtils.js";
const props = defineProps({
row: { type: Object, default: () => ({}) },
});
+function dateOnly(val) {
+ return formatReimbursementDate(val) || "鈥�";
+}
+
const attachmentFiles = computed(() => {
const list =
props.row?.attachmentList ||
diff --git a/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/useCostReimburse.js b/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/useCostReimburse.js
index 3b90a3b..4aee781 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/useCostReimburse.js
+++ b/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/useCostReimburse.js
@@ -19,6 +19,7 @@
enrichReimbursementListRowsWithApprovalFlow,
filterRowsByReimbursementType,
FIN_REIMBURSEMENT_TYPE,
+ formatReimbursementDate,
mapCostReimbursementRow,
mapFinReimbursementDetailRow,
resolveReimbursementDeleteId,
@@ -153,8 +154,8 @@
{ label: "鐢宠浜�", prop: "applicantName", minWidth: 90 },
{ label: "鎶ラ攢閲戦(鍏�)", prop: "applyAmount", width: 110 },
{ label: "鎶ラ攢鍘熷洜", prop: "reimburseReason", minWidth: 160, showOverflowTooltip: true },
- { label: "鐢宠鏃堕棿", prop: "applyTime", width: 165 },
- { label: "鍒涘缓鏃堕棿", prop: "createTime", width: 165 },
+ { label: "鐢宠鏃堕棿", prop: "applyTime", width: 120, formatData: (v) => formatReimbursementDate(v) },
+ { label: "鍒涘缓鏃堕棿", prop: "createTime", width: 120, formatData: (v) => formatReimbursementDate(v) },
{
label: "鎶ラ攢鐘舵��",
prop: "approvalResult",
diff --git a/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js b/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js
index 2525f70..97801f2 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js
+++ b/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementMappers.js
@@ -302,6 +302,13 @@
return hasTime ? d.format("YYYY-MM-DD HH:mm:ss") : d.format("YYYY-MM-DD");
}
+/** 鍒楄〃/璇︽儏浠呭睍绀烘棩鏈燂紙鎶规帀鏃跺垎绉掞級 */
+export function formatReimbursementDate(val) {
+ if (val == null || val === "") return "";
+ const d = dayjs(val);
+ return d.isValid() ? d.format("YYYY-MM-DD") : String(val);
+}
+
/** 鎺ュ彛琛� 鈫� 宸梾鎶ラ攢鍒楄〃琛岋紙鍏煎 useTravelReimburse 瀛楁锛� */
export function mapTravelReimbursementRow(row) {
if (!row) return {};
diff --git a/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/components/DetailPanel.vue b/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/components/DetailPanel.vue
index 2c1d8a4..cf3ea55 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/components/DetailPanel.vue
+++ b/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/components/DetailPanel.vue
@@ -8,8 +8,8 @@
<el-descriptions-item label="鍛樺伐缂栧彿">{{ row.employeeNo || row.applicantNo || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鍛樺伐濮撳悕">{{ row.employeeName || row.applicantName || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鎶ラ攢鍘熷洜" :span="2">{{ row.reimburseReason || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鍑哄樊寮�濮�">{{ row.travelStartTime || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鍑哄樊缁撴潫">{{ row.travelEndTime || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍑哄樊寮�濮�">{{ dateOnly(row.travelStartTime) }}</el-descriptions-item>
+ <el-descriptions-item label="鍑哄樊缁撴潫">{{ dateOnly(row.travelEndTime) }}</el-descriptions-item>
<el-descriptions-item label="鍑哄樊鍦�">{{ row.departurePlace || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鐩殑鍦�">{{ row.destination || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="閰掑簵鏍囧噯">{{ row.hotelStandard != null ? `${row.hotelStandard} 鍏�/鏅歚 : "鈥�" }}</el-descriptions-item>
@@ -25,7 +25,7 @@
<el-descriptions-item v-if="row.rejectReason" label="椹冲洖鍘熷洜" :span="2">
<span class="reject-text">{{ row.rejectReason }}</span>
</el-descriptions-item>
- <el-descriptions-item label="鍒涘缓鏃堕棿" :span="2">{{ row.createTime || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍒涘缓鏃堕棿" :span="2">{{ dateOnly(row.createTime) }}</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">鎶ラ攢鏄庣粏</el-divider>
@@ -51,12 +51,17 @@
<script setup>
import { computed } from "vue";
+import { formatReimbursementDate } from "../../shared/finReimbursementMappers.js";
import { expenseSubjectLabel, statusLabel, statusTagType } from "../travelReimburseUtils.js";
const props = defineProps({
row: { type: Object, default: () => ({}) },
});
+function dateOnly(val) {
+ return formatReimbursementDate(val) || "鈥�";
+}
+
const attachmentFiles = computed(() => {
const list =
props.row?.attachmentList ||
diff --git a/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/useTravelReimburse.js b/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/useTravelReimburse.js
index c92d88c..3667840 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/useTravelReimburse.js
+++ b/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/useTravelReimburse.js
@@ -19,6 +19,7 @@
enrichReimbursementListRowsWithApprovalFlow,
filterRowsByReimbursementType,
FIN_REIMBURSEMENT_TYPE,
+ formatReimbursementDate,
mapFinReimbursementDetailRow,
mapTravelReimbursementRow,
resolveReimbursementDeleteId,
@@ -176,9 +177,9 @@
{ label: "鎶ラ攢鍗曞彿", prop: "reimburseNo", width: 150 },
{ label: "鐢宠浜虹紪鍙�", prop: "applicantNo", width: 110 },
{ label: "鐢宠浜�", prop: "applicantName", minWidth: 90 },
- { label: "鍑哄樊寮�濮�", prop: "travelStartTime", width: 165 },
- { label: "鍑哄樊缁撴潫", prop: "travelEndTime", width: 165 },
- { label: "鍒涘缓鏃堕棿", prop: "createTime", width: 165 },
+ { label: "鍑哄樊寮�濮�", prop: "travelStartTime", width: 120, formatData: (v) => formatReimbursementDate(v) },
+ { label: "鍑哄樊缁撴潫", prop: "travelEndTime", width: 120, formatData: (v) => formatReimbursementDate(v) },
+ { label: "鍒涘缓鏃堕棿", prop: "createTime", width: 120, formatData: (v) => formatReimbursementDate(v) },
{
label: "鐘舵��",
prop: "approvalResult",
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index cbd6e23..1c02aba 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -19,13 +19,13 @@
clearable
:prefix-icon="Search" />
</el-form-item>
- <el-form-item label="閿�鍞悎鍚屽彿锛�">
- <el-input v-model="searchForm.salesContractNo"
- placeholder="璇疯緭鍏�"
- clearable
- prefix-icon="Search"
- @change="handleQuery" />
- </el-form-item>
+<!-- <el-form-item label="閿�鍞悎鍚屽彿锛�">-->
+<!-- <el-input v-model="searchForm.salesContractNo"-->
+<!-- placeholder="璇疯緭鍏�"-->
+<!-- clearable-->
+<!-- prefix-icon="Search"-->
+<!-- @change="handleQuery" />-->
+<!-- </el-form-item>-->
<el-form-item label="椤圭洰鍚嶇О锛�">
<el-input v-model="searchForm.projectName"
placeholder="璇疯緭鍏�"
@@ -144,17 +144,17 @@
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"
show-overflow-tooltip />
<el-table-column label="椤圭洰鍚嶇О"
prop="projectName"
- width="320"
+ width="100"
show-overflow-tooltip />
<el-table-column label="瀹℃壒鐘舵��"
prop="approvalStatus"
@@ -247,21 +247,21 @@
clearable />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="閿�鍞悎鍚屽彿锛�"
- prop="salesLedgerId">
- <el-select v-model="form.salesLedgerId"
- placeholder="璇烽�夋嫨"
- filterable
- clearable
- @change="salesLedgerChange">
- <el-option v-for="item in salesContractList"
- :key="item.id"
- :label="item.salesContractNo"
- :value="item.id" />
- </el-select>
- </el-form-item>
- </el-col>
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="閿�鍞悎鍚屽彿锛�"-->
+<!-- prop="salesLedgerId">-->
+<!-- <el-select v-model="form.salesLedgerId"-->
+<!-- placeholder="璇烽�夋嫨"-->
+<!-- filterable-->
+<!-- clearable-->
+<!-- @change="salesLedgerChange">-->
+<!-- <el-option v-for="item in salesContractList"-->
+<!-- :key="item.id"-->
+<!-- :label="item.salesContractNo"-->
+<!-- :value="item.id" />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
</el-row>
<el-row :gutter="30">
<el-col :span="12">
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index 4a59fa4..d16d8dd 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -26,7 +26,7 @@
@change="changeDaterange" />
</el-form-item>
</el-col>
- <el-col :span="4">
+<!-- <el-col :span="4">
<el-form-item label="閿�鍞崟鍙�"
prop="salesContractNo">
<el-input v-model="searchForm.salesContractNo"
@@ -43,7 +43,7 @@
placeholder="璇疯緭鍏ョ敓浜у伐鍗曞彿鎼滅储"
clearable />
</el-form-item>
- </el-col>
+ </el-col>-->
<!-- 鎸夐挳 -->
<el-col :span="4">
<el-form-item>
@@ -158,7 +158,7 @@
prop: "checkTime",
width: 120,
},
- {
+ /*{
label: "閿�鍞崟鍙�",
prop: "salesContractNo",
width: 120,
@@ -167,7 +167,7 @@
label: "鐢熶骇宸ュ崟鍙�",
prop: "workOrderNo",
width: 120,
- },
+ },*/
{
label: "妫�楠屽憳",
prop: "checkName",
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/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index c8890cc..57d4375 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -22,7 +22,7 @@
@change="handleQuery"
/>
</el-form-item>
- <el-form-item label="蹇�掑崟鍙凤細">
+<!-- <el-form-item label="蹇�掑崟鍙凤細">
<el-input
v-model="searchForm.expressNumber"
placeholder="璇疯緭鍏�"
@@ -31,7 +31,7 @@
style="width: 200px"
@change="handleQuery"
/>
- </el-form-item>
+ </el-form-item>-->
<el-form-item>
<el-button type="primary" @click="handleQuery"> 鎼滅储</el-button>
</el-form-item>
@@ -96,7 +96,7 @@
prop="shippingCarNumber"
show-overflow-tooltip
/>
- <el-table-column
+<!-- <el-table-column
label="蹇�掑叕鍙�"
prop="expressCompany"
show-overflow-tooltip
@@ -105,7 +105,7 @@
label="蹇�掑崟鍙�"
prop="expressNumber"
show-overflow-tooltip
- />
+ />-->
<el-table-column
label="瀹℃牳鐘舵��"
prop="status"
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/menu/index.vue b/src/views/system/menu/index.vue
index 3bea122..7e12b74 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -71,7 +71,7 @@
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" width="160" prop="createTime">
<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="210" 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..495141c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -110,7 +110,7 @@
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
<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/user/index.vue b/src/views/system/user/index.vue
index f3059f8..95f721e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -76,7 +76,7 @@
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" v-if="columns[6].visible" width="160">
<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="150" class-name="small-padding fixed-width">
--
Gitblit v1.9.3