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/RKJ/List.vue   |   12 
 pages/QC/RKJ/detail.vue |  281 ++++++++++++++--
 pages/QC/SJ/detail.vue  |  307 +++++++++++++++--
 pages/QC/RKJ/Add.vue    |   53 +-
 manifest.json           |    2 
 pages/QC/XJ/detail.vue  |  353 +++++++++++++++++---
 6 files changed, 835 insertions(+), 173 deletions(-)

diff --git a/manifest.json b/manifest.json
index b0c1de2..45a1155 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "GS-MES-AP",
     "appid" : "__UNI__F08FAE3",
     "description" : "",
-    "versionName" : "1.1.4.6",
+    "versionName" : "1.1.4.9",
     "versionCode" : 1,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/QC/RKJ/Add.vue b/pages/QC/RKJ/Add.vue
index bdab1ae..cf1f0f0 100644
--- a/pages/QC/RKJ/Add.vue
+++ b/pages/QC/RKJ/Add.vue
@@ -41,8 +41,8 @@
 
 				<view class="form-row">
 					<label class="form-label required">閫佹鏁伴噺锛�</label>
-					<input type="number" v-model="formData.quantity" placeholder="璇疯緭鍏ラ�佹鏁伴噺" class="large-quantity-input"
-						@input="onQuantityChange" />
+					<input type="number" v-model="formData.sjqty" placeholder="璇疯緭鍏ラ�佹鏁伴噺" class="large-quantity-input"
+						@input="onSjqtyChange" />
 				</view>
 			</view>
 
@@ -79,7 +79,7 @@
 
 		<view class="form-actions">
 			<button class="btn-primary"
-				v-if="!isShowTable && formData.workShop && formData.lineName && formData.rBillNo && formData.quantity"
+				v-if="!isShowTable && formData.workShop && formData.lineName && formData.rBillNo && formData.sjqty"
 				@click="getItem">
 				<text class="btn-icon">鉁�</text>
 				鐢熸垚妫�楠屽崟
@@ -130,8 +130,12 @@
 				<view class="info-value">{{formData.itemModel}}</view>
 			</view>
 			<view class="info-block">
+				<view class="info-label">宸ュ崟鏁伴噺锛�</view>
+				<view class="info-value">{{formData.quantity || formData.planQty}}</view>
+			</view>
+			<view class="info-block">
 				<view class="info-label">閫佹鏁伴噺锛�</view>
-				<view class="info-value highlight">{{formData.quantity}}</view>
+				<view class="info-value highlight">{{formData.sjqty}}</view>
 			</view>
 			<view class="info-block" v-if="formData.remarks">
 				<view class="info-label">涓嶅悎鏍兼弿杩帮細</view>
@@ -474,7 +478,8 @@
 					rbillNo: "",
 					workShop: "", // 宸ヤ綔杞﹂棿
 					lineName: "", // 绾夸綋鍚嶇О
-					quantity: "", // 閫佹鏁伴噺
+					quantity: "", // 宸ュ崟鏁伴噺锛堝師閫佹鏁伴噺瀛楁锛�
+					sjqty: "", // 閫佹鏁伴噺锛堟柊澧炲瓧娈碉級
 					planQty: "", // 宸ュ崟璁″垝鏁伴噺
 					fngDesc: "" // 涓嶈壇鎻忚堪
 				},
