From 6ee3cbbce22f91fa93490a955712ccb5287326b3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 16:54:33 +0800
Subject: [PATCH] Merge branch 'dev_新疆_大罗素马铃薯new' of http://114.132.189.42:9002/r/product-inventory-management into dev_新疆_大罗素马铃薯new
---
src/views/salesManagement/deliveryLedger/index.vue | 5 +
src/views/collaborativeApproval/rulesRegulationsManagement/index.vue | 15 ----
src/views/equipmentManagement/inspectionManagement/index.vue | 1
src/views/equipmentManagement/inspectionManagement/components/viewFiles.vue | 128 ++++++++++--------------------------------
4 files changed, 38 insertions(+), 111 deletions(-)
diff --git a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
index 5ad910a..d6fba59 100644
--- a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
+++ b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
@@ -108,16 +108,7 @@
placeholder="閫夋嫨鐢熸晥鏃堕棿"
style="width: 100%" />
</el-form-item>
- <el-form-item label="閫傜敤鑼冨洿"
- prop="scope">
- <el-checkbox-group v-model="regulationForm.scope">
- <el-checkbox label="all">鍏ㄤ綋鍛樺伐</el-checkbox>
- <el-checkbox label="manager">绠＄悊灞�</el-checkbox>
- <el-checkbox label="hr">浜轰簨閮ㄩ棬</el-checkbox>
- <el-checkbox label="finance">璐㈠姟閮ㄩ棬</el-checkbox>
- <el-checkbox label="tech">鎶�鏈儴闂�</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
+
<el-form-item label="鏄惁闇�瑕佺‘璁�"
prop="requireConfirm">
<el-switch v-model="regulationForm.requireConfirm" />
@@ -275,7 +266,6 @@
status: "active",
readCount: 0,
effectiveTime: "",
- scope: [],
requireConfirm: false,
storageBlobDTOs: []
});
@@ -297,7 +287,7 @@
effectiveTime: [
{ required: true, message: "璇烽�夋嫨鐢熸晥鏃堕棿", trigger: "change" },
],
- scope: [{ required: true, message: "璇烽�夋嫨閫傜敤鑼冨洿", trigger: "change" }],
+
};
const regulationSearchForm = reactive({
@@ -453,7 +443,6 @@
status: "active",
readCount: 0,
effectiveTime: "",
- scope: [],
requireConfirm: false,
storageBlobDTOs: []
});
diff --git a/src/views/equipmentManagement/inspectionManagement/components/viewFiles.vue b/src/views/equipmentManagement/inspectionManagement/components/viewFiles.vue
index 154ae7d..444cdf4 100644
--- a/src/views/equipmentManagement/inspectionManagement/components/viewFiles.vue
+++ b/src/views/equipmentManagement/inspectionManagement/components/viewFiles.vue
@@ -3,77 +3,23 @@
<el-dialog title="鏌ョ湅闄勪欢"
v-model="dialogVisitable" width="800px" @close="cancel">
<div class="upload-container">
- <!-- 鐢熶骇鍓� -->
+ <!-- 鐢熶骇寮傚父 -->
<div class="form-container">
- <div class="title">鐢熶骇鍓�</div>
-
+ <div class="title">鐢熶骇寮傚父</div>
+
<!-- 鍥剧墖鍒楄〃 -->
<div style="display: flex; flex-wrap: wrap;">
- <img v-for="(item, index) in beforeProductionImgs" :key="index"
- @click="showMedia(beforeProductionImgs, index, 'image')"
+ <img v-for="(item, index) in productionAbnormalImgs" :key="index"
+ @click="showMedia(productionAbnormalImgs, index, 'image')"
:src="item" style="max-width: 100px; height: 100px; margin: 5px;" alt="">
</div>
-
+
<!-- 瑙嗛鍒楄〃 -->
<div style="display: flex; flex-wrap: wrap;">
<div
- v-for="(videoUrl, index) in beforeProductionVideos"
+ v-for="(videoUrl, index) in productionAbnormalVideos"
:key="index"
- @click="showMedia(beforeProductionVideos, index, 'video')"
- style="position: relative; margin: 10px; cursor: pointer;"
- >
- <div style="width: 160px; height: 90px; background-color: #333; display: flex; align-items: center; justify-content: center;">
- <img src="@/assets/images/video.png" alt="鎾斁" style="width: 30px; height: 30px; opacity: 0.8;" />
- </div>
- <div style="text-align: center; font-size: 12px; color: #666;">鐐瑰嚮鎾斁</div>
- </div>
- </div>
- </div>
-
- <!-- 鐢熶骇涓� -->
- <div class="form-container">
- <div class="title">鐢熶骇涓�</div>
-
- <!-- 鍥剧墖鍒楄〃 -->
- <div style="display: flex; flex-wrap: wrap;">
- <img v-for="(item, index) in productionIssuesImgs" :key="index"
- @click="showMedia(productionIssuesImgs, index, 'image')"
- :src="item" style="max-width: 100px; height: 100px; margin: 5px;" alt="">
- </div>
-
- <!-- 瑙嗛鍒楄〃 -->
- <div style="display: flex; flex-wrap: wrap;">
- <div
- v-for="(videoUrl, index) in productionIssuesVideos"
- :key="index"
- @click="showMedia(productionIssuesVideos, index, 'video')"
- style="position: relative; margin: 10px; cursor: pointer;"
- >
- <div style="width: 160px; height: 90px; background-color: #333; display: flex; align-items: center; justify-content: center;">
- <img src="@/assets/images/video.png" alt="鎾斁" style="width: 30px; height: 30px; opacity: 0.8;" />
- </div>
- <div style="text-align: center; font-size: 12px; color: #666;">鐐瑰嚮鎾斁</div>
- </div>
- </div>
- </div>
-
- <!-- 鐢熶骇鍚� -->
- <div class="form-container">
- <div class="title">鐢熶骇鍚�</div>
-
- <!-- 鍥剧墖鍒楄〃 -->
- <div style="display: flex; flex-wrap: wrap;">
- <img v-for="(item, index) in afterProductionImgs" :key="index"
- @click="showMedia(afterProductionImgs, index, 'image')"
- :src="item" style="max-width: 100px; height: 100px; margin: 5px;" alt="">
- </div>
-
- <!-- 瑙嗛鍒楄〃 -->
- <div style="display: flex; flex-wrap: wrap;">
- <div
- v-for="(videoUrl, index) in afterProductionVideos"
- :key="index"
- @click="showMedia(afterProductionVideos, index, 'video')"
+ @click="showMedia(productionAbnormalVideos, index, 'video')"
style="position: relative; margin: 10px; cursor: pointer;"
>
<div style="width: 160px; height: 90px; background-color: #333; display: flex; align-items: center; justify-content: center;">
@@ -85,7 +31,7 @@
</div>
</div>
</el-dialog>
-
+
<!-- 缁熶竴濯掍綋鏌ョ湅鍣� -->
<div v-if="isMediaViewerVisible" class="media-viewer-overlay" @click.self="closeMediaViewer">
<div class="media-viewer-content" @click.stop>
@@ -97,7 +43,7 @@
:index="currentMediaIndex"
@hide="closeMediaViewer"
></vue-easy-lightbox>
-
+
<!-- 瑙嗛 -->
<div v-else-if="mediaType === 'video'" style="position: relative;">
<video
@@ -112,7 +58,7 @@
</div>
</template>
<script setup>
-import { ref } from 'vue';
+import { ref, getCurrentInstance } from 'vue';
import VueEasyLightbox from 'vue-easy-lightbox';
const { proxy } = getCurrentInstance();
@@ -120,14 +66,10 @@
const dialogVisitable = ref(false);
// 鍥剧墖鏁扮粍
-const beforeProductionImgs = ref([]);
-const afterProductionImgs = ref([]);
-const productionIssuesImgs = ref([]);
+const productionAbnormalImgs = ref([]);
// 瑙嗛鏁扮粍
-const beforeProductionVideos = ref([]);
-const afterProductionVideos = ref([]);
-const productionIssuesVideos = ref([]);
+const productionAbnormalVideos = ref([]);
// 濯掍綋鏌ョ湅鍣ㄧ姸鎬�
const isMediaViewerVisible = ref(false);
@@ -139,7 +81,7 @@
// 澶勭悊 URL锛氬皢 Windows 璺緞杞崲涓哄彲璁块棶鐨� URL
function processFileUrl(fileUrl) {
if (!fileUrl) return '';
-
+
// 濡傛灉 URL 鏄� Windows 璺緞鏍煎紡锛堝寘鍚弽鏂滄潬锛夛紝闇�瑕佽浆鎹�
if (fileUrl && fileUrl.indexOf('\\') > -1) {
// 鏌ユ壘 uploads 鍏抽敭瀛楃殑浣嶇疆锛屼粠閭ｉ噷寮�濮嬫彁鍙栫浉瀵硅矾寰�
@@ -155,7 +97,7 @@
fileUrl = '/uploads/' + fileName;
}
}
-
+
// 纭繚鎵�鏈夐潪 http 寮�澶寸殑 URL 閮芥嫾鎺� baseUrl
if (fileUrl && !fileUrl.startsWith('http')) {
// 纭繚璺緞浠� / 寮�澶�
@@ -165,7 +107,7 @@
// 鎷兼帴 baseUrl
fileUrl = javaApi + fileUrl;
}
-
+
return fileUrl;
}
@@ -173,18 +115,18 @@
function processItems(items) {
const images = [];
const videos = [];
-
+
// 妫�鏌� items 鏄惁瀛樺湪涓斾负鏁扮粍
if (!items || !Array.isArray(items)) {
return { images, videos };
}
-
+
items.forEach(item => {
if (!item || !item.url) return;
-
+
// 澶勭悊鏂囦欢 URL
const fileUrl = processFileUrl(item.url);
-
+
// 鏍规嵁鏂囦欢鎵╁睍鍚嶅垽鏂槸鍥剧墖杩樻槸瑙嗛
const urlLower = fileUrl.toLowerCase();
if (urlLower.match(/\.(jpg|jpeg|png|gif|bmp|webp)$/)) {
@@ -200,27 +142,19 @@
}
}
});
-
+
return { images, videos };
}
// 鎵撳紑寮圭獥骞跺姞杞芥暟鎹�
const openDialog = async (row) => {
- // 浣跨敤姝ｇ‘鐨勫瓧娈靛悕锛歝ommonFileListBefore, commonFileListAfter
- // productionIssues 鍙兘涓嶅瓨鍦紝浣跨敤绌烘暟缁�
- const { images: beforeImgs, videos: beforeVids } = processItems(row.commonFileListBefore || []);
- const { images: afterImgs, videos: afterVids } = processItems(row.commonFileListAfter || []);
- const { images: issueImgs, videos: issueVids } = processItems(row.productionIssues || []);
-
- beforeProductionImgs.value = beforeImgs;
- beforeProductionVideos.value = beforeVids;
-
- afterProductionImgs.value = afterImgs;
- afterProductionVideos.value = afterVids;
-
- productionIssuesImgs.value = issueImgs;
- productionIssuesVideos.value = issueVids;
-
+ // 浣跨敤 commonFileListBeforeDTO 鎴� commonFileListBeforeVO 瀛楁
+ const fileList = row.commonFileListBeforeDTO || row.commonFileListBeforeVO || [];
+ const { images, videos } = processItems(fileList);
+
+ productionAbnormalImgs.value = images;
+ productionAbnormalVideos.value = videos;
+
dialogVisitable.value = true;
};
@@ -254,7 +188,7 @@
padding: 20px;
border: 1px solid #dcdfe6;
box-sizing: border-box;
-
+
.form-container {
flex: 1;
width: 100%;
@@ -270,7 +204,7 @@
padding-left: 10px;
position: relative;
margin: 6px 0;
-
+
&::before {
content: "";
position: absolute;
@@ -301,4 +235,4 @@
max-height: 90vh;
overflow: hidden;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/equipmentManagement/inspectionManagement/index.vue b/src/views/equipmentManagement/inspectionManagement/index.vue
index b0f4f58..d7e94a9 100644
--- a/src/views/equipmentManagement/inspectionManagement/index.vue
+++ b/src/views/equipmentManagement/inspectionManagement/index.vue
@@ -81,7 +81,6 @@
total,
layout: 'total, sizes, prev, pager, next, jumper',
}"
- :table-style="{ width: '100%', height: 'calc(100vh - 23em)' }"
@selection-change="handleSelectionChange"
@pagination="handlePagination"
>
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index c8890cc..30a1f9a 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -82,6 +82,11 @@
show-overflow-tooltip
/>
<el-table-column
+ label="鍑哄簱鎵规"
+ prop="outboundBatches"
+ show-overflow-tooltip
+ />
+ <el-table-column
label="鍙戣揣鏃堕棿"
prop="shippingDate"
show-overflow-tooltip
--
Gitblit v1.9.3