From 59dc3bbd1fdedab400b56d67a169bcda97dcf75e Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 17 十二月 2025 18:51:33 +0800
Subject: [PATCH] SJ,XJ,RKJ优化修改
---
pages/QC/RKJ/detail.vue | 281 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 238 insertions(+), 43 deletions(-)
diff --git a/pages/QC/RKJ/detail.vue b/pages/QC/RKJ/detail.vue
index d18352a..dbbe4c1 100644
--- a/pages/QC/RKJ/detail.vue
+++ b/pages/QC/RKJ/detail.vue
@@ -107,7 +107,7 @@
v-model="formData.fcheckResu"
type="text"
class="result-input"
- placeholder="娌℃湁鏈�澶у�煎拰鏈�灏忓�兼椂濉啓0锛堟湭閫氳繃妫�楠岋級鎴�1锛堥�氳繃妫�楠岋級"
+ placeholder="鏃犱笂涓嬮檺鏃跺～鍐橭K锛堝悎鏍硷級鎴朜G锛堜笉鍚堟牸锛�"
placeholder-class="placeholder" />
<button v-if="(tableData.length < formData.levelNum)"
style="margin: 0px;background-color: #3498db;color:#ffffff ;" class="btn primary-btn"
@@ -139,17 +139,24 @@
</button>
</view>
- <!-- 鍥剧墖棰勮 -->
- <view v-if="isShowImg" class="section">
+ <!-- 鍥剧墖棰勮 - 鏀寔澶氬浘鐗� -->
+ <view v-if="imageList && imageList.length > 0" class="section">
<view class="section-header">
- <view class="section-title">鐩稿叧鍥剧墖</view>
- <view class="section-actions">
- <button class="delete-image-btn" @click="deleteImage">鍒犻櫎鍥剧墖</button>
- </view>
+ <view class="section-title">鐩稿叧鍥剧墖 ({{ imageList.length }}寮�)</view>
</view>
<view class="section-body">
- <view class="image-preview" @click="previewImage">
- <image :src="base64Image" mode="aspectFit" class="preview-image"/>
+ <view class="image-list">
+ <view v-for="(img, index) in imageList" :key="img.id" class="image-item">
+ <view class="image-preview" @click="previewMultiImage(index)">
+ <image :src="'data:image/jpeg;base64,' + img.base64Data" mode="aspectFill" class="preview-image"/>
+ </view>
+ <view class="image-actions">
+ <button class="delete-image-btn" @click="deleteSingleImage(img)">
+ <text class="delete-icon">馃棏锔�</text>
+ <text>鍒犻櫎</text>
+ </button>
+ </view>
+ </view>
</view>
</view>
</view>
@@ -174,7 +181,7 @@
</view>
</view>
<view class="td">
- <view class="result-badge" :class="item.fcheckResu === '1' ? 'OK' : 'NG'">
+ <view class="result-badge" :class="(item.fcheckResu === 'OK' || item.fcheckResu === '1' || item.fcheckResu == 1) ? 'OK' : 'NG'">
{{ item.fcheckResu }}
</view>
</view>
@@ -400,6 +407,7 @@
tableData: [],
isShowImg: false,
base64Image: "",
+ imageList: [], // 澶氬浘鐗囧垪琛�
remarks: "",
remarksPopup: false,
fcheckResu: null,
@@ -433,7 +441,7 @@
// 鍒ゆ柇鏄惁宸蹭笂浼犲浘鐗�
hasImage() {
- return this.formData.imageData && this.formData.imageData.length > 0;
+ return this.imageList && this.imageList.length > 0;
},
// 鍒ゆ柇鏄惁宸插～鍐欎笉鑹弿杩�
@@ -448,7 +456,8 @@
},
editResult(fcheckResu) {
- if (fcheckResu == '1') {
+ // 1 鎴� OK 閮借〃绀哄悎鏍�
+ if (fcheckResu == '1' || fcheckResu == 'OK' || fcheckResu == 1) {
return "鏀逛负涓嶅悎鏍�";
} else {
return "鏀逛负鍚堟牸";
@@ -477,22 +486,27 @@
} else {
if (!this.formData.fcheckResu) {
- this.formData.fcheckResu = 1
+ this.formData.fcheckResu = 'OK'; // 榛樿鍚堟牸
}
- if (this.formData.fcheckResu == 0 || this.formData.fcheckResu == 1) {
- this.formData.isPass = this.formData.fcheckResu
+ // 缁熶竴浣跨敤 OK/NG
+ const upperValue = String(this.formData.fcheckResu).toUpperCase();
+ if (upperValue === 'OK' || upperValue === 'NG') {
+ this.formData.fcheckResu = upperValue; // 缁熶竴杞负澶у啓
+ if (upperValue === 'NG') {
+ fstand = "脳";
+ }
} else {
- this.$showMessage("鏃犳爣鍑嗗�兼椂锛屾楠岀粨鏋滃彧鑳戒负0鎴�1!");
+ this.$showMessage("鏃犱笂涓嬮檺鏃讹紝妫�楠岀粨鏋滃彧鑳戒负OK鎴朜G!");
return;
}
count = count - this.tableData.length;
}
// 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
- if (fstand === "脳" || this.formData.fcheckResu == 0) {
+ if (fstand === "脳" || this.formData.fcheckResu === 'NG') {
// 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
- if (!this.formData.imageData || this.formData.imageData.length === 0) {
+ if (!this.imageList || this.imageList.length === 0) {
this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
return;
}
@@ -534,12 +548,26 @@
this.tableData = res.data.tbBillList.itemXj02s;
- // 澶勭悊鍥剧墖鏄剧ず鐘舵��
- if (this.formData.imageData && this.formData.imageData.length > 0) {
+ // 澶勭悊澶氬浘鐗囧垪琛�
+ if (this.formData.imageList && this.formData.imageList.length > 0) {
+ this.imageList = this.formData.imageList;
+ this.isShowImg = true;
+ if (this.imageList.length > 0) {
+ this.base64Image = 'data:image/jpeg;base64,' + this.imageList[0].base64Data;
+ }
+ } else if (this.formData.imageData && this.formData.imageData.length > 0) {
+ // 鍚戝悗鍏煎锛氬鏋滄病鏈塱mageList浣嗘湁imageData
+ this.imageList = [{
+ id: 0,
+ base64Data: this.formData.imageData,
+ fileName: '',
+ createDate: null,
+ createBy: ''
+ }];
this.isShowImg = true;
this.base64Image = 'data:image/jpeg;base64,' + this.formData.imageData;
} else {
- // 濡傛灉娌℃湁鍥剧墖鏁版嵁锛岄殣钘忓浘鐗囨樉绀哄尯鍩�
+ this.imageList = [];
this.isShowImg = false;
this.base64Image = '';
}
@@ -586,23 +614,26 @@
} else {
if (!this.editData.fcheckResu) {
- this.editData.fcheckResu = 1
+ this.editData.fcheckResu = 'OK'; // 榛樿鍚堟牸
}
- if (this.editData.fcheckResu == 0 || this.editData.fcheckResu == 1) {
- if (this.editData.fcheckResu == 0) {
+ // 缁熶竴浣跨敤 OK/NG
+ const upperValue = String(this.editData.fcheckResu).toUpperCase();
+ if (upperValue === 'OK' || upperValue === 'NG') {
+ this.editData.fcheckResu = upperValue; // 缁熶竴杞负澶у啓
+ if (upperValue === 'NG') {
fstand = "脳";
}
} else {
- this.$showMessage("鏃犳爣鍑嗗�兼椂锛屾楠岀粨鏋滃彧鑳戒负0鎴�1!");
+ this.$showMessage("鏃犱笂涓嬮檺鏃讹紝妫�楠岀粨鏋滃彧鑳戒负OK鎴朜G!");
return;
}
}
// 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
- if (fstand === "脳" || this.editData.fcheckResu == 0) {
+ if (fstand === "脳" || this.editData.fcheckResu === 'NG') {
// 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
- if (!this.formData.imageData || this.formData.imageData.length === 0) {
+ if (!this.imageList || this.imageList.length === 0) {
this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
return;
}
@@ -642,17 +673,18 @@
numberEdit(item) {
let fstand = "鈭�";
- let fcheckResu = 1;
+ let fcheckResu = 'OK'; // 鍚堟牸鐢∣K
- if (item.fcheckResu == '1') {
+ // 鍒ゆ柇褰撳墠鏄惁涓哄悎鏍肩姸鎬侊紙OK 鎴� 1 閮借〃绀哄悎鏍硷級
+ if (item.fcheckResu == '1' || item.fcheckResu == 'OK' || item.fcheckResu == 1) {
fstand = "脳";
- fcheckResu = 0;
+ fcheckResu = 'NG'; // 涓嶅悎鏍肩敤NG
}
// 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
- if (fstand === "脳" || fcheckResu == 0) {
+ if (fstand === "脳" || fcheckResu == 'NG') {
// 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
- if (!this.formData.imageData || this.formData.imageData.length === 0) {
+ if (!this.imageList || this.imageList.length === 0) {
this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
return;
}
@@ -983,20 +1015,34 @@
});
},
- // 鏍规嵁閫夋嫨鐨勬潵婧愰�夋嫨鍥剧墖
+ // 鏍规嵁閫夋嫨鐨勬潵婧愰�夋嫨鍥剧墖锛堟敮鎸佸閫夛級
chooseImageWithSource(sourceType) {
+ // 璁＄畻杩樺彲浠ヤ笂浼犲灏戝紶鍥剧墖
+ const currentCount = this.imageList ? this.imageList.length : 0;
+ const maxCount = 9;
+ const remainCount = maxCount - currentCount;
+
+ if (remainCount <= 0) {
+ uni.showToast({
+ title: '鏈�澶氬彧鑳戒笂浼�' + maxCount + '寮犲浘鐗�',
+ icon: 'none'
+ });
+ return;
+ }
+
uni.chooseImage({
- count: 1, // 鏈�澶氶�夋嫨1寮犲浘鐗�
- sizeType: ['compressed', 'original'], // 鎻愪緵鍘嬬缉鍜屽師鍥鹃�夐」
- sourceType: sourceType, // 鏍规嵁鐢ㄦ埛閫夋嫨璁剧疆鏉ユ簮
+ count: sourceType.includes('camera') ? 1 : remainCount, // 鎷嶇収鍙兘涓�寮狅紝鐩稿唽鍙閫�
+ sizeType: ['compressed', 'original'],
+ sourceType: sourceType,
success: (res) => {
- const tempFilePath = res.tempFilePaths[0];
+ const tempFilePaths = res.tempFilePaths;
// 濡傛灉鏄媿鐓э紝鏄剧ず棰勮纭
if (sourceType.includes('camera')) {
- this.showImagePreview(tempFilePath);
+ this.showImagePreview(tempFilePaths[0]);
} else {
- this.uploadImageToServer(tempFilePath);
+ // 澶氬浘鐗囨壒閲忎笂浼�
+ this.uploadMultipleImages(tempFilePaths);
}
},
fail: (error) => {
@@ -1007,6 +1053,77 @@
}
uni.showToast({
title: errorMessage,
+ icon: 'none'
+ });
+ }
+ });
+ },
+
+ // 鎵归噺涓婁紶鍥剧墖
+ uploadMultipleImages(tempFilePaths) {
+ if (!tempFilePaths || tempFilePaths.length === 0) {
+ return;
+ }
+
+ uni.showLoading({
+ title: '涓婁紶涓�... (0/' + tempFilePaths.length + ')'
+ });
+
+ const uploadUrl = this.$store.state.serverInfo.serverAPI + "/RKJ/UploadImageToPicture";
+ let successCount = 0;
+ let failCount = 0;
+ const total = tempFilePaths.length;
+
+ const uploadPromises = tempFilePaths.map((filePath, index) => {
+ return new Promise((resolve) => {
+ uni.uploadFile({
+ url: uploadUrl,
+ filePath: filePath,
+ name: 'file',
+ formData: {
+ id: this.id,
+ gid: this.gid,
+ billNo: this.billNo,
+ createBy: this.$loginInfo.account
+ },
+ success: (uploadRes) => {
+ try {
+ const result = JSON.parse(uploadRes.data);
+ if (result.status === 0) {
+ successCount++;
+ } else {
+ failCount++;
+ }
+ } catch (error) {
+ failCount++;
+ }
+ uni.showLoading({
+ title: '涓婁紶涓�... (' + (successCount + failCount) + '/' + total + ')'
+ });
+ resolve();
+ },
+ fail: () => {
+ failCount++;
+ uni.showLoading({
+ title: '涓婁紶涓�... (' + (successCount + failCount) + '/' + total + ')'
+ });
+ resolve();
+ }
+ });
+ });
+ });
+
+ Promise.all(uploadPromises).then(() => {
+ uni.hideLoading();
+ if (successCount > 0) {
+ uni.showToast({
+ title: '鎴愬姛涓婁紶' + successCount + '寮犲浘鐗�',
+ icon: 'success'
+ });
+ this.refreshResult();
+ } else {
+ uni.showToast({
+ title: '鍥剧墖涓婁紶澶辫触',
icon: 'none'
});
}
@@ -1114,17 +1231,45 @@
});
},
+ // 棰勮澶氬浘鐗�
+ previewMultiImage(index) {
+ const urls = this.imageList.map(img => 'data:image/jpeg;base64,' + img.base64Data);
+ uni.previewImage({
+ urls: urls,
+ current: index
+ });
+ },
+
+ // 鍒犻櫎鍗曞紶鍥剧墖
+ deleteSingleImage(img) {
+ uni.showModal({
+ title: '纭鍒犻櫎',
+ content: '纭畾瑕佸垹闄よ繖寮犲浘鐗囧悧锛�',
+ confirmText: '鍒犻櫎',
+ cancelText: '鍙栨秷',
+ confirmColor: '#e74c3c',
+ success: (res) => {
+ if (res.confirm) {
+ this.deleteImageFromServer(img.id);
+ }
+ }
+ });
+ },
+
// 浠庢湇鍔″櫒鍒犻櫎鍥剧墖
- deleteImageFromServer() {
+ deleteImageFromServer(imageId = null) {
uni.showLoading({
title: '鍒犻櫎涓�...'
});
+ const data = { id: this.id };
+ if (imageId !== null && imageId !== undefined && imageId !== 0) {
+ data.imageId = imageId;
+ }
+
this.$post({
url: "/RKJ/DeleteImageFromPicture",
- data: {
- id: this.id // 褰撳墠妫�楠岄」鐩甀D
- }
+ data: data
}).then(res => {
uni.hideLoading();
if (res.status === 0) {
@@ -1223,6 +1368,56 @@
}
}
+/* 澶氬浘鐗囧垪琛ㄦ牱寮� */
+.image-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 16px;
+}
+
+.image-item {
+ width: 150px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ .image-preview {
+ width: 150px;
+ height: 150px;
+ border: 1px solid $border-color;
+ border-radius: 8px;
+ overflow: hidden;
+ cursor: pointer;
+
+ .preview-image {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ }
+ }
+
+ .image-actions {
+ margin-top: 8px;
+
+ .delete-image-btn {
+ display: flex;
+ align-items: center;
+ gap: 4px;
+ padding: 6px 12px;
+ background-color: $danger-color;
+ color: #fff;
+ border: none;
+ border-radius: 4px;
+ font-size: 12px;
+ cursor: pointer;
+
+ .delete-icon {
+ font-size: 14px;
+ }
+ }
+ }
+}
+
.info-grid {
display: grid;
grid-template-columns: repeat(3, 1fr);
--
Gitblit v1.9.3