@@ -706,8 +711,8 @@
 					data: {
 						from: this.formData,
 						userNo: this.$loginInfo.account,
-						quantity: this.formData.quantity,
-						//moidNum: this.formData.moidNum
+						quantity: this.formData.quantity, // 宸ュ崟鏁伴噺
+						sjqty: this.formData.sjqty, // 閫佹鏁伴噺
 						items: this.tableData
 					}
 				}).then(res => {
@@ -826,39 +831,40 @@
 				this.formData.billNo = data.daa001; // 宸ュ崟鍙蜂綔涓篵illNo
 				this.formData.rbillNo = "鏃犳簮鍗�"; // 閫佹鎵规鍙凤紙浣跨敤榛樿鍊硷級
 				this.formData.itemModel = data.daa004 || ""; // 浜у搧瑙勬牸
-				this.formData.planQty = data.daa008 || ""; // 宸ュ崟鏁伴噺
+				this.formData.planQty = data.daa008 || ""; // 宸ュ崟鏁伴噺锛堜粎鏄剧ず锛�
+				this.formData.quantity = data.daa008 || ""; // 宸ュ崟鏁伴噺锛堜繚瀛樺埌鏁版嵁搴擄級
 				// 涓嶆竻绌洪�佹鏁伴噺锛屼繚鎸佺敤鎴峰凡杈撳叆鐨勫��
 				this.tableData = [];
 			},
 			// 閫佹鏁伴噺鍙樺寲浜嬩欢
-			onQuantityChange(event) {
+			onSjqtyChange(event) {
 				// 濡傛灉杈撳叆涓虹┖锛屼笉杩涜楠岃瘉
-				if (!this.formData.quantity || this.formData.quantity === "") {
+				if (!this.formData.sjqty || this.formData.sjqty === "") {
 					return;
 				}
 
-				const quantity = parseFloat(this.formData.quantity);
+				const sjqty = parseFloat(this.formData.sjqty);
 
 				// 妫�鏌ユ槸鍚︿负鏈夋晥鏁板瓧
-				if (isNaN(quantity)) {
+				if (isNaN(sjqty)) {
 					this.$showMessage("璇疯緭鍏ユ湁鏁堢殑鏁板瓧");
-					this.formData.quantity = "";
+					this.formData.sjqty = "";
 					return;
 				}
 
 				// 鍙湁鍦ㄨ緭鍏ュ畬鎴愪笖鏁伴噺澶т簬0鏃舵墠杩涜楠岃瘉
-				if (quantity <= 0) {
+				if (sjqty <= 0) {
 					this.$showMessage("閫佹鏁伴噺蹇呴』澶т簬0");
-					this.formData.quantity = "";
+					this.formData.sjqty = "";
 					return;
 				}
 
 				// 鍙湁鍦ㄥ凡閫夋嫨宸ュ崟涓旀湁宸ュ崟鏁伴噺鏃舵墠杩涜鏁伴噺姣旇緝
-				if (this.formData.planQty) {
-					const planQty = parseFloat(this.formData.planQty);
-					if (!isNaN(planQty) && quantity > planQty) {
+				if (this.formData.quantity || this.formData.planQty) {
+					const planQty = parseFloat(this.formData.quantity || this.formData.planQty);
+					if (!isNaN(planQty) && sjqty > planQty) {
 						this.$showMessage("閫佹鏁伴噺涓嶈兘澶т簬宸ュ崟鏁伴噺");
-						this.formData.quantity = "";
+						this.formData.sjqty = "";
 						return;
 					}
 				}
@@ -888,7 +894,8 @@
 						this.formData.itemNo = data.itemNo;
 						this.formData.itemId = data.itemId;
 						this.formData.lineNo = data.lineNo;
-						this.formData.quantity = data.quantity;
+						this.formData.quantity = data.quantity; // 宸ュ崟鏁伴噺
+						this.formData.sjqty = data.sjqty; // 閫佹鏁伴噺
 						this.formData.fcheckResu = data.fcheckResu;
 						this.formData.fcheckBy = data.fcheckBy;
 						this.formData.fcheckDate = data.fcheckDate;
@@ -1089,8 +1096,8 @@
 				});
 			},
 			getTable() {
-				// 纭繚quantity鏈夊��
-				if (!this.formData.quantity || parseFloat(this.formData.quantity) <= 0) {
+				// 纭繚sjqty鏈夊��
+				if (!this.formData.sjqty || parseFloat(this.formData.sjqty) <= 0) {
 					this.$showMessage("璇峰厛杈撳叆鏈夋晥鐨勯�佹鏁伴噺");
 					return;
 				}
@@ -1099,7 +1106,7 @@
 					url: "/RKJ/setJYItem",
 					data: {
 						itemNo: this.formData.itemNo,
-						quantity: this.formData.quantity
+						quantity: this.formData.sjqty
 					}
 				}).then(res => {
 
diff --git a/pages/QC/RKJ/List.vue b/pages/QC/RKJ/List.vue
index 3af3e1f..1f69dff 100644
--- a/pages/QC/RKJ/List.vue
+++ b/pages/QC/RKJ/List.vue
@@ -67,17 +67,21 @@
   
             <view class="info-row">
               <view class="info-item">
-                <text class="info-label">閫佹鏁伴噺</text>
-                <text class="info-content highlight">{{item.quantity}}</text>
+                <text class="info-label">宸ュ崟鏁伴噺</text>
+                <text class="info-content">{{item.quantity}}</text>
               </view>
               <view class="info-item">
-                <text class="info-label">鍒涘缓浜�</text>
-                <text class="info-content">{{item.createBy}}</text>
+                <text class="info-label">閫佹鏁伴噺</text>
+                <text class="info-content highlight">{{item.sjqty}}</text>
               </view>
             </view>
   
             <view class="info-row">
               <view class="info-item">
+                <text class="info-label">鍒涘缓浜�</text>
+                <text class="info-content">{{item.createBy}}</text>
+              </view>
+              <view class="info-item">
                 <text class="info-label">閫佹鎵规</text>
                 <text class="info-content">{{item.rbillNo}}</text>
               </view>
diff --git a/pages/QC/RKJ/detail.vue b/pages/QC/RKJ/detail.vue
index d18352a..dbbe4c1 100644
--- a/pages/QC/RKJ/detail.vue
+++ b/pages/QC/RKJ/detail.vue
@@ -107,7 +107,7 @@
               v-model="formData.fcheckResu"
               type="text"
               class="result-input"
-              placeholder="娌℃湁鏈�澶у�煎拰鏈�灏忓�兼椂濉啓0锛堟湭閫氳繃妫�楠岋級鎴�1锛堥�氳繃妫�楠岋級"
+              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"
@@ -139,17 +139,24 @@
       </button>
     </view>
 
-    <!-- 鍥剧墖棰勮 -->
-    <view v-if="isShowImg" class="section">
+    <!-- 鍥剧墖棰勮 - 鏀寔澶氬浘鐗� -->
+    <view v-if="imageList && imageList.length > 0" class="section">
       <view class="section-header">
-        <view class="section-title">鐩稿叧鍥剧墖</view>
-        <view class="section-actions">
-          <button class="delete-image-btn" @click="deleteImage">鍒犻櫎鍥剧墖</button>
-        </view>
+        <view class="section-title">鐩稿叧鍥剧墖 ({{ imageList.length }}寮�)</view>
       </view>
       <view class="section-body">
-        <view class="image-preview" @click="previewImage">
-          <image :src="base64Image" mode="aspectFit" class="preview-image"/>
+        <view class="image-list">
+          <view v-for="(img, index) in imageList" :key="img.id" class="image-item">
+            <view class="image-preview" @click="previewMultiImage(index)">
+              <image :src="'data:image/jpeg;base64,' + img.base64Data" mode="aspectFill" class="preview-image"/>
+            </view>
+            <view class="image-actions">
+              <button class="delete-image-btn" @click="deleteSingleImage(img)">
+                <text class="delete-icon">馃棏锔�</text>
+                <text>鍒犻櫎</text>
+              </button>
+            </view>
+          </view>
         </view>
       </view>
     </view>
@@ -174,7 +181,7 @@
               </view>
             </view>
             <view class="td">
-              <view class="result-badge" :class="item.fcheckResu === '1' ? 'OK' : 'NG'">
+              <view class="result-badge" :class="(item.fcheckResu === 'OK' || item.fcheckResu === '1' || item.fcheckResu == 1) ? 'OK' : 'NG'">
                 {{ item.fcheckResu }}
               </view>
             </view>
@@ -400,6 +407,7 @@
       tableData: [],
       isShowImg: false,
       base64Image: "",
+      imageList: [],  // 澶氬浘鐗囧垪琛�
       remarks: "",
       remarksPopup: false,
 	  fcheckResu: null,
@@ -433,7 +441,7 @@
     
     // 鍒ゆ柇鏄惁宸蹭笂浼犲浘鐗�
     hasImage() {
-      return this.formData.imageData && this.formData.imageData.length > 0;
+      return this.imageList && this.imageList.length > 0;
     },
     
     // 鍒ゆ柇鏄惁宸插～鍐欎笉鑹弿杩�
@@ -448,7 +456,8 @@
     },
 
     editResult(fcheckResu) {
-      if (fcheckResu == '1') {
+      // 1 鎴� OK 閮借〃绀哄悎鏍�
+      if (fcheckResu == '1' || fcheckResu == 'OK' || fcheckResu == 1) {
         return "鏀逛负涓嶅悎鏍�";
       } else {
         return "鏀逛负鍚堟牸";
@@ -477,22 +486,27 @@
       } 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 == 0) {
+      if (fstand === "脳" || this.formData.fcheckResu === 'NG') {
         // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
-        if (!this.formData.imageData || this.formData.imageData.length === 0) {
+        if (!this.imageList || this.imageList.length === 0) {
           this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
           return;
         }
@@ -534,12 +548,26 @@
 
         this.tableData = res.data.tbBillList.itemXj02s;
 
-        // 澶勭悊鍥剧墖鏄剧ず鐘舵��
-        if (this.formData.imageData && this.formData.imageData.length > 0) {
+        // 澶勭悊澶氬浘鐗囧垪琛�
+        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) {
+          // 鍚戝悗鍏煎锛氬鏋滄病鏈塱mageList浣嗘湁imageData
+          this.imageList = [{
+            id: 0,
+            base64Data: this.formData.imageData,
+            fileName: '',
+            createDate: null,
+            createBy: ''
+          }];
           this.isShowImg = true;
           this.base64Image = 'data:image/jpeg;base64,' + this.formData.imageData;
         } else {
-          // 濡傛灉娌℃湁鍥剧墖鏁版嵁锛岄殣钘忓浘鐗囨樉绀哄尯鍩�
+          this.imageList = [];
           this.isShowImg = false;
           this.base64Image = '';
         }
@@ -586,23 +614,26 @@
       } 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 == 0) {
+      if (fstand === "脳" || this.editData.fcheckResu === 'NG') {
         // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
-        if (!this.formData.imageData || this.formData.imageData.length === 0) {
+        if (!this.imageList || this.imageList.length === 0) {
           this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
           return;
         }
@@ -642,17 +673,18 @@
     numberEdit(item) {
 
       let fstand = "鈭�";
-      let fcheckResu = 1;
+      let fcheckResu = 'OK';  // 鍚堟牸鐢∣K
 
-      if (item.fcheckResu == '1') {
+      // 鍒ゆ柇褰撳墠鏄惁涓哄悎鏍肩姸鎬侊紙OK 鎴� 1 閮借〃绀哄悎鏍硷級
+      if (item.fcheckResu == '1' || item.fcheckResu == 'OK' || item.fcheckResu == 1) {
         fstand = "脳";
-        fcheckResu = 0;
+        fcheckResu = 'NG';  // 涓嶅悎鏍肩敤NG
       }
 
       // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
-      if (fstand === "脳" || fcheckResu == 0) {
+      if (fstand === "脳" || fcheckResu == 'NG') {
         // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
-        if (!this.formData.imageData || this.formData.imageData.length === 0) {
+        if (!this.imageList || this.imageList.length === 0) {
           this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
           return;
         }
@@ -983,20 +1015,34 @@
       });
     },
     
-    // 鏍规嵁閫夋嫨鐨勬潵婧愰�夋嫨鍥剧墖
+    // 鏍规嵁閫夋嫨鐨勬潵婧愰�夋嫨鍥剧墖锛堟敮鎸佸閫夛級
     chooseImageWithSource(sourceType) {
+      // 璁＄畻杩樺彲浠ヤ笂浼犲灏戝紶鍥剧墖
+      const currentCount = this.imageList ? this.imageList.length : 0;
+      const maxCount = 9;
+      const remainCount = maxCount - currentCount;
+      
+      if (remainCount <= 0) {
+        uni.showToast({
+          title: '鏈�澶氬彧鑳戒笂浼�' + maxCount + '寮犲浘鐗�',
+          icon: 'none'
+        });
+        return;
+      }
+      
       uni.chooseImage({
-        count: 1, // 鏈�澶氶�夋嫨1寮犲浘鐗�
-        sizeType: ['compressed', 'original'], // 鎻愪緵鍘嬬缉鍜屽師鍥鹃�夐」
-        sourceType: sourceType, // 鏍规嵁鐢ㄦ埛閫夋嫨璁剧疆鏉ユ簮
+        count: sourceType.includes('camera') ? 1 : remainCount, // 鎷嶇収鍙兘涓�寮狅紝鐩稿唽鍙閫�
+        sizeType: ['compressed', 'original'],
+        sourceType: sourceType,
         success: (res) => {
-          const tempFilePath = res.tempFilePaths[0];
+          const tempFilePaths = res.tempFilePaths;
           
           // 濡傛灉鏄媿鐓э紝鏄剧ず棰勮纭
           if (sourceType.includes('camera')) {
-            this.showImagePreview(tempFilePath);
+            this.showImagePreview(tempFilePaths[0]);
           } else {
-            this.uploadImageToServer(tempFilePath);
+            // 澶氬浘鐗囨壒閲忎笂浼�
+            this.uploadMultipleImages(tempFilePaths);
           }
         },
         fail: (error) => {
@@ -1007,6 +1053,77 @@
           }
           uni.showToast({
             title: errorMessage,
+            icon: 'none'
+          });
+        }
+      });
+    },
+    
+    // 鎵归噺涓婁紶鍥剧墖
+    uploadMultipleImages(tempFilePaths) {
+      if (!tempFilePaths || tempFilePaths.length === 0) {
+        return;
+      }
+      
+      uni.showLoading({
+        title: '涓婁紶涓�... (0/' + tempFilePaths.length + ')'
+      });
+      
+      const uploadUrl = this.$store.state.serverInfo.serverAPI + "/RKJ/UploadImageToPicture";
+      let successCount = 0;
+      let failCount = 0;
+      const total = tempFilePaths.length;
+      
+      const uploadPromises = tempFilePaths.map((filePath, index) => {
+        return new Promise((resolve) => {
+          uni.uploadFile({
+            url: uploadUrl,
+            filePath: filePath,
+            name: 'file',
+            formData: {
+              id: this.id,
+              gid: this.gid,
+              billNo: this.billNo,
+              createBy: this.$loginInfo.account
+            },
+            success: (uploadRes) => {
+              try {
+                const result = JSON.parse(uploadRes.data);
+                if (result.status === 0) {
+                  successCount++;
+                } else {
+                  failCount++;
+                }
+              } catch (error) {
+                failCount++;
+              }
+              uni.showLoading({
+                title: '涓婁紶涓�... (' + (successCount + failCount) + '/' + total + ')'
+              });
+              resolve();
+            },
+            fail: () => {
+              failCount++;
+              uni.showLoading({
+                title: '涓婁紶涓�... (' + (successCount + failCount) + '/' + total + ')'
+              });
+              resolve();
+            }
+          });
+        });
+      });
+      
+      Promise.all(uploadPromises).then(() => {
+        uni.hideLoading();
+        if (successCount > 0) {
+          uni.showToast({
+            title: '鎴愬姛涓婁紶' + successCount + '寮犲浘鐗�',
+            icon: 'success'
+          });
+          this.refreshResult();
+        } else {
+          uni.showToast({
+            title: '鍥剧墖涓婁紶澶辫触',
             icon: 'none'
           });
         }
@@ -1114,17 +1231,45 @@
       });
     },
     
+    // 棰勮澶氬浘鐗�
+    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: '纭畾瑕佸垹闄よ繖寮犲浘鐗囧悧锛�',
+        confirmText: '鍒犻櫎',
+        cancelText: '鍙栨秷',
+        confirmColor: '#e74c3c',
+        success: (res) => {
+          if (res.confirm) {
+            this.deleteImageFromServer(img.id);
+          }
+        }
+      });
+    },
+    
     // 浠庢湇鍔″櫒鍒犻櫎鍥剧墖
-    deleteImageFromServer() {
+    deleteImageFromServer(imageId = null) {
       uni.showLoading({
         title: '鍒犻櫎涓�...'
       });
       
+      const data = { id: this.id };
+      if (imageId !== null && imageId !== undefined && imageId !== 0) {
+        data.imageId = imageId;
+      }
+      
       this.$post({
         url: "/RKJ/DeleteImageFromPicture",
-        data: {
-          id: this.id // 褰撳墠妫�楠岄」鐩甀D
-        }
+        data: data
       }).then(res => {
         uni.hideLoading();
         if (res.status === 0) {
@@ -1223,6 +1368,56 @@
   }
 }
 
+/* 澶氬浘鐗囧垪琛ㄦ牱寮� */
+.image-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+}
+
+.image-item {
+  width: 150px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  
+  .image-preview {
+    width: 150px;
+    height: 150px;
+    border: 1px solid $border-color;
+    border-radius: 8px;
+    overflow: hidden;
+    cursor: pointer;
+    
+    .preview-image {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+  }
+  
+  .image-actions {
+    margin-top: 8px;
+    
+    .delete-image-btn {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      padding: 6px 12px;
+      background-color: $danger-color;
+      color: #fff;
+      border: none;
+      border-radius: 4px;
+      font-size: 12px;
+      cursor: pointer;
+      
+      .delete-icon {
+        font-size: 14px;
+      }
+    }
+  }
+}
+
 .info-grid {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
diff --git a/pages/QC/SJ/detail.vue b/pages/QC/SJ/detail.vue
index 6a7e212..8e25304 100644
--- a/pages/QC/SJ/detail.vue
+++ b/pages/QC/SJ/detail.vue
@@ -134,7 +134,7 @@
                 v-model="formData.fcheckResu"
                 type="text"
                 class="result-input"
-                placeholder="娌℃湁鏈�澶у�煎拰鏈�灏忓�兼椂濉啓0锛堟湭閫氳繃妫�楠岋級鎴�1锛堥�氳繃妫�楠岋級"
+                placeholder="鏃犱笂涓嬮檺鏃跺～鍐橭K锛堝悎鏍硷級鎴朜G锛堜笉鍚堟牸锛�"
                 placeholder-class="placeholder" />
               <button v-if="!isAllCompleted"
                 style="margin: 0px;background-color: #3498db;color:#ffffff ;" class="btn primary-btn"
@@ -203,17 +203,24 @@
         </view>
       </view>
  
-      <!-- 鍥剧墖棰勮 -->
-      <view v-if="isShowImg" class="section">
+      <!-- 鍥剧墖棰勮 - 鏀寔澶氬浘鐗� -->
+      <view v-if="imageList && imageList.length > 0" class="section">
         <view class="section-header">
-          <view class="section-title">鐩稿叧鍥剧墖</view>
-          <view class="section-actions">
-            <button class="delete-image-btn" @click="deleteImage">鍒犻櫎鍥剧墖</button>
-          </view>
+          <view class="section-title">鐩稿叧鍥剧墖 ({{ imageList.length }}寮�)</view>
         </view>
         <view class="section-body">
-          <view class="image-preview" @click="previewImage">
-            <image :src="base64Image" mode="aspectFit" class="preview-image"/>
+          <view class="image-list">
+            <view v-for="(img, index) in imageList" :key="img.id" class="image-item">
+              <view class="image-preview" @click="previewMultiImage(index)">
+                <image :src="'data:image/jpeg;base64,' + img.base64Data" mode="aspectFill" class="preview-image"/>
+              </view>
+              <view class="image-actions">
+                <button class="delete-image-btn" @click="deleteSingleImage(img)">
+                  <text class="delete-icon">馃棏锔�</text>
+                  <text>鍒犻櫎</text>
+                </button>
+              </view>
+            </view>
           </view>
         </view>
       </view>
@@ -437,6 +444,7 @@
       tableData: [],
       base64Image: "",
       isShowImg: false,
+      imageList: [],  // 澶氬浘鐗囧垪琛�
       remarks: "",
       remarksPopup: false,
       // ===== 鏂板LLJ鏍峰紡鐩稿叧鏁版嵁 =====
@@ -560,13 +568,13 @@
                this.formData.fcheckResu > this.formData.maxValue;
       }
       
-      // 濡傛灉娌℃湁鏈�澶у�煎拰鏈�灏忓�硷紝妫�鏌ユ槸鍚︿负0锛堜笉鍚堟牸锛�
-      return this.formData.fcheckResu == 0;
+      // 濡傛灉娌℃湁涓婁笅闄愶紝妫�鏌ユ槸鍚︿负NG锛堜笉鍚堟牸锛夋垨鍏煎鏃х殑06
+      return this.formData.fcheckResu == 0 || this.formData.fcheckResu === 'NG';
     },
     
     // 鍒ゆ柇鏄惁宸蹭笂浼犲浘鐗�
     hasImage() {
-      return this.formData.imageData && this.formData.imageData.length > 0;
+      return this.imageList && this.imageList.length > 0;
     },
     
     // 鍒ゆ柇鏄惁宸插～鍐欎笉鑹弿杩�
@@ -592,9 +600,9 @@
         return 'NG';
       } else {
         // 濡傛灉娌℃湁fstand锛屾牴鎹甪checkResu鐨勫�煎垽鏂�
-        if (fcheckResu === '1' || fcheckResu === 1) {
+        if (fcheckResu === '1' || fcheckResu === 1 || fcheckResu === 'OK') {
           return 'OK';
-        } else if (fcheckResu === '0' || fcheckResu === 0) {
+        } else if (fcheckResu === '0' || fcheckResu === 0 || fcheckResu === 'NG') {
           return 'NG';
         } else {
           // 瀵逛簬鏈変笂涓嬮檺鐨勬暟鍊兼楠岋紝鏍规嵁fcheckResu鏄惁鍦ㄨ寖鍥村唴鍒ゆ柇
@@ -632,9 +640,9 @@
         return '涓嶅悎鏍�';
       } else {
         // 濡傛灉娌℃湁fstand锛屾牴鎹甪checkResu鐨勫�煎垽鏂�
-        if (fcheckResu === '1' || fcheckResu === 1) {
+        if (fcheckResu === '1' || fcheckResu === 1 || fcheckResu === 'OK') {
           return '鍚堟牸';
-        } else if (fcheckResu === '0' || fcheckResu === 0) {
+        } else if (fcheckResu === '0' || fcheckResu === 0 || fcheckResu === 'NG') {
           return '涓嶅悎鏍�';
         } else {
           // 瀵逛簬鏈変笂涓嬮檺鐨勬暟鍊兼楠岋紝鏍规嵁fcheckResu鏄惁鍦ㄨ寖鍥村唴鍒ゆ柇
@@ -692,8 +700,31 @@
         urls: [this.base64Image],
       });
     },
+    
+    // 澶氬浘鐗囬瑙�
+    previewMultiImage(index) {
+      const urls = this.imageList.map(img => 'data:image/jpeg;base64,' + img.base64Data);
+      uni.previewImage({
+        urls: urls,
+        current: index
+      });
+    },
+    
+    // 鍒犻櫎鍗曞紶鍥剧墖
+    deleteSingleImage(img) {
+      uni.showModal({
+        title: '纭鍒犻櫎',
+        content: '纭畾瑕佸垹闄よ繖寮犲浘鐗囧悧锛�',
+        success: (res) => {
+          if (res.confirm) {
+            this.deleteImageFromServer(img.id);
+          }
+        }
+      });
+    },
     editResult(fcheckResu) {
-      if (fcheckResu == '1') {
+      // 1 鎴� OK 閮借〃绀哄悎鏍�
+      if (fcheckResu == '1' || fcheckResu == 'OK' || fcheckResu == 1) {
         return "鏀逛负涓嶅悎鏍�";
       } else {
         return "鏀逛负鍚堟牸";
@@ -749,9 +780,9 @@
       }
  
       // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
-      if (fstand === "脳" || this.formData.fcheckResu == 0) {
+      if (fstand === "脳" || this.formData.fcheckResu === 'NG') {
         // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
-        if (!this.formData.imageData || this.formData.imageData.length === 0) {
+        if (!this.imageList || this.imageList.length === 0) {
           this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
           return;
         }
@@ -798,13 +829,31 @@
         console.log("鑾峰彇鍒扮殑 formData:", this.formData);
         console.log("itemNo 鍊�:", this.formData.itemNo);
         
-        if (this.formData.imageData) {
+        // 澶勭悊澶氬浘鐗囧垪琛�
+        if (this.formData.imageList && this.formData.imageList.length > 0) {
+          this.imageList = this.formData.imageList;
+          this.isShowImg = true;
+          // 淇濇寔鍚戝悗鍏煎
+          if (this.imageList.length > 0) {
+            this.base64Image = 'data:image/jpeg;base64,' + this.imageList[0].base64Data;
+          }
+        } else if (this.formData.imageData) {
+          // 鍚戝悗鍏煎锛氬鏋滃彧鏈夊崟寮犲浘鐗囨暟鎹�
+          this.imageList = [{
+            id: 0,
+            base64Data: this.formData.imageData,
+            fileName: '',
+            createDate: null,
+            createBy: ''
+          }];
           this.isShowImg = true;
           this.base64Image = 'data:image/jpeg;base64,' + this.formData.imageData;
         } else {
+          this.imageList = [];
           this.isShowImg = false;
           this.base64Image = '';
         }
+        
         if (this.formData.maxValue && this.formData.minValue && this.formData.standardValue) {
           this.isNumber = true;
         }
@@ -871,7 +920,7 @@
       }
  
       // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
-      if (fstand === "脳" || this.editData.fcheckResu == 0) {
+      if (fstand === "脳" || this.editData.fcheckResu === 'NG') {
         // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
         if (!this.formData.imageData || this.formData.imageData.length === 0) {
           this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
@@ -918,17 +967,18 @@
     numberEdit(item) {
  
       let fstand = "鈭�";
-      let fcheckResu = 1;
+      let fcheckResu = 'OK';  // 鍚堟牸鐢∣K
  
-      if (item.fcheckResu == '1') {
+      // 鍒ゆ柇褰撳墠鏄惁涓哄悎鏍肩姸鎬侊紙OK 鎴� 1 閮借〃绀哄悎鏍硷級
+      if (item.fcheckResu == '1' || item.fcheckResu == 'OK' || item.fcheckResu == 1) {
         fstand = "脳";
-        fcheckResu = 0;
+        fcheckResu = 'NG';  // 涓嶅悎鏍肩敤NG
       }
 
       // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
-      if (fstand === "脳" || fcheckResu == 0) {
+      if (fstand === "脳" || fcheckResu == 'NG') {
         // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
-        if (!this.formData.imageData || this.formData.imageData.length === 0) {
+        if (!this.imageList || this.imageList.length === 0) {
           this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
           return;
         }
@@ -1246,26 +1296,89 @@
       });
     },
 
-    // 閫夋嫨鍥剧墖鏉ユ簮
+    // 閫夋嫨鍥剧墖鏉ユ簮 - 鏀寔澶氶��
     chooseImageWithSource(source) {
       uni.chooseImage({
-        count: 1,
+        count: 9,  // 鏀寔鏈�澶氶�夋嫨9寮犲浘鐗�
         sizeType: ['compressed'],
         sourceType: [source],
         success: (res) => {
-          const tempFilePath = res.tempFilePaths[0];
+          const tempFilePaths = res.tempFilePaths;
           if (source === 'camera') {
-            // 鎷嶇収鍚庢樉绀洪瑙堢‘璁�
-            this.showImagePreview(tempFilePath);
+            // 鎷嶇収鍚庣洿鎺ヤ笂浼狅紙鍗曞紶锛�
+            this.uploadImageToServer(tempFilePaths[0]);
           } else {
-            // 鐩稿唽閫夋嫨鐩存帴涓婁紶
-            this.uploadImageToServer(tempFilePath);
+            // 鐩稿唽閫夋嫨锛屾壒閲忎笂浼�
+            this.uploadMultipleImages(tempFilePaths);
           }
         },
         fail: (err) => {
           console.error('閫夋嫨鍥剧墖澶辫触:', err);
           this.$showMessage('閫夋嫨鍥剧墖澶辫触');
         }
+      });
+    },
+
+    // 鎵归噺涓婁紶鍥剧墖
+    uploadMultipleImages(tempFilePaths) {
+      if (!tempFilePaths || tempFilePaths.length === 0) {
+        return;
+      }
+      
+      uni.showLoading({
+        title: `涓婁紶涓�(0/${tempFilePaths.length})...`
+      });
+      
+      let successCount = 0;
+      let failCount = 0;
+      const total = tempFilePaths.length;
+      
+      // 浣跨敤 Promise.all 骞惰涓婁紶
+      const uploadPromises = tempFilePaths.map((filePath, index) => {
+        return new Promise((resolve) => {
+          uni.uploadFile({
+            url: this.$store.state.serverInfo.serverAPI + '/SJ/UploadImageToPicture',
+            filePath: filePath,
+            name: 'file',
+            formData: {
+              id: this.id.toString(),
+              gid: this.gid.toString(),
+              billNo: this.billNo,
+              createBy: this.$loginInfo.account
+            },
+            success: (res) => {
+              try {
+                const result = JSON.parse(res.data);
+                if (result.status === 0) {
+                  successCount++;
+                } else {
+                  failCount++;
+                }
+              } catch (e) {
+                failCount++;
+              }
+              uni.showLoading({
+                title: `涓婁紶涓�(${successCount + failCount}/${total})...`
+              });
+              resolve();
+            },
+            fail: (err) => {
+              failCount++;
+              console.error('涓婁紶澶辫触:', err);
+              resolve();
+            }
+          });
+        });
+      });
+      
+      Promise.all(uploadPromises).then(() => {
+        uni.hideLoading();
+        if (failCount === 0) {
+          this.$showMessage(`${successCount}寮犲浘鐗囦笂浼犳垚鍔焋);
+        } else {
+          this.$showMessage(`涓婁紶瀹屾垚锛氭垚鍔�${successCount}寮狅紝澶辫触${failCount}寮燻);
+        }
+        this.refreshResult();
       });
     },
 
@@ -1340,17 +1453,24 @@
       });
     },
 
-    // 浠庢湇鍔″櫒鍒犻櫎鍥剧墖
-    deleteImageFromServer() {
+    // 浠庢湇鍔″櫒鍒犻櫎鍥剧墖 - 鏀寔鍒犻櫎鍗曞紶鎴栨墍鏈夊浘鐗�
+    deleteImageFromServer(imageId = null) {
       uni.showLoading({
         title: '鍒犻櫎涓�...'
       });
 
+      const data = {
+        id: this.id
+      };
+      
+      // 濡傛灉浼犲叆浜� imageId锛屽垯鍒犻櫎鍗曞紶鍥剧墖
+      if (imageId !== null && imageId !== undefined && imageId !== 0) {
+        data.imageId = imageId;
+      }
+
       this.$post({
         url: '/SJ/DeleteImageFromPicture',
-        data: {
-          id: this.id
-        }
+        data: data
       }).then(res => {
         uni.hideLoading();
         if (res.status === 0) {
@@ -2424,6 +2544,117 @@
   transform: translateY(-1px);
 }
 
+/* 澶氬浘鐗囧垪琛ㄦ牱寮� */
+.image-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+  padding: 10px 0;
+}
+
+.image-item {
+  position: relative;
+  width: calc(33.33% - 8px);
+  min-width: 100px;
+  max-width: 150px;
+  border-radius: 12px;
+  overflow: hidden;
+  background: #fff;
+  box-shadow: 0 2px 12px rgba(0,0,0,0.08);
+  transition: all 0.3s ease;
+}
+
+.image-item:hover {
+  box-shadow: 0 4px 20px rgba(0,0,0,0.12);
+  transform: translateY(-2px);
+}
+
+.image-item .image-preview {
+  width: 100%;
+  height: 100px;
+  overflow: hidden;
+  cursor: pointer;
+  position: relative;
+}
+
+.image-item .preview-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.image-actions {
+  padding: 8px 6px;
+  text-align: center;
+  background: linear-gradient(to bottom, #fafafa, #f5f5f5);
+}
+
+.image-actions .delete-image-btn {
+  width: 100%;
+  padding: 8px 12px;
+  font-size: 13px;
+  border-radius: 20px;
+  background: linear-gradient(135deg, #ff6b6b 0%, #ee5a5a 100%);
+  border: none;
+  color: white;
+  font-weight: 500;
+  box-shadow: 0 2px 8px rgba(238, 90, 90, 0.3);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+  transition: all 0.2s ease;
+}
+
+.image-actions .delete-image-btn:active {
+  transform: scale(0.95);
+  box-shadow: 0 1px 4px rgba(238, 90, 90, 0.3);
+}
+
+.delete-icon {
+  font-size: 14px;
+  margin-right: 2px;
+}
+
+/* 绉诲姩绔紭鍖� */
+@media (max-width: 480px) {
+  .image-list {
+    gap: 10px;
+  }
+  
+  .image-item {
+    width: calc(50% - 5px);
+    min-width: 0;
+    max-width: none;
+    border-radius: 10px;
+  }
+  
+  .image-item .image-preview {
+    height: 90px;
+  }
+  
+  .image-actions {
+    padding: 6px 5px;
+  }
+  
+  .image-actions .delete-image-btn {
+    padding: 6px 10px;
+    font-size: 12px;
+    border-radius: 16px;
+  }
+}
+
+@media (min-width: 768px) {
+  .image-item {
+    width: calc(25% - 9px);
+    max-width: 160px;
+  }
+  
+  .image-item .image-preview {
+    height: 120px;
+  }
+}
+
 /* 涓婁紶鍥剧墖鎸夐挳鏍峰紡 */
 .tablet-upload-btn {
   background: linear-gradient(135deg, #2ecc71 0%, #27ae60 100%);
diff --git a/pages/QC/XJ/detail.vue b/pages/QC/XJ/detail.vue
index 8818a38..1013148 100644
--- a/pages/QC/XJ/detail.vue
+++ b/pages/QC/XJ/detail.vue
@@ -101,7 +101,7 @@
               v-model="formData.fcheckResu"
               type="text"
               class="result-input"
-              placeholder="娌℃湁鏈�澶у�煎拰鏈�灏忓�兼椂濉啓0锛堟湭閫氳繃妫�楠岋級鎴�1锛堥�氳繃妫�楠岋級"
+              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"
@@ -111,17 +111,24 @@
       </view>
     </view>
 
-    <!-- 鍥剧墖棰勮 -->
-    <view v-if="isShowImg" class="section">
+    <!-- 鍥剧墖棰勮 - 鏀寔澶氬浘鐗� -->
+    <view v-if="imageList && imageList.length > 0" class="section">
       <view class="section-header">
-        <view class="section-title">鐩稿叧鍥剧墖</view>
-        <view class="section-actions">
-          <button class="delete-image-btn" @click="deleteImage">鍒犻櫎鍥剧墖</button>
-        </view>
+        <view class="section-title">鐩稿叧鍥剧墖 ({{ imageList.length }}寮�)</view>
       </view>
       <view class="section-body">
-        <view class="image-preview" @click="previewImage">
-          <image :src="base64Image" mode="aspectFit" class="preview-image"/>
+        <view class="image-list">
+          <view v-for="(img, index) in imageList" :key="img.id" class="image-item">
+            <view class="image-preview" @click="previewMultiImage(index)">
+              <image :src="'data:image/jpeg;base64,' + img.base64Data" mode="aspectFill" class="preview-image"/>
+            </view>
+            <view class="image-actions">
+              <button class="delete-image-btn" @click="deleteSingleImage(img)">
+                <text class="delete-icon">馃棏锔�</text>
+                <text>鍒犻櫎</text>
+              </button>
+            </view>
+          </view>
         </view>
       </view>
     </view>
@@ -137,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>
@@ -390,7 +397,8 @@
       editData: {},
       tableData: [],
       isShowImg: false,
-      base64Image:"",
+      base64Image: "",
+      imageList: [],  // 澶氬浘鐗囧垪琛�
       remarks: "",
       remarksPopup: false,
       
@@ -430,7 +438,7 @@
     
     // 鍒ゆ柇鏄惁宸蹭笂浼犲浘鐗�
     hasImage() {
-      return this.formData.imageData && this.formData.imageData.length > 0;
+      return this.imageList && this.imageList.length > 0;
     },
     
     // 鍒ゆ柇鏄惁宸插～鍐欎笉鑹弿杩�
@@ -444,8 +452,31 @@
         urls: [this.base64Image],
       });
     },
+    
+    // 澶氬浘鐗囬瑙�
+    previewMultiImage(index) {
+      const urls = this.imageList.map(img => 'data:image/jpeg;base64,' + img.base64Data);
+      uni.previewImage({
+        urls: urls,
+        current: index
+      });
+    },
+    
+    // 鍒犻櫎鍗曞紶鍥剧墖
+    deleteSingleImage(img) {
+      uni.showModal({
+        title: '纭鍒犻櫎',
+        content: '纭畾瑕佸垹闄よ繖寮犲浘鐗囧悧锛�',
+        success: (res) => {
+          if (res.confirm) {
+            this.deleteImageFromServer(img.id);
+          }
+        }
+      });
+    },
     editResult(fcheckResu) {
-      if (fcheckResu == '1') {
+      // 1 鎴� OK 閮借〃绀哄悎鏍�
+      if (fcheckResu == '1' || fcheckResu == 'OK' || fcheckResu == 1) {
         return "鏀逛负涓嶅悎鏍�";
       } else {
         return "鏀逛负鍚堟牸";
@@ -472,24 +503,28 @@
         }
         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 == 0) {
+      if (fstand === "脳" || this.formData.fcheckResu === 'NG') {
         // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
-        if (!this.formData.imageData || this.formData.imageData.length === 0) {
+        if (!this.imageList || this.imageList.length === 0) {
           this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
           return;
         }
@@ -531,12 +566,27 @@
 
         this.tableData = res.data.tbBillList.itemXj02s;
 
-        // 澶勭悊鍥剧墖鏄剧ず鐘舵��
-        if (this.formData.imageData && this.formData.imageData.length > 0) {
+        // 澶勭悊澶氬浘鐗囧垪琛�
+        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 = '';
         }
@@ -578,25 +628,27 @@
           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 == 0) {
+      if (fstand === "脳" || this.editData.fcheckResu === 'NG') {
         // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
-        if (!this.formData.imageData || this.formData.imageData.length === 0) {
+        if (!this.imageList || this.imageList.length === 0) {
           this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
           return;
         }
@@ -629,17 +681,18 @@
     numberEdit(item) {
 
       let fstand = "鈭�";
-      let fcheckResu = 1;
+      let fcheckResu = 'OK';  // 鍚堟牸鐢∣K
 
-      if (item.fcheckResu == '1') {
+      // 鍒ゆ柇褰撳墠鏄惁涓哄悎鏍肩姸鎬侊紙OK 鎴� 1 閮借〃绀哄悎鏍硷級
+      if (item.fcheckResu == '1' || item.fcheckResu == 'OK' || item.fcheckResu == 1) {
         fstand = "脳";
-        fcheckResu = 0;
+        fcheckResu = 'NG';  // 涓嶅悎鏍肩敤NG
       }
 
       // 楠岃瘉涓嶅悎鏍兼楠岄」鐩繀椤讳笂浼犲浘鐗囧苟濉啓涓嶈壇鎻忚堪
-      if (fstand === "脳" || fcheckResu == 0) {
+      if (fstand === "脳" || fcheckResu == 'NG') {
         // 妫�鏌ユ槸鍚﹀凡涓婁紶鍥剧墖
-        if (!this.formData.imageData || this.formData.imageData.length === 0) {
+        if (!this.imageList || this.imageList.length === 0) {
           this.$showMessage("妫�楠岄」鐩笉鍚堟牸锛屽繀椤讳笂浼犲浘鐗囷紒");
           return;
         }
@@ -942,20 +995,21 @@
       });
     },
     
-    // 鏍规嵁閫夋嫨鐨勬潵婧愰�夋嫨鍥剧墖
+    // 鏍规嵁閫夋嫨鐨勬潵婧愰�夋嫨鍥剧墖 - 鏀寔澶氶��
     chooseImageWithSource(sourceType) {
       uni.chooseImage({
-        count: 1, // 鏈�澶氶�夋嫨1寮犲浘鐗�
-        sizeType: ['compressed', 'original'], // 鎻愪緵鍘嬬缉鍜屽師鍥鹃�夐」
+        count: 9, // 鏈�澶氶�夋嫨9寮犲浘鐗�
+        sizeType: ['compressed'], // 鍘嬬缉鍥剧墖
         sourceType: sourceType, // 鏍规嵁鐢ㄦ埛閫夋嫨璁剧疆鏉ユ簮
         success: (res) => {
-          const tempFilePath = res.tempFilePaths[0];
+          const tempFilePaths = res.tempFilePaths;
           
-          // 濡傛灉鏄媿鐓э紝鏄剧ず棰勮纭
+          // 濡傛灉鏄媿鐓э紝鐩存帴涓婁紶锛堝崟寮狅級
           if (sourceType.includes('camera')) {
-            this.showImagePreview(tempFilePath);
+            this.uploadImageToServer(tempFilePaths[0]);
           } else {
-            this.uploadImageToServer(tempFilePath);
+            // 鐩稿唽閫夋嫨锛屾壒閲忎笂浼�
+            this.uploadMultipleImages(tempFilePaths);
           }
         },
         fail: (error) => {
@@ -969,6 +1023,69 @@
             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();
       });
     },
     
@@ -1073,39 +1190,36 @@
       });
     },
     
-    // 浠庢湇鍔″櫒鍒犻櫎鍥剧墖
-    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: {
-          id: this.id // 褰撳墠妫�楠岄」鐩甀D
-        }
+        url: '/XJ/DeleteImageFromPicture',
+        data: data
       }).then(res => {
         uni.hideLoading();
         if (res.status === 0) {
-          uni.showToast({
-            title: '鍥剧墖鍒犻櫎鎴愬姛',
-            icon: 'success'
-          });
-          // 鍒锋柊椤甸潰鏁版嵁
-          this.refreshResult();
+          this.$showMessage('鍥剧墖鍒犻櫎鎴愬姛');
+          this.refreshResult(); // 鍒锋柊椤甸潰鏁版嵁
         } else {
-          uni.showToast({
-            title: res.message || '鍥剧墖鍒犻櫎澶辫触',
-            icon: 'none'
-          });
+          this.$showMessage(res.message || '鍒犻櫎澶辫触');
         }
-      }).catch(error => {
+      }).catch(err => {
         uni.hideLoading();
-        console.error('鍒犻櫎鍥剧墖澶辫触:', error);
-        uni.showToast({
-          title: '鍥剧墖鍒犻櫎澶辫触',
-          icon: 'none'
-        });
+        console.error('鍒犻櫎鍥剧墖澶辫触:', err);
+        this.$showMessage('鍒犻櫎澶辫触锛岃閲嶈瘯');
       });
     }
   },
@@ -2126,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