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/SJ/detail.vue | 307 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 269 insertions(+), 38 deletions(-)
diff --git a/pages/QC/SJ/detail.vue b/pages/QC/SJ/detail.vue
index 6a7e212..8e25304 100644
--- a/pages/QC/SJ/detail.vue
+++ b/pages/QC/SJ/detail.vue
@@ -134,7 +134,7 @@
v-model="formData.fcheckResu"
type="text"
class="result-input"
- placeholder="娌℃湁鏈�澶у�煎拰鏈�灏忓�兼椂濉啓0锛堟湭閫氳繃妫�楠岋級鎴�1锛堥�氳繃妫�楠岋級"
+ placeholder="鏃犱笂涓嬮檺鏃跺～鍐橭K锛堝悎鏍硷級鎴朜G锛堜笉鍚堟牸锛�"
placeholder-class="placeholder" />
<button v-if="!isAllCompleted"
style="margin: 0px;background-color: #3498db;color:#ffffff ;" class="btn primary-btn"
@@ -203,17 +203,24 @@
</view>
</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>
@@ -437,6 +444,7 @@
tableData: [],
base64Image: "",
isShowImg: false,
+ imageList: [], // 澶氬浘鐗囧垪琛�
remarks: "",
remarksPopup: false,
// ===== 鏂板LLJ鏍峰紡鐩稿叧鏁版嵁 =====
@@ -560,13 +568,13 @@
this.formData.fcheckResu > this.formData.maxValue;
}
- // 濡傛灉娌℃湁鏈�澶у�煎拰鏈�灏忓�硷紝妫�鏌ユ槸鍚︿负0锛堜笉鍚堟牸锛�
- return this.formData.fcheckResu == 0;
+ // 濡傛灉娌℃湁涓婁笅闄愶紝妫�鏌ユ槸鍚︿负NG锛堜笉鍚堟牸锛夋垨鍏煎鏃х殑06
+ return this.formData.fcheckResu == 0 || this.formData.fcheckResu === 'NG';
},
// 鍒ゆ柇鏄惁宸蹭笂浼犲浘鐗�
hasImage() {
- return this.formData.imageData && this.formData.imageData.length > 0;
+ return this.imageList && this.imageList.length > 0;
},
// 鍒ゆ柇鏄惁宸插～鍐欎笉鑹弿杩�
@@ -592,9 +600,9 @@
return 'NG';
} else {
// 濡傛灉娌℃湁fstand锛屾牴鎹甪checkResu鐨勫�煎垽鏂�
- if (fcheckResu === '1' || fcheckResu === 1) {
+ if (fcheckResu === '1' || fcheckResu === 1 || fcheckResu === 'OK') {
return 'OK';
- } else if (fcheckResu === '0' || fcheckResu === 0) {
+ } else if (fcheckResu === '0' || fcheckResu === 0 || fcheckResu === 'NG') {
return 'NG';
} else {
// 瀵逛簬鏈変笂涓嬮檺鐨勬暟鍊兼楠岋紝鏍规嵁fcheckResu鏄惁鍦ㄨ寖鍥村唴鍒ゆ柇
@@ -632,9 +640,9 @@
return '涓嶅悎鏍�';
} else {
// 濡傛灉娌℃湁fstand锛屾牴鎹甪checkResu鐨勫�煎垽鏂�
- if (fcheckResu === '1' || fcheckResu === 1) {
+ if (fcheckResu === '1' || fcheckResu === 1 || fcheckResu === 'OK') {
return '鍚堟牸';
- } else if (fcheckResu === '0' || fcheckResu === 0) {
+ } else if (fcheckResu === '0' || fcheckResu === 0 || fcheckResu === 'NG') {
return '涓嶅悎鏍�';
} else {
// 瀵逛簬鏈変笂涓嬮檺鐨勬暟鍊兼楠岋紝鏍规嵁fcheckResu鏄惁鍦ㄨ寖鍥村唴鍒ゆ柇
@@ -692,8 +700,31 @@
urls: [this.base64Image],
});
},
+
+ // 澶氬浘鐗囬瑙�
+ 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: '纭畾瑕佸垹闄よ繖寮犲浘鐗囧悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ this.deleteImageFromServer(img.id);
+ }
+ }
+ });
+ },
editResult(fcheckResu) {
- if (fcheckResu == '1') {
+ // 1 鎴� OK 閮借〃绀哄悎鏍�
+ if (fcheckResu == '1' || fcheckResu == 'OK' || fcheckResu == 1) {
return "鏀逛负涓嶅悎鏍�";
} else {
return "鏀逛负鍚堟牸";
@@ -749,9 +780,9 @@
}
// 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
- 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;
}
@@ -798,13 +829,31 @@
console.log("鑾峰彇鍒扮殑 formData:", this.formData);
console.log("itemNo 鍊�:", this.formData.itemNo);
- if (this.formData.imageData) {
+ // 澶勭悊澶氬浘鐗囧垪琛�
+ 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.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 = '';
}
+
if (this.formData.maxValue && this.formData.minValue && this.formData.standardValue) {
this.isNumber = true;
}
@@ -871,7 +920,7 @@
}
// 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
- if (fstand === "脳" || this.editData.fcheckResu == 0) {
+ if (fstand === "脳" || this.editData.fcheckResu === 'NG') {
// 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
if (!this.formData.imageData || this.formData.imageData.length === 0) {
this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
@@ -918,17 +967,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;
}
@@ -1246,26 +1296,89 @@
});
},
- // 閫夋嫨鍥剧墖鏉ユ簮
+ // 閫夋嫨鍥剧墖鏉ユ簮 - 鏀寔澶氶��
chooseImageWithSource(source) {
uni.chooseImage({
- count: 1,
+ count: 9, // 鏀寔鏈�澶氶�夋嫨9寮犲浘鐗�
sizeType: ['compressed'],
sourceType: [source],
success: (res) => {
- const tempFilePath = res.tempFilePaths[0];
+ const tempFilePaths = res.tempFilePaths;
if (source === 'camera') {
- // 鎷嶇収鍚庢樉绀洪瑙堢‘璁�
- this.showImagePreview(tempFilePath);
+ // 鎷嶇収鍚庣洿鎺ヤ笂浼狅紙鍗曞紶锛�
+ this.uploadImageToServer(tempFilePaths[0]);
} else {
- // 鐩稿唽閫夋嫨鐩存帴涓婁紶
- this.uploadImageToServer(tempFilePath);
+ // 鐩稿唽閫夋嫨锛屾壒閲忎笂浼�
+ this.uploadMultipleImages(tempFilePaths);
}
},
fail: (err) => {
console.error('閫夋嫨鍥剧墖澶辫触:', err);
this.$showMessage('閫夋嫨鍥剧墖澶辫触');
}
+ });
+ },
+
+ // 鎵归噺涓婁紶鍥剧墖
+ uploadMultipleImages(tempFilePaths) {
+ if (!tempFilePaths || tempFilePaths.length === 0) {
+ return;
+ }
+
+ uni.showLoading({
+ title: `涓婁紶涓�(0/${tempFilePaths.length})...`
+ });
+
+ let successCount = 0;
+ let failCount = 0;
+ const total = tempFilePaths.length;
+
+ // 浣跨敤 Promise.all 骞惰涓婁紶
+ const uploadPromises = tempFilePaths.map((filePath, index) => {
+ return new Promise((resolve) => {
+ uni.uploadFile({
+ url: this.$store.state.serverInfo.serverAPI + '/SJ/UploadImageToPicture',
+ filePath: filePath,
+ name: 'file',
+ formData: {
+ id: this.id.toString(),
+ gid: this.gid.toString(),
+ billNo: this.billNo,
+ createBy: this.$loginInfo.account
+ },
+ success: (res) => {
+ try {
+ const result = JSON.parse(res.data);
+ if (result.status === 0) {
+ successCount++;
+ } else {
+ failCount++;
+ }
+ } catch (e) {
+ failCount++;
+ }
+ uni.showLoading({
+ title: `涓婁紶涓�(${successCount + failCount}/${total})...`
+ });
+ resolve();
+ },
+ fail: (err) => {
+ failCount++;
+ console.error('涓婁紶澶辫触:', err);
+ resolve();
+ }
+ });
+ });
+ });
+
+ Promise.all(uploadPromises).then(() => {
+ uni.hideLoading();
+ if (failCount === 0) {
+ this.$showMessage(`${successCount}寮犲浘鐗囦笂浼犳垚鍔焋);
+ } else {
+ this.$showMessage(`涓婁紶瀹屾垚锛氭垚鍔�${successCount}寮狅紝澶辫触${failCount}寮燻);
+ }
+ this.refreshResult();
});
},
@@ -1340,17 +1453,24 @@
});
},
- // 浠庢湇鍔″櫒鍒犻櫎鍥剧墖
- deleteImageFromServer() {
+ // 浠庢湇鍔″櫒鍒犻櫎鍥剧墖 - 鏀寔鍒犻櫎鍗曞紶鎴栨墍鏈夊浘鐗�
+ deleteImageFromServer(imageId = null) {
uni.showLoading({
title: '鍒犻櫎涓�...'
});
+ const data = {
+ id: this.id
+ };
+
+ // 濡傛灉浼犲叆浜� imageId锛屽垯鍒犻櫎鍗曞紶鍥剧墖
+ if (imageId !== null && imageId !== undefined && imageId !== 0) {
+ data.imageId = imageId;
+ }
+
this.$post({
url: '/SJ/DeleteImageFromPicture',
- data: {
- id: this.id
- }
+ data: data
}).then(res => {
uni.hideLoading();
if (res.status === 0) {
@@ -2424,6 +2544,117 @@
transform: translateY(-1px);
}
+/* 澶氬浘鐗囧垪琛ㄦ牱寮� */
+.image-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 12px;
+ padding: 10px 0;
+}
+
+.image-item {
+ position: relative;
+ width: calc(33.33% - 8px);
+ min-width: 100px;
+ max-width: 150px;
+ border-radius: 12px;
+ overflow: hidden;
+ background: #fff;
+ box-shadow: 0 2px 12px rgba(0,0,0,0.08);
+ transition: all 0.3s ease;
+}
+
+.image-item:hover {
+ box-shadow: 0 4px 20px rgba(0,0,0,0.12);
+ transform: translateY(-2px);
+}
+
+.image-item .image-preview {
+ width: 100%;
+ height: 100px;
+ overflow: hidden;
+ cursor: pointer;
+ position: relative;
+}
+
+.image-item .preview-image {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+}
+
+.image-actions {
+ padding: 8px 6px;
+ text-align: center;
+ background: linear-gradient(to bottom, #fafafa, #f5f5f5);
+}
+
+.image-actions .delete-image-btn {
+ width: 100%;
+ padding: 8px 12px;
+ font-size: 13px;
+ border-radius: 20px;
+ background: linear-gradient(135deg, #ff6b6b 0%, #ee5a5a 100%);
+ border: none;
+ color: white;
+ font-weight: 500;
+ box-shadow: 0 2px 8px rgba(238, 90, 90, 0.3);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 4px;
+ transition: all 0.2s ease;
+}
+
+.image-actions .delete-image-btn:active {
+ transform: scale(0.95);
+ box-shadow: 0 1px 4px rgba(238, 90, 90, 0.3);
+}
+
+.delete-icon {
+ font-size: 14px;
+ margin-right: 2px;
+}
+
+/* 绉诲姩绔紭鍖� */
+@media (max-width: 480px) {
+ .image-list {
+ gap: 10px;
+ }
+
+ .image-item {
+ width: calc(50% - 5px);
+ min-width: 0;
+ max-width: none;
+ border-radius: 10px;
+ }
+
+ .image-item .image-preview {
+ height: 90px;
+ }
+
+ .image-actions {
+ padding: 6px 5px;
+ }
+
+ .image-actions .delete-image-btn {
+ padding: 6px 10px;
+ font-size: 12px;
+ border-radius: 16px;
+ }
+}
+
+@media (min-width: 768px) {
+ .image-item {
+ width: calc(25% - 9px);
+ max-width: 160px;
+ }
+
+ .image-item .image-preview {
+ height: 120px;
+ }
+}
+
/* 涓婁紶鍥剧墖鎸夐挳鏍峰紡 */
.tablet-upload-btn {
background: linear-gradient(135deg, #2ecc71 0%, #27ae60 100%);
--
Gitblit v1.9.3