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/XJ/detail.vue |  879 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 817 insertions(+), 62 deletions(-)

diff --git a/pages/QC/XJ/detail.vue b/pages/QC/XJ/detail.vue
index a3e9ebe..1013148 100644
--- a/pages/QC/XJ/detail.vue
+++ b/pages/QC/XJ/detail.vue
@@ -66,11 +66,6 @@
           </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>
@@ -82,16 +77,31 @@
     <view class="section">
       <view class="section-header">妫�楠岀粨鏋滃綍鍏�</view>
       <view class="section-body">
-        <view class="inspection-hint">
-          <view class="hint-text">娌℃湁鏈�澶у�煎拰鏈�灏忓�兼椂濉啓0锛堟湭閫氳繃妫�楠岋級鎴�1锛堥�氳繃妫�楠岋級</view>
+        <!-- 楠岃瘉鎻愮ず -->
+        <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">
             <input v-if="tableData.length < formData.levelNum"
               v-model="formData.fcheckResu"
-              type="number"
+              type="text"
               class="result-input"
-              placeholder="璇疯緭鍏ユ楠岀粨鏋�"
+              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"
@@ -101,12 +111,24 @@
       </view>
     </view>
 
-    <!-- 鍥剧墖棰勮 -->
-    <view v-if="isShowImg" class="section">
-      <view class="section-header">鐩稿叧鍥剧墖</view>
+    <!-- 鍥剧墖棰勮 - 鏀寔澶氬浘鐗� -->
+    <view v-if="imageList && imageList.length > 0" class="section">
+      <view class="section-header">
+        <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>
@@ -122,7 +144,7 @@
       <view v-for="(item, index) in tableData" :key="index" class="table-row">
         <view class="td">{{ index + 1 }}</view>
         <view class="td">
-          <view :class="['result-badge', item.fstand === '鈭�' ? 'OK' : 'NG']">
+          <view class="result-badge" :class="(item.fcheckResu === 'OK' || item.fcheckResu === '1' || item.fcheckResu == 1) ? 'OK' : 'NG'">
             {{ item.fcheckResu }}
           </view>
         </view>
@@ -139,8 +161,24 @@
 
     <!-- 鎿嶄綔鎸夐挳 -->
     <view class="action-buttons">
-      <button class="action-btn warning" @click="saveRemarks">娣诲姞涓嶅悎鏍兼弿杩�</button>
-      <button class="action-btn primary" @click="viewAttachmentInfo">鏌ョ湅闄勪欢淇℃伅</button>
+      <button class="btn upload-btn" @click="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" @click="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>
 
     <!-- 淇敼涓嶅悎鏍兼弿杩板脊鍑烘 -->
@@ -359,7 +397,8 @@
       editData: {},
       tableData: [],
       isShowImg: false,
-      base64Image:"",
+      base64Image: "",
+      imageList: [],  // 澶氬浘鐗囧垪琛�
       remarks: "",
       remarksPopup: false,
       
@@ -383,14 +422,61 @@
       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.imageList && this.imageList.length > 0;
+    },
+    
+    // 鍒ゆ柇鏄惁宸插~鍐欎笉鑹弿杩�
+    hasRemarks() {
+      return this.formData.remarks && this.formData.remarks.trim() !== '';
+    },
+    
 
     previewImage() {
       uni.previewImage({
         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 "鏀逛负鍚堟牸";
@@ -417,18 +503,37 @@
         }
         count = 1;
       } 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 === 'NG') {
+        // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
+        if (!this.imageList || this.imageList.length === 0) {
+          this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
+          return;
+        }
+        
+        // 妫�鏌ユ槸鍚﹀凡濉啓涓嶈壇鎻忚堪
+        if (!this.formData.remarks || this.formData.remarks.trim() === '') {
+          this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤诲~鍐欎笉鑹弿杩帮紒");
+          return;
+        }
       }
 
       this.formData.updater = this.$loginInfo.account;
@@ -461,9 +566,29 @@
 
         this.tableData = res.data.tbBillList.itemXj02s;
 
-        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.formData.imageData.length > 0) {
+          // 鍚戝悗鍏煎锛氬鏋滃彧鏈夊崟寮犲浘鐗囨暟鎹�
+          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) {
@@ -503,17 +628,34 @@
           fstand = "脳";
         }
       } 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 === 'NG') {
+        // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
+        if (!this.imageList || this.imageList.length === 0) {
+          this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
+          return;
+        }
+        
+        // 妫�鏌ユ槸鍚﹀凡濉啓涓嶈壇鎻忚堪
+        if (!this.formData.remarks || this.formData.remarks.trim() === '') {
+          this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤诲~鍐欎笉鑹弿杩帮紒");
           return;
         }
       }
