From 983dddd66ab8a999544272089e8c0fc12370f356 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期一, 08 十二月 2025 22:38:22 +0800
Subject: [PATCH] 通用界面，不良功能搬运至平板程序
---
pages/QC/SJ/detail.vue | 515 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 486 insertions(+), 29 deletions(-)
diff --git a/pages/QC/SJ/detail.vue b/pages/QC/SJ/detail.vue
index b569a70..6a7e212 100644
--- a/pages/QC/SJ/detail.vue
+++ b/pages/QC/SJ/detail.vue
@@ -98,12 +98,7 @@
<view class="info-value">{{formData.result}}</view>
</view>
</view>
-
- <view v-if="formData.result != null" class="result-preview">
- <view class="info-label">棰勮缁撴灉</view>
- <view class="info-value">{{formData.result}}</view>
- </view>
-
+
<view v-if="formData.remarks != null" class="result-ng">
<view class="info-label">涓嶅悎鏍兼弿杩�</view>
<view class="info-value danger">{{formData.remarks}}</view>
@@ -115,18 +110,26 @@
<view class="section">
<view class="section-header">妫�楠岀粨鏋滃綍鍏�</view>
<view class="section-body">
+ <!-- 楠岃瘉鎻愮ず -->
+ <view v-if="isUnqualifiedResult()" class="validation-hint">
+ <view class="validation-icon">鈿狅笍</view>
+ <view class="validation-text">
+ <view class="validation-title">妫�楠岄」鐩笉鍚堟牸锛屽繀椤诲畬鎴愪互涓嬫搷浣滐細</view>
+ <view class="validation-requirements">
+ <view class="requirement-item" :class="{ 'completed': hasImage() }">
+ <view class="requirement-icon">{{ hasImage() ? '鉁�' : '鉂�' }}</view>
+ <view class="requirement-text">涓婁紶鍥剧墖</view>
+ </view>
+ <view class="requirement-item" :class="{ 'completed': hasRemarks() }">
+ <view class="requirement-icon">{{ hasRemarks() ? '鉁�' : '鉂�' }}</view>
+ <view class="requirement-text">濉啓涓嶈壇鎻忚堪</view>
+ </view>
+ </view>
+ </view>
+ </view>
+
<view class="input-group">
<view class="input-wrapper">
- <button class="btn upload-btn" @tap="saveRemarks">
- <uni-icons type="compose" size="16" color="#fff"></uni-icons>
- 涓嶅悎鏍兼弿杩�
- </button>
-
- <button class="btn attachment-btn" @tap="viewAttachmentInfo">
- <uni-icons type="folder" size="16" color="#fff"></uni-icons>
- 鏌ョ湅闄勪欢淇℃伅
- </button>
-
<input v-if="!isAllCompleted"
v-model="formData.fcheckResu"
type="text"
@@ -139,6 +142,28 @@
</view>
</view>
</view>
+ </view>
+
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <view class="action-buttons">
+ <button class="btn upload-btn" @tap="saveRemarks">
+ <view class="btn-content">
+ <uni-icons type="compose" size="16" color="#fff"></uni-icons>
+ <view class="btn-text">涓嶅悎鏍兼弿杩�</view>
+ </view>
+ </button>
+ <button class="btn attachment-btn" @tap="viewAttachmentInfo">
+ <view class="btn-content">
+ <uni-icons type="folder" size="16" color="#fff"></uni-icons>
+ <view class="btn-text">鏌ョ湅闄勪欢淇℃伅</view>
+ </view>
+ </button>
+ <button class="action-btn success tablet-upload-btn" @click="uploadImage">
+ <view class="btn-content">
+ <view class="btn-icon">馃摲</view>
+ <view class="btn-text">鎷嶇収/涓婁紶鍥剧墖</view>
+ </view>
+ </button>
</view>
<!-- 缁撴灉琛ㄦ牸 -->
@@ -180,7 +205,12 @@
<!-- 鍥剧墖棰勮 -->
<view v-if="isShowImg" class="section">
- <view class="section-header">鐩稿叧鍥剧墖</view>
+ <view class="section-header">
+ <view class="section-title">鐩稿叧鍥剧墖</view>
+ <view class="section-actions">
+ <button class="delete-image-btn" @click="deleteImage">鍒犻櫎鍥剧墖</button>
+ </view>
+ </view>
<view class="section-body">
<view class="image-preview" @click="previewImage">
<image :src="base64Image" mode="aspectFit" class="preview-image"/>
@@ -520,6 +550,30 @@
}
},
methods: {
+ // 鍒ゆ柇褰撳墠妫�楠岀粨鏋滄槸鍚︿负涓嶅悎鏍�
+ isUnqualifiedResult() {
+ if (!this.formData.fcheckResu) return false;
+
+ // 濡傛灉鏈夋渶澶у�煎拰鏈�灏忓�硷紝妫�鏌ユ槸鍚﹁秴鍑鸿寖鍥�
+ if (this.formData.maxValue && this.formData.minValue) {
+ return this.formData.fcheckResu < this.formData.minValue ||
+ this.formData.fcheckResu > this.formData.maxValue;
+ }
+
+ // 濡傛灉娌℃湁鏈�澶у�煎拰鏈�灏忓�硷紝妫�鏌ユ槸鍚︿负0锛堜笉鍚堟牸锛�
+ return this.formData.fcheckResu == 0;
+ },
+
+ // 鍒ゆ柇鏄惁宸蹭笂浼犲浘鐗�
+ hasImage() {
+ return this.formData.imageData && this.formData.imageData.length > 0;
+ },
+
+ // 鍒ゆ柇鏄惁宸插～鍐欎笉鑹弿杩�
+ hasRemarks() {
+ return this.formData.remarks && this.formData.remarks.trim() !== '';
+ },
+
getResultClass(fcheckResu, fstand, index) {
// 妫�鏌ユ槸鍚﹁鍫电┐
if (this.isHoleBlocked(index)) {
@@ -694,8 +748,23 @@
}
}
+ // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
+ if (fstand === "脳" || this.formData.fcheckResu == 0) {
+ // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
+ if (!this.formData.imageData || this.formData.imageData.length === 0) {
+ this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
+ return;
+ }
+
+ // 妫�鏌ユ槸鍚﹀凡濉啓涓嶈壇鎻忚堪
+ if (!this.formData.remarks || this.formData.remarks.trim() === '') {
+ this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤诲～鍐欎笉鑹弿杩帮紒");
+ return;
+ }
+ }
+
this.formData.updater = this.$loginInfo.account;
-
+
// 鐩存帴鎵ц淇濆瓨锛屼笉鏄剧ず纭寮圭獥
this.$post({
url: "/SJ/SetQSItemDetail",
@@ -732,6 +801,9 @@
if (this.formData.imageData) {
this.isShowImg = true;
this.base64Image = 'data:image/jpeg;base64,' + this.formData.imageData;
+ } else {
+ this.isShowImg = false;
+ this.base64Image = '';
}
if (this.formData.maxValue && this.formData.minValue && this.formData.standardValue) {
this.isNumber = true;
@@ -798,8 +870,23 @@
}
}
+ // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
+ if (fstand === "脳" || this.editData.fcheckResu == 0) {
+ // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
+ if (!this.formData.imageData || this.formData.imageData.length === 0) {
+ this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
+ return;
+ }
+
+ // 妫�鏌ユ槸鍚﹀凡濉啓涓嶈壇鎻忚堪
+ if (!this.formData.remarks || this.formData.remarks.trim() === '') {
+ this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤诲～鍐欎笉鑹弿杩帮紒");
+ return;
+ }
+ }
+
this.editData.updater = this.$loginInfo.account;
-
+
// 鏄剧ず纭鎻愮ず妗�
uni.showModal({
title: '纭淇敼',
@@ -837,7 +924,22 @@
fstand = "脳";
fcheckResu = 0;
}
-
+
+ // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
+ if (fstand === "脳" || fcheckResu == 0) {
+ // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
+ if (!this.formData.imageData || this.formData.imageData.length === 0) {
+ this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
+ return;
+ }
+
+ // 妫�鏌ユ槸鍚﹀凡濉啓涓嶈壇鎻忚堪
+ if (!this.formData.remarks || this.formData.remarks.trim() === '') {
+ this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤诲～鍐欎笉鑹弿杩帮紒");
+ return;
+ }
+ }
+
this.$post({
url: "/SJ/UpdateQSItemDetail",
data: {
@@ -895,10 +997,14 @@
if (tbBillListElement && tbBillListElement.itemNo) {
console.log("鑾峰彇鍒扮殑鐗╂枡缂栫爜:", tbBillListElement.itemNo);
- // 浣跨敤鑾峰彇鍒扮殑鐗╂枡缂栫爜璋冪敤闄勪欢鎺ュ彛
+ // 浣跨敤鑾峰彇鍒扮殑鐗╂枡缂栫爜鍜岄」鐩悕绉拌皟鐢ㄩ檮浠舵帴鍙�
return this.$post({
url: "/SJ/getAttachments",
- data: { itemNo: tbBillListElement.itemNo }
+ data: {
+ itemNo: tbBillListElement.itemNo,
+ projName: this.formData.projName, // 浼犻�掗」鐩悕绉�
+ fromPage: 'Detail' // 鏍囪瘑鏉ヨ嚜Detail椤甸潰锛岄渶瑕佽繃婊�
+ }
});
} else {
throw new Error("鏈壘鍒扮墿鏂欑紪鐮佷俊鎭�");
@@ -1011,7 +1117,8 @@
const fileName = item.fattach.replace(/[\s\u3000\r\n]+/g, '').trim();
const downloadUrl = this.$store.state.serverInfo.serverAPI + "/SJ/DownloadFtpFile?itemNo=" +
encodeURIComponent(item.itemNo) + "&fileName=" + encodeURIComponent(fileName) +
- "&ftpServer=" + encodeURIComponent(this.$store.state.serverInfo.ftpServer);
+ "&ftpServer=" + encodeURIComponent(this.$store.state.serverInfo.ftpServer) +
+ "&projName=" + encodeURIComponent(this.formData.projName || '');
uni.downloadFile({
url: downloadUrl,
@@ -1044,7 +1151,8 @@
const previewUrl = this.$store.state.serverInfo.serverAPI + "/SJ/PreviewFtpFile?itemNo=" +
encodeURIComponent(item.itemNo) + "&fileName=" + encodeURIComponent(fileName) +
- "&ftpServer=" + encodeURIComponent(this.$store.state.serverInfo.ftpServer);
+ "&ftpServer=" + encodeURIComponent(this.$store.state.serverInfo.ftpServer) +
+ "&projName=" + encodeURIComponent(this.formData.projName || '');
if (['pdf'].includes(fileExt)) {
this.previewPdfFile(previewUrl, fileName);
@@ -1122,6 +1230,140 @@
current: this.previewContent
});
}
+ },
+
+ // 鍥剧墖涓婁紶鏂规硶
+ uploadImage() {
+ uni.showActionSheet({
+ itemList: ['鎷嶇収', '浠庣浉鍐岄�夋嫨'],
+ success: (res) => {
+ if (res.tapIndex === 0) {
+ this.chooseImageWithSource('camera');
+ } else if (res.tapIndex === 1) {
+ this.chooseImageWithSource('album');
+ }
+ }
+ });
+ },
+
+ // 閫夋嫨鍥剧墖鏉ユ簮
+ chooseImageWithSource(source) {
+ uni.chooseImage({
+ count: 1,
+ sizeType: ['compressed'],
+ sourceType: [source],
+ success: (res) => {
+ const tempFilePath = res.tempFilePaths[0];
+ if (source === 'camera') {
+ // 鎷嶇収鍚庢樉绀洪瑙堢‘璁�
+ this.showImagePreview(tempFilePath);
+ } else {
+ // 鐩稿唽閫夋嫨鐩存帴涓婁紶
+ this.uploadImageToServer(tempFilePath);
+ }
+ },
+ fail: (err) => {
+ console.error('閫夋嫨鍥剧墖澶辫触:', err);
+ this.$showMessage('閫夋嫨鍥剧墖澶辫触');
+ }
+ });
+ },
+
+ // 鏄剧ず鍥剧墖棰勮
+ showImagePreview(tempFilePath) {
+ uni.previewImage({
+ urls: [tempFilePath],
+ current: tempFilePath,
+ success: () => {
+ // 棰勮鍚庤闂槸鍚︿笂浼�
+ uni.showModal({
+ title: '纭涓婁紶',
+ content: '鏄惁涓婁紶姝ゅ浘鐗囷紵',
+ success: (res) => {
+ if (res.confirm) {
+ this.uploadImageToServer(tempFilePath);
+ }
+ }
+ });
+ }
+ });
+ },
+
+ // 涓婁紶鍥剧墖鍒版湇鍔″櫒
+ uploadImageToServer(tempFilePath) {
+ uni.showLoading({
+ title: '涓婁紶涓�...'
+ });
+
+ uni.uploadFile({
+ url: this.$store.state.serverInfo.serverAPI + '/SJ/UploadImageToPicture',
+ filePath: tempFilePath,
+ name: 'file',
+ formData: {
+ id: this.id.toString(),
+ gid: this.gid.toString(),
+ billNo: this.billNo,
+ createBy: this.$loginInfo.account
+ },
+ success: (res) => {
+ uni.hideLoading();
+ try {
+ const result = JSON.parse(res.data);
+ if (result.status === 0) {
+ this.$showMessage('鍥剧墖涓婁紶鎴愬姛');
+ this.refreshResult(); // 鍒锋柊椤甸潰鏁版嵁
+ } else {
+ this.$showMessage(result.message || '涓婁紶澶辫触');
+ }
+ } catch (e) {
+ this.$showMessage('涓婁紶澶辫触锛岃閲嶈瘯');
+ }
+ },
+ fail: (err) => {
+ uni.hideLoading();
+ console.error('涓婁紶澶辫触:', err);
+ this.$showMessage('涓婁紶澶辫触锛岃閲嶈瘯');
+ }
+ });
+ },
+
+ // 鍒犻櫎鍥剧墖
+ deleteImage() {
+ uni.showModal({
+ title: '纭鍒犻櫎',
+ content: '纭畾瑕佸垹闄ゆ鍥剧墖鍚楋紵',
+ success: (res) => {
+ if (res.confirm) {
+ this.deleteImageFromServer();
+ }
+ }
+ });
+ },
+
+ // 浠庢湇鍔″櫒鍒犻櫎鍥剧墖
+ deleteImageFromServer() {
+ uni.showLoading({
+ title: '鍒犻櫎涓�...'
+ });
+
+ this.$post({
+ url: '/SJ/DeleteImageFromPicture',
+ data: {
+ id: this.id
+ }
+ }).then(res => {
+ uni.hideLoading();
+ if (res.status === 0) {
+ this.$showMessage('鍥剧墖鍒犻櫎鎴愬姛');
+ this.refreshResult(); // 鍒锋柊椤甸潰鏁版嵁
+ } else {
+ this.$showMessage(res.message || '鍒犻櫎澶辫触');
+ }
+ }).catch(err => {
+ uni.hideLoading();
+ console.error('鍒犻櫎澶辫触:', err);
+ this.$showMessage('鍒犻櫎澶辫触锛岃閲嶈瘯');
+ });
}
},
onLoad(options) {
@@ -1206,14 +1448,26 @@
margin: 20px 0;
border: 1px solid $border-color;
border-radius: 4px;
-
+
&-header {
padding: 12px 16px;
background-color: $bg-color;
border-bottom: 1px solid $border-color;
font-weight: bold;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
}
-
+
+ &-title {
+ flex: 1;
+ }
+
+ &-actions {
+ display: flex;
+ gap: 10px;
+ }
+
&-body {
padding: 16px;
}
@@ -1436,19 +1690,71 @@
display: flex;
justify-content: flex-end;
gap: 12px;
-
+
.btn {
padding: 8px 20px;
border-radius: 4px;
-
+
&.primary-btn {
background-color: $primary-color;
color: #fff;
}
-
+
&.cancel-btn {
background-color: #909399;
color: #fff;
+ }
+
+ &.upload-btn {
+ background-color: #909399;
+ color: #fff;
+ border: none;
+ border-radius: 8px;
+ padding: 12px 20px;
+ margin: 0;
+ font-size: 14px;
+ font-weight: 600;
+ min-height: 48px;
+ white-space: nowrap;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 8px;
+ cursor: pointer;
+ transition: all 0.3s ease;
+ box-shadow: 0 4px 12px rgba(144, 147, 153, 0.3);
+ }
+
+ &.upload-btn:hover {
+ background-color: #7a7d82;
+ transform: translateY(-2px);
+ box-shadow: 0 6px 16px rgba(144, 147, 153, 0.4);
+ }
+
+ &.attachment-btn {
+ background-color: #17a2b8;
+ color: #fff;
+ border: none;
+ border-radius: 8px;
+ padding: 12px 20px;
+ margin: 0;
+ font-size: 14px;
+ font-weight: 600;
+ min-height: 48px;
+ white-space: nowrap;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 8px;
+ cursor: pointer;
+ transition: all 0.3s ease;
+ box-shadow: 0 4px 12px rgba(23, 162, 184, 0.3);
+ }
+
+ &.attachment-btn:hover {
+ background-color: #138496;
+ transform: translateY(-2px);
+ box-shadow: 0 6px 16px rgba(23, 162, 184, 0.4);
}
}
}
@@ -2030,4 +2336,155 @@
transform: translateY(-1px);
box-shadow: 0 2px 8px rgba(0,0,0,0.15);
}
+
+/* 楠岃瘉鎻愮ず鏍峰紡 */
+.validation-hint {
+ background: linear-gradient(135deg, #ffe6e6 0%, #ffcccc 100%);
+ border: 2px solid #ff6b6b;
+ border-radius: 8px;
+ padding: 16px;
+ margin-bottom: 20px;
+ display: flex;
+ align-items: flex-start;
+ gap: 12px;
+ box-shadow: 0 2px 8px rgba(255, 107, 107, 0.2);
+}
+
+.validation-icon {
+ font-size: 24px;
+ flex-shrink: 0;
+ margin-top: 2px;
+}
+
+.validation-text {
+ flex: 1;
+}
+
+.validation-title {
+ font-size: 14px;
+ font-weight: 600;
+ color: #d63031;
+ margin-bottom: 12px;
+ line-height: 1.4;
+}
+
+.validation-requirements {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+}
+
+.requirement-item {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ padding: 8px 12px;
+ background: rgba(255, 255, 255, 0.7);
+ border-radius: 6px;
+ border: 1px solid rgba(255, 107, 107, 0.3);
+ transition: all 0.3s ease;
+}
+
+.requirement-item.completed {
+ background: rgba(46, 204, 113, 0.1);
+ border-color: rgba(46, 204, 113, 0.3);
+}
+
+.requirement-icon {
+ font-size: 16px;
+ flex-shrink: 0;
+}
+
+.requirement-text {
+ font-size: 13px;
+ color: #2c3e50;
+ font-weight: 500;
+}
+
+.requirement-item.completed .requirement-text {
+ color: #27ae60;
+}
+
+/* 鍒犻櫎鍥剧墖鎸夐挳鏍峰紡 */
+.delete-image-btn {
+ padding: 6px 12px;
+ border: 1px solid #e74c3c;
+ border-radius: 4px;
+ background-color: #e74c3c;
+ color: white;
+ font-size: 12px;
+ font-weight: 500;
+ cursor: pointer;
+ transition: all 0.2s;
+}
+
+.delete-image-btn:hover {
+ background-color: #c0392b;
+ border-color: #c0392b;
+ transform: translateY(-1px);
+}
+
+/* 涓婁紶鍥剧墖鎸夐挳鏍峰紡 */
+.tablet-upload-btn {
+ background: linear-gradient(135deg, #2ecc71 0%, #27ae60 100%);
+ border: none;
+ border-radius: 8px;
+ padding: 12px 20px;
+ color: white;
+ font-weight: 600;
+ font-size: 14px;
+ cursor: pointer;
+ transition: all 0.3s ease;
+ box-shadow: 0 4px 12px rgba(46, 204, 113, 0.3);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ min-height: 48px;
+ margin: 0;
+}
+
+.tablet-upload-btn:hover {
+ background: linear-gradient(135deg, #27ae60 0%, #229954 100%);
+ transform: translateY(-2px);
+ box-shadow: 0 6px 16px rgba(46, 204, 113, 0.4);
+}
+
+.btn-content {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+
+.btn-icon {
+ font-size: 18px;
+}
+
+.btn-text {
+ font-size: 14px;
+ font-weight: 600;
+}
+
+/* 鍝嶅簲寮忚璁� */
+@media (min-width: 768px) {
+ .section-body {
+ padding: 40px;
+ }
+
+ .validation-hint {
+ padding: 25px;
+ margin-bottom: 30px;
+ }
+
+ .validation-title {
+ font-size: 18px;
+ }
+
+ .requirement-item {
+ padding: 12px 18px;
+ }
+
+ .requirement-text {
+ font-size: 15px;
+ }
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3