From f63e51553b520b5dd760ba186d9b274ed246a64a Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 16 十月 2025 14:27:18 +0800
Subject: [PATCH] SJ,XJ,RKJ单独检验项目拍照+提交限制
---
pages/QC/RKJ/detail.vue | 540 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 538 insertions(+), 2 deletions(-)
diff --git a/pages/QC/RKJ/detail.vue b/pages/QC/RKJ/detail.vue
index e34f590..89a88a3 100644
--- a/pages/QC/RKJ/detail.vue
+++ b/pages/QC/RKJ/detail.vue
@@ -101,6 +101,25 @@
<view class="inspection-hint">
<view class="hint-text">娌℃湁鏈�澶у�煎拰鏈�灏忓�兼椂濉啓0锛堟湭閫氳繃妫�楠岋級鎴�1锛堥�氳繃妫�楠岋級</view>
</view>
+
+ <!-- 涓嶅悎鏍兼楠岄」鐩彁绀� -->
+ <view class="validation-hint" v-if="isUnqualifiedResult()">
+ <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(), 'required': !hasImage() }">
+ <text class="requirement-icon">{{ hasImage() ? '鉁�' : '鉂�' }}</text>
+ <text class="requirement-text">涓婁紶鍥剧墖</text>
+ </view>
+ <view class="requirement-item" :class="{ 'completed': hasRemarks(), 'required': !hasRemarks() }">
+ <text class="requirement-icon">{{ hasRemarks() ? '鉁�' : '鉂�' }}</text>
+ <text class="requirement-text">濉啓涓嶈壇鎻忚堪</text>
+ </view>
+ </view>
+ </view>
+ </view>
+
<view class="input-group">
<view class="input-wrapper">
<input v-if="tableData.length < formData.levelNum"
@@ -118,7 +137,12 @@
</view>
<!-- 鍥剧墖棰勮 -->
<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"/>
@@ -163,6 +187,12 @@
<view class="action-buttons">
<button class="action-btn warning" @click="saveRemarks">娣诲姞涓嶅悎鏍兼弿杩�</button>
<button class="action-btn primary" @click="viewAttachmentInfo">鏌ョ湅妫�楠岄」鐩�</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>
<!-- 淇敼妫�楠岀粨鏋滃脊鍑烘 -->
@@ -395,6 +425,29 @@
}
},
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() !== '';
+ },
previewImage() {
uni.previewImage({
@@ -444,6 +497,21 @@
count = count - this.tableData.length;
}
+ // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
+ 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({
@@ -474,9 +542,14 @@
this.tableData = res.data.tbBillList.itemXj02s;
- if (this.formData.imageData) {
+ // 澶勭悊鍥剧墖鏄剧ず鐘舵��
+ if (this.formData.imageData && this.formData.imageData.length > 0) {
this.isShowImg = true;
this.base64Image = 'data:image/jpeg;base64,' + this.formData.imageData;
+ } else {
+ // 濡傛灉娌℃湁鍥剧墖鏁版嵁锛岄殣钘忓浘鐗囨樉绀哄尯鍩�
+ this.isShowImg = false;
+ this.base64Image = '';
}
//maxValue minValue standardValue
@@ -534,6 +607,21 @@
}
}
+ // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
+ 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;
this.$post({
@@ -567,6 +655,21 @@
if (item.fcheckResu == '1') {
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({
@@ -870,6 +973,189 @@
current: this.previewContent
});
}
+ },
+
+ // 涓婁紶鍥剧墖鏂规硶 - 淇濆瓨鍒板綋鍓嶆楠岄」鐩殑PICTURE瀛楁锛圠ONG RAW绫诲瀷锛�
+ // 鍚庣浼氳嚜鍔ㄧ敓鎴愭椂闂存埑鏂囦欢鍚嶏紝鏍煎紡锛�1746945271304.jpg
+ uploadImage() {
+ // 鏄剧ず閫夋嫨寮圭獥锛岃鐢ㄦ埛閫夋嫨鎷嶇収鎴栦粠鐩稿唽閫夋嫨
+ uni.showActionSheet({
+ itemList: ['鎷嶇収', '浠庣浉鍐岄�夋嫨'],
+ success: (res) => {
+ const sourceType = res.tapIndex === 0 ? ['camera'] : ['album'];
+ this.chooseImageWithSource(sourceType);
+ },
+ fail: (error) => {
+ console.log('鐢ㄦ埛鍙栨秷閫夋嫨:', error);
+ }
+ });
+ },
+
+ // 鏍规嵁閫夋嫨鐨勬潵婧愰�夋嫨鍥剧墖
+ chooseImageWithSource(sourceType) {
+ uni.chooseImage({
+ count: 1, // 鏈�澶氶�夋嫨1寮犲浘鐗�
+ sizeType: ['compressed', 'original'], // 鎻愪緵鍘嬬缉鍜屽師鍥鹃�夐」
+ sourceType: sourceType, // 鏍规嵁鐢ㄦ埛閫夋嫨璁剧疆鏉ユ簮
+ success: (res) => {
+ const tempFilePath = res.tempFilePaths[0];
+
+ // 濡傛灉鏄媿鐓э紝鏄剧ず棰勮纭
+ if (sourceType.includes('camera')) {
+ this.showImagePreview(tempFilePath);
+ } else {
+ this.uploadImageToServer(tempFilePath);
+ }
+ },
+ fail: (error) => {
+ console.error('閫夋嫨鍥剧墖澶辫触:', error);
+ let errorMessage = '閫夋嫨鍥剧墖澶辫触';
+ if (sourceType.includes('camera')) {
+ errorMessage = '鎷嶇収澶辫触锛岃妫�鏌ョ浉鏈烘潈闄�';
+ }
+ uni.showToast({
+ title: errorMessage,
+ icon: 'none'
+ });
+ }
+ });
+ },
+
+ // 鏄剧ず鍥剧墖棰勮纭锛堜富瑕佺敤浜庢媿鐓у悗鐨勭‘璁わ級
+ showImagePreview(imagePath) {
+ uni.previewImage({
+ urls: [imagePath],
+ current: imagePath,
+ success: () => {
+ // 鐢ㄦ埛鏌ョ湅鍥剧墖鍚庯紝璇㈤棶鏄惁浣跨敤姝ゅ浘鐗�
+ uni.showModal({
+ title: '纭浣跨敤姝ゅ浘鐗�',
+ content: '鏄惁浣跨敤鍒氭墠鎷嶆憚鐨勫浘鐗囷紵',
+ confirmText: '浣跨敤',
+ cancelText: '閲嶆柊鎷嶆憚',
+ success: (res) => {
+ if (res.confirm) {
+ this.uploadImageToServer(imagePath);
+ } else if (res.cancel) {
+ // 鐢ㄦ埛閫夋嫨閲嶆柊鎷嶆憚
+ this.chooseImageWithSource(['camera']);
+ }
+ }
+ });
+ },
+ fail: () => {
+ // 棰勮澶辫触锛岀洿鎺ヤ笂浼�
+ this.uploadImageToServer(imagePath);
+ }
+ });
+ },
+
+ // 涓婁紶鍥剧墖鍒版湇鍔″櫒骞朵繚瀛樺埌鏁版嵁搴揚ICTURE瀛楁锛圠ONG RAW绫诲瀷锛�
+ // 鍚庣浼氳嚜鍔ㄧ敓鎴愭椂闂存埑鏂囦欢鍚嶅瓨鍌ㄥ埌TPICTURENAME瀛楁
+ uploadImageToServer(filePath) {
+ uni.showLoading({
+ title: '涓婁紶涓�...'
+ });
+
+ // 鏋勫缓涓婁紶URL
+ const uploadUrl = this.$store.state.serverInfo.serverAPI + "/RKJ/UploadImageToPicture";
+
+ uni.uploadFile({
+ url: uploadUrl,
+ filePath: filePath,
+ name: 'file',
+ formData: {
+ id: this.id, // 褰撳墠妫�楠岄」鐩甀D
+ gid: this.gid,
+ billNo: this.billNo,
+ createBy: this.$loginInfo.account
+ },
+ success: (uploadRes) => {
+ uni.hideLoading();
+ try {
+ const result = JSON.parse(uploadRes.data);
+ if (result.status === 0) {
+ uni.showToast({
+ title: '鍥剧墖淇濆瓨鎴愬姛',
+ icon: 'success'
+ });
+ // 鍒锋柊椤甸潰鏁版嵁
+ this.refreshResult();
+ } else {
+ uni.showToast({
+ title: result.message || '鍥剧墖淇濆瓨澶辫触',
+ icon: 'none'
+ });
+ }
+ } catch (error) {
+ console.error('瑙ｆ瀽涓婁紶缁撴灉澶辫触:', error);
+ uni.showToast({
+ title: '鍥剧墖淇濆瓨澶辫触',
+ icon: 'none'
+ });
+ }
+ },
+ fail: (error) => {
+ uni.hideLoading();
+ console.error('涓婁紶澶辫触:', error);
+ uni.showToast({
+ title: '鍥剧墖淇濆瓨澶辫触',
+ icon: 'none'
+ });
+ }
+ });
+ },
+
+ // 鍒犻櫎鍥剧墖
+ deleteImage() {
+ uni.showModal({
+ title: '纭鍒犻櫎',
+ content: '纭畾瑕佸垹闄ゅ綋鍓嶅浘鐗囧悧锛熷垹闄ゅ悗鏃犳硶鎭㈠銆�',
+ confirmText: '鍒犻櫎',
+ cancelText: '鍙栨秷',
+ confirmColor: '#e74c3c',
+ success: (res) => {
+ if (res.confirm) {
+ this.deleteImageFromServer();
+ }
+ }
+ });
+ },
+
+ // 浠庢湇鍔″櫒鍒犻櫎鍥剧墖
+ deleteImageFromServer() {
+ uni.showLoading({
+ title: '鍒犻櫎涓�...'
+ });
+
+ this.$post({
+ url: "/RKJ/DeleteImageFromPicture",
+ data: {
+ id: this.id // 褰撳墠妫�楠岄」鐩甀D
+ }
+ }).then(res => {
+ uni.hideLoading();
+ if (res.status === 0) {
+ uni.showToast({
+ title: '鍥剧墖鍒犻櫎鎴愬姛',
+ icon: 'success'
+ });
+ // 鍒锋柊椤甸潰鏁版嵁
+ this.refreshResult();
+ } else {
+ uni.showToast({
+ title: res.message || '鍥剧墖鍒犻櫎澶辫触',
+ icon: 'none'
+ });
+ }
+ }).catch(error => {
+ uni.hideLoading();
+ console.error('鍒犻櫎鍥剧墖澶辫触:', error);
+ uni.showToast({
+ title: '鍥剧墖鍒犻櫎澶辫触',
+ icon: 'none'
+ });
+ });
}
},
onLoad(options) {
@@ -926,6 +1212,18 @@
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 {
@@ -964,6 +1262,73 @@
.hint-text {
font-size: 12px;
color: #856404;
+}
+
+/* 楠岃瘉鎻愮ず鏍峰紡 */
+.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: 6px 10px;
+ border-radius: 6px;
+ transition: all 0.3s ease;
+}
+
+.requirement-item.completed {
+ background-color: #d4edda;
+ border: 1px solid #c3e6cb;
+}
+
+.requirement-item.required {
+ background-color: #f8d7da;
+ border: 1px solid #f5c6cb;
+}
+
+.requirement-icon {
+ font-size: 16px;
+ flex-shrink: 0;
+}
+
+.requirement-text {
+ font-size: 13px;
+ font-weight: 500;
+ color: #2c3e50;
}
.input-group {
@@ -1154,6 +1519,73 @@
background-color: $warning-color;
color: white;
}
+
+ &.success {
+ background-color: $success-color;
+ color: white;
+ }
+}
+
+.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;
+}
+
+.delete-image-btn:active {
+ background-color: #a93226;
+ border-color: #a93226;
+}
+
+/* 骞虫澘涓婁紶鎸夐挳鏍峰紡 */
+.tablet-upload-btn {
+ position: relative;
+ overflow: hidden;
+ background: linear-gradient(135deg, #2ecc71 0%, #27ae60 100%);
+ box-shadow: 0 4px 15px rgba(46, 204, 113, 0.3);
+ transition: all 0.3s ease;
+}
+
+.tablet-upload-btn:hover {
+ transform: translateY(-2px);
+ box-shadow: 0 6px 20px rgba(46, 204, 113, 0.4);
+}
+
+.tablet-upload-btn:active {
+ transform: translateY(0);
+ box-shadow: 0 2px 10px rgba(46, 204, 113, 0.3);
+}
+
+.btn-content {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ gap: 8px;
+ padding: 8px;
+}
+
+.btn-icon {
+ font-size: 24px;
+ line-height: 1;
+}
+
+.btn-text {
+ font-size: 14px;
+ font-weight: 600;
+ line-height: 1.2;
+ text-align: center;
}
.overlay {
@@ -1670,4 +2102,108 @@
flex-direction: column;
}
}
+
+/* 骞虫澘浼樺寲鏍峰紡 */
+@media (min-width: 768px) and (max-width: 1024px) {
+ .action-buttons {
+ display: grid;
+ grid-template-columns: repeat(3, 1fr);
+ gap: 15px;
+ margin-bottom: 30px;
+ }
+
+ .action-btn {
+ padding: 20px 16px;
+ font-size: 16px;
+ min-height: 80px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .tablet-upload-btn {
+ min-height: 100px;
+ }
+
+ .btn-content {
+ gap: 12px;
+ padding: 12px;
+ }
+
+ .btn-icon {
+ font-size: 32px;
+ }
+
+ .btn-text {
+ font-size: 16px;
+ }
+
+ .info-grid {
+ grid-template-columns: repeat(2, 1fr);
+ gap: 20px;
+ }
+
+ .section-body {
+ padding: 30px;
+ }
+}
+
+/* 澶у睆骞虫澘浼樺寲 */
+@media (min-width: 1024px) {
+ .action-buttons {
+ display: grid;
+ grid-template-columns: repeat(3, 1fr);
+ gap: 20px;
+ margin-bottom: 40px;
+ }
+
+ .action-btn {
+ padding: 25px 20px;
+ font-size: 18px;
+ min-height: 100px;
+ }
+
+ .tablet-upload-btn {
+ min-height: 120px;
+ }
+
+ .btn-content {
+ gap: 15px;
+ padding: 15px;
+ }
+
+ .btn-icon {
+ font-size: 36px;
+ }
+
+ .btn-text {
+ font-size: 18px;
+ }
+
+ .info-grid {
+ grid-template-columns: repeat(3, 1fr);
+ gap: 25px;
+ }
+
+ .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