@@ -539,11 +681,27 @@
     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 == 'NG') {
+        // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
+        if (!this.imageList || this.imageList.length === 0) {
+          this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
+          return;
+        }
+        
+        // 妫�鏌ユ槸鍚﹀凡濉啓涓嶈壇鎻忚堪
+        if (!this.formData.remarks || this.formData.remarks.trim() === '') {
+          this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤诲~鍐欎笉鑹弿杩帮紒");
+          return;
+        }
       }
 
       this.$post({
@@ -819,6 +977,250 @@
           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: 9, // 鏈�澶氶�夋嫨9寮犲浘鐗�
+        sizeType: ['compressed'], // 鍘嬬缉鍥剧墖
+        sourceType: sourceType, // 鏍规嵁鐢ㄦ埛閫夋嫨璁剧疆鏉ユ簮
+        success: (res) => {
+          const tempFilePaths = res.tempFilePaths;
+          
+          // 濡傛灉鏄媿鐓э紝鐩存帴涓婁紶锛堝崟寮狅級
+          if (sourceType.includes('camera')) {
+            this.uploadImageToServer(tempFilePaths[0]);
+          } else {
+            // 鐩稿唽閫夋嫨锛屾壒閲忎笂浼�
+            this.uploadMultipleImages(tempFilePaths);
+          }
+        },
+        fail: (error) => {
+          console.error('閫夋嫨鍥剧墖澶辫触:', error);
+          let errorMessage = '閫夋嫨鍥剧墖澶辫触';
+          if (sourceType.includes('camera')) {
+            errorMessage = '鎷嶇収澶辫触锛岃妫�鏌ョ浉鏈烘潈闄�';
+          }
+          uni.showToast({
+            title: errorMessage,
+            icon: 'none'
+          });
+        }
+      });
+    },
+
+    // 鎵归噺涓婁紶鍥剧墖
+    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 + '/XJ/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();
+      });
+    },
+    
+    // 鏄剧ず鍥剧墖棰勮纭锛堜富瑕佺敤浜庢媿鐓у悗鐨勭‘璁わ級
+    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('瑙f瀽涓婁紶缁撴灉澶辫触:', 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(imageId = null) {
+      uni.showLoading({
+        title: '鍒犻櫎涓�...'
+      });
+
+      const data = {
+        id: this.id
+      };
+      
+      // 濡傛灉浼犲叆浜� imageId锛屽垯鍒犻櫎鍗曞紶鍥剧墖
+      if (imageId !== null && imageId !== undefined && imageId !== 0) {
+        data.imageId = imageId;
+      }
+
+      this.$post({
+        url: '/XJ/DeleteImageFromPicture',
+        data: data
+      }).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) {
@@ -880,6 +1282,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 {
@@ -935,38 +1371,90 @@
   color: #721c24;
 }
 
-/* 妫�楠岃緭鍏ュ尯 */
-.inspection-hint {
-  background-color: #fff3cd;
-  padding: 10px;
-  border-radius: 4px;
-  margin-bottom: 15px;
+/* 楠岃瘉鎻愮ず鏍峰紡 */
+.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);
 }
 
-.hint-text {
-  font-size: 12px;
-  color: #856404;
+.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;
 }
 
 .input-group {
-  display: flex;
-  align-items: center;
-  margin-bottom: 15px;
+  margin: 16px 0;
 }
 
 .input-wrapper {
   display: flex;
   gap: 12px;
-  width: 100%;
 }
 
 .result-input {
   flex: 1;
-  padding: 8px 12px;
-  border: 1px solid #ddd;
+  height: 45px;
+  padding: 0 12px;
+  border: 1px solid #DCDFE6;
   border-radius: 4px;
   font-size: 14px;
-  background-color: white;
 }
 
 .btn {
@@ -1062,35 +1550,133 @@
 
 /* 鎿嶄綔鎸夐挳 */
 .action-buttons {
+  margin-top: 20px;
   display: flex;
-  flex-direction: column;
-  gap: 10px;
+  justify-content: flex-end;
+  gap: 12px;
   margin-bottom: 20px;
 }
 
 .action-btn {
-  padding: 12px 20px;
+  padding: 8px 20px;
+  border-radius: 4px;
+
+  &.primary-btn {
+    background-color: #3498db;
+    color: #fff;
+  }
+
+  &.cancel-btn {
+    background-color: #95a5a6;
+    color: #fff;
+  }
+
+  &.success {
+    background-color: #2ecc71;
+    color: #fff;
+  }
+}
+
+.btn {
+  padding: 8px 20px;
+  border-radius: 4px;
   border: none;
-  border-radius: 6px;
   font-size: 14px;
-  font-weight: 500;
   cursor: pointer;
   transition: all 0.2s;
+
+  &.upload-btn {
+    background-color: #f39c12;
+    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(243, 156, 18, 0.3);
+  }
+
+  &.upload-btn:hover {
+    background-color: #e67e22;
+    transform: translateY(-2px);
+    box-shadow: 0 6px 16px rgba(243, 156, 18, 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);
+  }
 }
 
-.action-btn.primary {
-  background-color: #3498db;
+/* 骞虫澘涓婁紶鎸夐挳鏍峰紡 */
+.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;
 }
 
-.action-btn.secondary {
-  background-color: #95a5a6;
-  color: white;
+.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);
 }
 
-.action-btn.warning {
-  background-color: #f39c12;
-  color: white;
+.btn-content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+}
+
+.btn-icon {
+  font-size: 18px;
+}
+
+.btn-text {
+  font-size: 14px;
+  font-weight: 600;
 }
 
 /* 寮瑰嚭妗嗘牱寮� */
@@ -1179,6 +1765,64 @@
   .td {
     justify-content: center;
     margin-bottom: 8px;
+  }
+}
+
+/* 骞虫澘浼樺寲鏍峰紡 */
+@media (min-width: 768px) and (max-width: 1024px) {
+  .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) {
+  .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;
   }
 }
 
@@ -1596,4 +2240,115 @@
   transform: translateY(-1px);
   box-shadow: 0 2px 8px rgba(0,0,0,0.15);
 }
+
+/* 澶氬浘鐗囧垪琛ㄦ牱寮� */
+.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;
+  }
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3