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/List.vue | 50 +
pages/QC/XJ/Add.vue | 2
pages/QC/RKJ/detail.vue | 540 +++++++++++++++++
pages/QC/SJ/detail.vue | 413 +++++++++++++
pages/QC/RKJ/Add.vue | 133 ++-
manifest.json | 2
pages/QC/SJ/Add.vue | 105 ++
pages/QC/XJ/detail.vue | 558 +++++++++++++++++
store/index.js | 4
9 files changed, 1,720 insertions(+), 87 deletions(-)
diff --git a/manifest.json b/manifest.json
index dd6db84..e219456 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "GS-MES-AP",
"appid" : "__UNI__F08FAE3",
"description" : "",
- "versionName" : "1.1.3.9",
+ "versionName" : "1.1.4.1",
"versionCode" : 1,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/QC/RKJ/Add.vue b/pages/QC/RKJ/Add.vue
index 3a0fa04..00437a2 100644
--- a/pages/QC/RKJ/Add.vue
+++ b/pages/QC/RKJ/Add.vue
@@ -1191,51 +1191,102 @@
return;
}
- // 妫�鏌ラ拤閽夋帹閫佹潯浠讹細PSZT涓哄緟鍒わ紝涓斾笉鑹師鍥犮�佷笉鑹弿杩般�佹墍灞炶溅闂翠笉涓虹┖
- const shouldPushToDingTalk = this.PSTYPE === '寰呭垽' &&
- this.badreason &&
- this.formData.fngDesc &&
- this.WORKSHOP;
+ // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
+ this.validateUnqualifiedItems().then(() => {
+ // 妫�鏌ラ拤閽夋帹閫佹潯浠讹細PSZT涓哄緟鍒わ紝涓斾笉鑹師鍥犮�佷笉鑹弿杩般�佹墍灞炶溅闂翠笉涓虹┖
+ const shouldPushToDingTalk = this.PSTYPE === '寰呭垽' &&
+ this.badreason &&
+ this.formData.fngDesc &&
+ this.WORKSHOP;
- let confirmMessage = '纭畾瑕佹彁浜ゆ妫�楠屽崟鍚楋紵鎻愪氦鍚庡皢鏃犳硶淇敼銆�';
- if (shouldPushToDingTalk) {
- confirmMessage += '\n\n婊¤冻閽夐拤鎺ㄩ�佹潯浠讹紝灏嗚嚜鍔ㄦ帹閫佸埌閽夐拤瀹℃壒娴佺▼銆�';
- }
-
- // 纭鎻愪氦
- uni.showModal({
- title: '纭鎻愪氦',
- content: confirmMessage,
- success: (res) => {
- if (res.confirm) {
- this.$post({
- url: "/RKJ/submitInspection",
- data: {
- id: this.formData.id,
- userNo: this.$loginInfo.account
- }
- }).then(res => {
- if (res.status == 0) {
- let successMessage = "妫�楠屽崟鎻愪氦鎴愬姛锛�";
- if (shouldPushToDingTalk) {
- successMessage += "\n宸叉帹閫佸埌閽夐拤瀹℃壒娴佺▼銆�";
- }
- this.$showMessage(successMessage);
- // 鏇存柊鏈湴鐘舵��
- this.formData.fsubmit = 1;
- // 鍒锋柊鏁版嵁
- this.init();
- } else {
- this.$showMessage(res.message || "鎻愪氦澶辫触");
- }
- }).catch(error => {
- console.error("鎻愪氦澶辫触:", error);
- this.$showMessage("鎻愪氦澶辫触锛岃閲嶈瘯");
- });
- }
+ let confirmMessage = '纭畾瑕佹彁浜ゆ妫�楠屽崟鍚楋紵鎻愪氦鍚庡皢鏃犳硶淇敼銆�';
+ if (shouldPushToDingTalk) {
+ confirmMessage += '\n\n婊¤冻閽夐拤鎺ㄩ�佹潯浠讹紝灏嗚嚜鍔ㄦ帹閫佸埌閽夐拤瀹℃壒娴佺▼銆�';
}
+
+ // 纭鎻愪氦
+ uni.showModal({
+ title: '纭鎻愪氦',
+ content: confirmMessage,
+ success: (res) => {
+ if (res.confirm) {
+ this.$post({
+ url: "/RKJ/submitInspection",
+ data: {
+ id: this.formData.id,
+ userNo: this.$loginInfo.account
+ }
+ }).then(res => {
+ if (res.status == 0) {
+ let successMessage = "妫�楠屽崟鎻愪氦鎴愬姛锛�";
+ if (shouldPushToDingTalk) {
+ successMessage += "\n宸叉帹閫佸埌閽夐拤瀹℃壒娴佺▼銆�";
+ }
+ this.$showMessage(successMessage);
+ // 鏇存柊鏈湴鐘舵��
+ this.formData.fsubmit = 1;
+ // 鍒锋柊鏁版嵁
+ this.init();
+ } else {
+ this.$showMessage(res.message || "鎻愪氦澶辫触");
+ }
+ }).catch(error => {
+ console.error("鎻愪氦澶辫触:", error);
+ this.$showMessage("鎻愪氦澶辫触锛岃閲嶈瘯");
+ });
+ }
+ }
+ });
+ }).catch(error => {
+ this.$showMessage(error);
});
},
+
+ // 楠岃瘉涓嶅悎鏍兼楠岄」鐩�
+ async validateUnqualifiedItems() {
+ const unqualifiedItems = this.tableData.filter(item => item.result === '涓嶅悎鏍�');
+
+ if (unqualifiedItems.length === 0) {
+ return Promise.resolve();
+ }
+
+ // 妫�鏌ユ瘡涓笉鍚堟牸椤圭洰鏄惁鏈夊浘鐗囧拰鎻忚堪
+ for (const item of unqualifiedItems) {
+ try {
+ const detail = await this.getInspectionItemDetail(item.id);
+ if (!detail.hasImage || !detail.hasRemarks) {
+ const missingItems = [];
+ if (!detail.hasImage) missingItems.push('鍥剧墖');
+ if (!detail.hasRemarks) missingItems.push('涓嶈壇鎻忚堪');
+
+ throw new Error(`妫�楠岄」鐩�"${item.projName}"涓嶅悎鏍硷紝浣嗙己灏戯細${missingItems.join('銆�')}锛岃瀹屽杽鍚庨噸鏂版彁浜わ紒`);
+ }
+ } catch (error) {
+ throw error;
+ }
+ }
+
+ return Promise.resolve();
+ },
+
+ // 鑾峰彇妫�楠岄」鐩缁嗕俊鎭�
+ getInspectionItemDetail(itemId) {
+ return new Promise((resolve, reject) => {
+ this.$post({
+ url: "/RKJ/getXjDetail02ById",
+ data: { id: itemId }
+ }).then(res => {
+ const itemData = res.data.tbBillList.itemXj01;
+ resolve({
+ hasImage: itemData.imageData && itemData.imageData.length > 0,
+ hasRemarks: itemData.remarks && itemData.remarks.trim() !== ''
+ });
+ }).catch(error => {
+ reject('鑾峰彇妫�楠岄」鐩鎯呭け璐�');
+ });
+ });
+ },
+
viewAttachmentInfo() {
this.showAttachmentPopup = true; // 鍏堝脊绐�
this.attachmentsLoading = true;
diff --git a/pages/QC/RKJ/List.vue b/pages/QC/RKJ/List.vue
index 6f84ac2..c4d0113 100644
--- a/pages/QC/RKJ/List.vue
+++ b/pages/QC/RKJ/List.vue
@@ -142,6 +142,8 @@
onLoad() {
//椤甸潰鍔犺浇鏃惰皟鐢ㄧ殑浜嬩欢
this.init();
+ // 鍚屾椂鑾峰彇鏈彁浜ゅ拰宸叉彁浜ょ殑鏁伴噺
+ this.getCounts();
},
methods: {
// ===== 鏂板鏌ヨ鏉′欢閫夋嫨鏂规硶 =====
@@ -158,18 +160,53 @@
this.selectedField = fieldMap[this.optionsIndex];
},
+ // ===== 鏂板鑾峰彇鏁伴噺缁熻鏂规硶 =====
+ getCounts() {
+ // 鑾峰彇鏈彁浜ゆ暟閲� - fsubmit = 0 鎴栫┖鍊�
+ this.$post({
+ url: "/RKJ/getPage",
+ data: {
+ pageIndex: 1,
+ limit: 1, // 鍙渶瑕佽幏鍙栨�绘暟锛屼笉闇�瑕佸叿浣撴暟鎹�
+ createUser: this.$loginInfo.account,
+ fsubmit: "0" // 鏈彁浜わ細fsubmit = 0 鎴栫┖鍊�
+ }
+ }).then(res => {
+ this.unsubmittedCount = res.data.totalCount || 0;
+ }).catch(() => {
+ this.unsubmittedCount = 0;
+ });
+
+ // 鑾峰彇宸叉彁浜ゆ暟閲� - fsubmit = 1
+ this.$post({
+ url: "/RKJ/getPage",
+ data: {
+ pageIndex: 1,
+ limit: 1, // 鍙渶瑕佽幏鍙栨�绘暟锛屼笉闇�瑕佸叿浣撴暟鎹�
+ createUser: this.$loginInfo.account,
+ fsubmit: "1" // 宸叉彁浜わ細fsubmit = 1
+ }
+ }).then(res => {
+ this.submittedCount = res.data.totalCount || 0;
+ }).catch(() => {
+ this.submittedCount = 0;
+ });
+ },
+
//鎼滅储妗嗙偣鍑讳簨浠�
btnclicked() {
this.pageIndex = 1;
this.data = [];
this.init();
+ // 鎼滅储鍚庨噸鏂拌幏鍙栨暟閲忕粺璁�
+ this.getCounts();
},
init() {
//鑾峰彇鎼滅储鏉′欢鍐呭
let SearchValue = this.searchValue;
- let fsubmit = null; // 榛樿鏌ヨ鎵�鏈夋湭鎻愪氦鐨勮褰曪紙鍖呮嫭fsubmit = 0鍜宖submit涓虹┖锛�
+ let fsubmit = "0"; // 榛樿鏌ヨ鏈彁浜ょ殑璁板綍锛坒submit = 0鎴栫┖鍊硷級
if (this.current == 1) {
fsubmit = "1"; // 宸叉彁浜�
}
@@ -204,13 +241,6 @@
}
this.totalCount = res.data.totalCount;
this.totalPage = Math.ceil(this.totalCount / this.limit);
-
- // 璁剧疆鏁伴噺缁熻 - 鍙傝�僗J鐨勫疄鐜版柟寮�
- if (this.current === 1) {
- this.submittedCount = res.data.totalCount;
- } else {
- this.unsubmittedCount = res.data.totalCount;
- }
this.noData = this.pageIndex >= this.totalPage;
this.isLoading = false; // 缁撴潫鍔犺浇
@@ -230,6 +260,8 @@
this.data = [];
this.pageIndex = 1;
this.init();
+ // 鍒囨崲鏍囩鍚庨噸鏂拌幏鍙栨暟閲忕粺璁�
+ this.getCounts();
}
},
navigateToDetail(item) {
@@ -267,6 +299,8 @@
this.data = [];
//this.current = 0
this.init();
+ // 椤甸潰鏄剧ず鏃堕噸鏂拌幏鍙栨暟閲忕粺璁�
+ this.getCounts();
}
};
</script>
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
diff --git a/pages/QC/SJ/Add.vue b/pages/QC/SJ/Add.vue
index e7778e5..9d3607f 100644
--- a/pages/QC/SJ/Add.vue
+++ b/pages/QC/SJ/Add.vue
@@ -873,35 +873,92 @@
this.SJ_MJIndex = e.mp.detail.value;
this.formData.SJ_MJ = this.SJ_MJList[this.SJ_MJIndex];
},
- submitInspection() {
+ async submitInspection() {
if (this.formData.id) {
- // 鏄剧ず纭鎻愮ず妗�
- uni.showModal({
- title: '纭鎻愪氦',
- content: '纭畾瑕佹彁浜ゆ楠岀粨鏋滃悧锛熸彁浜ゅ悗灏嗘棤娉曚慨鏀广��',
- confirmText: '纭畾鎻愪氦',
- cancelText: '鍙栨秷',
- success: (res) => {
- if (res.confirm) {
- // 鐢ㄦ埛纭鍚庢墽琛屾彁浜�
- this.$post({
- url: "/SJ/SjSubmit",
- data: {
- id: this.formData.id,
- userNo: this.$loginInfo.account
- }
- }).then(res => {
- if (res.data.tbBillList) {
- this.$showMessage("鎻愪氦鎴愬姛");
- this.init();
- }
- });
+ try {
+ // 楠岃瘉涓嶅悎鏍兼楠岄」鐩�
+ await this.validateUnqualifiedItems();
+
+ // 鏄剧ず纭鎻愮ず妗�
+ uni.showModal({
+ title: '纭鎻愪氦',
+ content: '纭畾瑕佹彁浜ゆ楠岀粨鏋滃悧锛熸彁浜ゅ悗灏嗘棤娉曚慨鏀广��',
+ confirmText: '纭畾鎻愪氦',
+ cancelText: '鍙栨秷',
+ success: (res) => {
+ if (res.confirm) {
+ // 鐢ㄦ埛纭鍚庢墽琛屾彁浜�
+ this.$post({
+ url: "/SJ/SjSubmit",
+ data: {
+ id: this.formData.id,
+ userNo: this.$loginInfo.account
+ }
+ }).then(res => {
+ if (res.data.tbBillList) {
+ this.$showMessage("鎻愪氦鎴愬姛");
+ this.init();
+ }
+ });
+ }
}
- }
- });
+ });
+ } catch (error) {
+ this.$showMessage(error.message);
+ }
}
},
+ // 楠岃瘉涓嶅悎鏍兼楠岄」鐩�
+ async validateUnqualifiedItems() {
+ const unqualifiedItems = this.tableData.filter(item => item.result === '涓嶅悎鏍�');
+
+ if (unqualifiedItems.length === 0) {
+ return Promise.resolve();
+ }
+
+ // 妫�鏌ユ瘡涓笉鍚堟牸椤圭洰鏄惁鏈夊浘鐗囧拰鎻忚堪
+ for (const item of unqualifiedItems) {
+ try {
+ const detail = await this.getInspectionItemDetail(item.id);
+ if (!detail.hasImage || !detail.hasRemarks) {
+ const missingItems = [];
+ if (!detail.hasImage) missingItems.push('鍥剧墖');
+ if (!detail.hasRemarks) missingItems.push('涓嶈壇鎻忚堪');
+
+ throw new Error(`妫�楠岄」鐩�"${item.projName}"涓嶅悎鏍硷紝浣嗙己灏戯細${missingItems.join('銆�')}锛岃瀹屽杽鍚庨噸鏂版彁浜わ紒`);
+ }
+ } catch (error) {
+ throw error;
+ }
+ }
+ },
+
+ // 鑾峰彇妫�楠岄」鐩缁嗕俊鎭�
+ async getInspectionItemDetail(itemId) {
+ return new Promise((resolve, reject) => {
+ this.$post({
+ url: "/SJ/getQSItems",
+ data: {
+ pid: this.formData.id,
+ id: itemId
+ }
+ }).then(res => {
+ const item = res.data.tbBillList[0];
+ if (item) {
+ resolve({
+ hasImage: item.imageData && item.imageData.length > 0,
+ hasRemarks: item.remarks && item.remarks.trim() !== ''
+ });
+ } else {
+ reject(new Error('鏃犳硶鑾峰彇妫�楠岄」鐩鎯�'));
+ }
+ }).catch(err => {
+ reject(err);
+ });
+ });
+ },
+
drawingConfirm() {
this.drawingShow = false
this.imageShow = false
diff --git a/pages/QC/SJ/detail.vue b/pages/QC/SJ/detail.vue
index 3c5cd56..b45faff 100644
--- a/pages/QC/SJ/detail.vue
+++ b/pages/QC/SJ/detail.vue
@@ -115,6 +115,24 @@
<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">
@@ -139,6 +157,16 @@
</view>
</view>
</view>
+ </view>
+
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <view class="action-buttons">
+ <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 +208,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 +553,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 +751,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 +804,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 +873,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 +927,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: {
@@ -1128,6 +1233,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) {
@@ -1212,14 +1451,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;
}
@@ -2036,4 +2287,154 @@
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;
+}
+
+.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
diff --git a/pages/QC/XJ/Add.vue b/pages/QC/XJ/Add.vue
index ddfd852..76b532d 100644
--- a/pages/QC/XJ/Add.vue
+++ b/pages/QC/XJ/Add.vue
@@ -1681,7 +1681,7 @@
position: absolute;
font-size: 32px;
font-weight: bold;
- opacity: 0.3;
+ opacity: 0.8;
z-index: 1;
pointer-events: none;
transform: rotate(-15deg);
diff --git a/pages/QC/XJ/detail.vue b/pages/QC/XJ/detail.vue
index a3e9ebe..a63a3b6 100644
--- a/pages/QC/XJ/detail.vue
+++ b/pages/QC/XJ/detail.vue
@@ -85,6 +85,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"
@@ -103,7 +122,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"/>
@@ -141,6 +165,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>
<!-- 淇敼涓嶅悎鏍兼弿杩板脊鍑烘 -->
@@ -383,6 +413,30 @@
return 'result-pending';
},
+ // 鍒ゆ柇褰撳墠妫�楠岀粨鏋滄槸鍚︿负涓嶅悎鏍�
+ 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({
@@ -431,6 +485,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({
@@ -461,9 +530,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 = '';
}
if (this.formData.maxValue && this.formData.minValue && this.formData.standardValue) {
@@ -518,6 +592,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({
@@ -544,6 +633,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({
@@ -819,6 +923,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绫诲瀷锛�
+ // 鍚庣浼氳嚜鍔ㄧ敓鎴愭椂闂存埑鏂囦欢鍚嶅瓨鍌ㄥ埌PICTURENAME瀛楁
+ uploadImageToServer(filePath) {
+ uni.showLoading({
+ title: '涓婁紶涓�...'
+ });
+
+ // 鏋勫缓涓婁紶URL
+ const uploadUrl = this.$store.state.serverInfo.serverAPI + "/XJ/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: "/XJ/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) {
@@ -880,6 +1167,40 @@
font-size: 16px;
font-weight: 600;
color: #2c3e50;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.section-title {
+ flex: 1;
+}
+
+.section-actions {
+ display: flex;
+ gap: 10px;
+}
+
+.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;
}
.section-body {
@@ -946,6 +1267,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 {
@@ -1093,6 +1481,51 @@
color: white;
}
+.action-btn.success {
+ background-color: #2ecc71;
+ color: white;
+}
+
+/* 骞虫澘涓婁紶鎸夐挳鏍峰紡 */
+.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 {
position: fixed;
@@ -1182,6 +1615,127 @@
}
}
+/* 骞虫澘浼樺寲鏍峰紡 */
+@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;
+ }
+
+ .validation-hint {
+ padding: 20px;
+ margin-bottom: 25px;
+ }
+
+ .validation-title {
+ font-size: 16px;
+ }
+
+ .requirement-item {
+ padding: 10px 15px;
+ }
+
+ .requirement-text {
+ font-size: 14px;
+ }
+}
+
+/* 澶у睆骞虫澘浼樺寲 */
+@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;
+ }
+}
+
/* 闄勪欢鐩稿叧鏍峰紡 */
.attachment-list-popup {
width: 80vw;
diff --git a/store/index.js b/store/index.js
index 3fb8f02..d50ed24 100644
--- a/store/index.js
+++ b/store/index.js
@@ -10,9 +10,9 @@
networkFlag:'鍐呯綉',
serverURLInt:'http://192.168.11.251:10055',//鏈嶅姟鍣ㄤ綋妫� 10.0.1.104:10054
serverURL:'http://localhost:10055',//鏈湴璋冭瘯鍦板潃
- serverAPI:'http://localhost:5184/api',//褰撳墠姝ｅ湪浣跨敤鐨勬湇鍔″櫒,榛樿涓哄缃� localhost
+ //serverAPI:'http://localhost:5184/api',//褰撳墠姝ｅ湪浣跨敤鐨勬湇鍔″櫒,榛樿涓哄缃� localhost
//serverAPI:'http://192.168.1.22:10054/api',//鍐呯綉
- //serverAPI:'http://36.26.21.214:10055/api',
+ serverAPI:'http://36.26.21.214:10055/api',
ftpServer:'ftp://36.26.21.214',//FTP鏈嶅姟鍣ㄥ湴鍧�
}
},
--
Gitblit v1.9.3