From 492802e4fc1b371ba21a2a490c8dcd67d7c8b29c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 22 六月 2026 14:03:40 +0800
Subject: [PATCH] fix: 出差和请假审批新增开始与结束日期
---
src/views/procurementManagement/procurementLedger/index.vue | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 9a76e2a..acb25de 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -84,7 +84,7 @@
show-summary
:summary-method="summarizeMainTable"
@expand-change="expandChange"
- height="calc(100vh - 21.5em)">
+ height="calc(100vh - 25em)">
<el-table-column align="center"
type="selection"
width="55" />
@@ -108,8 +108,8 @@
prop="quantity" />
<el-table-column label="鍙敤鏁伴噺"
prop="availableQuality" />
- <el-table-column label="閫�璐ф暟閲�"
- prop="returnQuality" />
+ <!-- <el-table-column label="閫�璐ф暟閲�"
+ prop="returnQuality" /> -->
<el-table-column label="鍏ュ簱鐘舵��"
width="100px"
align="center">
@@ -117,6 +117,16 @@
<el-tag :type="getProductStockStatusType(scope.row.productStockStatus)"
size="small">
{{ stockStatusText[scope.row.productStockStatus] || '鏈叆搴�' }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁璐ㄦ"
+ width="100px"
+ align="center">
+ <template #default="scope">
+ <el-tag :type="getCheckedType(scope.row.isChecked)"
+ size="small">
+ {{ scope.row.isChecked ? '鏄�' : '鍚�' }}
</el-tag>
</template>
</el-table-column>
@@ -868,6 +878,14 @@
};
return typeMap[status] || "info";
};
+ // 鑾峰彇鏄惁璐ㄦ鏍囩绫诲瀷
+ const getCheckedType = status => {
+ const typeMap = {
+ 0: "info",
+ 1: "success",
+ };
+ return typeMap[status] || "info";
+ };
const templateName = ref("");
const filterInputValue = ref("");
@@ -1016,13 +1034,6 @@
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"),
});
// 浜у搧琛ㄥ崟寮规鏁版嵁
@@ -2015,7 +2026,8 @@
canvas.width - horizontalPad * 2
);
const textBlockHeight = lines.length * lineHeight;
- canvas.height = padTop + QR_SIZE + gapAfterQr + textBlockHeight + bottomPad;
+ canvas.height =
+ padTop + QR_SIZE + gapAfterQr + textBlockHeight + bottomPad;
ctx.fillStyle = "#ffffff";
ctx.fillRect(0, 0, canvas.width, canvas.height);
--
Gitblit v1.9.3