From 1bcee828a3340d5f5642b3dbcf4cd9733072b7aa Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 21 七月 2025 14:24:35 +0800
Subject: [PATCH] LLJ检验结果录入优化:添加自动保存和回车保存功能

---
 pages/QC/RKJ/Add.vue | 1387 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 817 insertions(+), 570 deletions(-)

diff --git a/pages/QC/RKJ/Add.vue b/pages/QC/RKJ/Add.vue
index 36fd29b..d4a4d1c 100644
--- a/pages/QC/RKJ/Add.vue
+++ b/pages/QC/RKJ/Add.vue
@@ -1,584 +1,831 @@
 <template>
-  <view>
-    <view class="form-container">
-      <form :modelValue="formData">
-        <view class="form-group">
-          <label class="form-label">妫�楠屽崟鍙�:</label>
-          <input class="form-input" disabled="true" type="text" v-model="formData.releaseNo"/>
-        </view>
-        <view class="form-group">
-          <label class="form-label">鍒涘缓浜�:</label>
-          <input class="form-input" disabled="true" type="text" v-model="formData.createBy"/>
-        </view>
-        <view class="form-group">
-          <label class="form-label">鍒涘缓鏃堕棿:</label>
-          <input class="form-input" disabled="true" type="text" v-model="formData.createDate"/>
-        </view>
-        <view class="uni-form-item uni-column form-item edit">
-          <text class="form-label">鐢熶骇绾垮埆:</text>
-          <superwei-combox v-if="isUpdate" :candidates="DAA020List" placeholder="璇烽�夋嫨鎴栬緭鍏�"
-                           v-model="formData.lineName"
-                           @select="onDaa020Change"
-                           class="picker form-input"
-                           style="border: none;"></superwei-combox>
-          <input v-else class="form-input" disabled="true" type="text" v-model="formData.daa015"/>
-        </view>
-
-        <view class="uni-form-item uni-column form-item edit">
-          <text class="form-label">閫佹鎵规鍙�:</text>
-          <superwei-combox v-if="isUpdate" :candidates="DAA001List" placeholder="璇烽�夋嫨鎴栬緭鍏�"
-                           v-model="formData.billNo"
-                           @select="onDaa001Change"
-                           class="picker form-input"
-                           style="border: none;"></superwei-combox>
-          <input v-else class="form-input" disabled="true" type="text" v-model="formData.billNo"/>
-        </view>
-        <view class="form-group">
-          <label class="form-label">鐗╂枡缂栫爜:</label>
-          <input class="form-input" disabled="true" type="text" v-model="formData.itemNo"/>
-        </view>
-        <view class="uni-title-sub uni-ellipsis-2">
-          <view class="form-group">
-            <label class="form-label">浜у搧鍚嶇О:</label>
-            <input class="form-input" disabled="true" type="text" v-model="formData.itemName"/>
-          </view>
-        </view>
-        <view class="form-group">
-          <label class="form-label">瑙勬牸鍨嬪彿:</label>
-          <input class="form-input" disabled="true" type="text" v-model="formData.itemModel"/>
-        </view>
-        <view class="form-group">
-          <label class="form-label">閫佹鏁伴噺:</label>
-          <input class="form-input" disabled="true" type="text" v-model="formData.quantity"/>
-        </view>
-		<view class="form-group">
-		  <label class="form-label">鎶ュ伐浜�:</label>
-		  <input class="form-input" disabled="true" type="text" v-model="formData.bgr"/>
-		</view>
-		<view class="form-group">
-		  <label class="form-label">妫�楠岀粨鏋�:</label>
-		  <input class="form-input" disabled="true" type="text" v-model="formData.fcheckResu"/>
-		</view>
-        <view class="form-group">
-          <label class="form-label">涓嶅悎鏍兼弿杩�:</label>
-          <input class="form-input" disabled="true" type="text" v-model="formData.remarks"/>
-        </view>
-      </form>
-    </view>
-
-    <view class="list-container">
-      <uni-table ref="table" border emptyText="鏆傛棤鏇村鏁版嵁">
-        <uni-tr>
-          <uni-th align="center" class="th" style="color: #FFFFFF;">妫�楠岄」鐩�</uni-th>
-          <uni-th align="center" class="th" style="color: #FFFFFF">鏄惁鍚堟牸</uni-th>
-          <uni-th align="center" class="th" style="color: #FFFFFF">璁板綍(鐐瑰嚮)</uni-th>
-        </uni-tr>
-        <uni-tr v-for="(item, index) in tableData" :key="index">
-          <uni-td align="center">
-            <input class="form-input" disabled="true" type="text" v-model="item.projName"/>
-          </uni-td>
-          <uni-td align="center">
-            <input class="form-input" disabled="true" type="text" v-model="item.result"/>
-          </uni-td>
-          <uni-td>
-            <view class="uni-group">
-              <button v-if="item.isCheck >=item.levelNum" type="default" @click="toDetail(item)">
-                {{ item.levelNum + '/' + item.isCheck }}
-              </button>
-              <button v-else type="warn" @click="toDetail(item)">
-                {{ item.levelNum + '/' + item.isCheck }}
-              </button>
-            </view>
-          </uni-td>
-        </uni-tr>
-      </uni-table>
-    </view>
-
-    <view class="plus-button">
-      <button type="warn" v-if="isUpdate && !isShowTable" @click="getItem">鐢熸垚妫�楠屽崟</button>
-    </view>
-	
-    <view class="plus-button">
-      <button type="warn" v-if="!isUpdate && !isShowTable" @click="toImage">涓婁紶/鏌ョ湅鍥剧墖</button>
-    </view>
-	
-    <view class="plus-button">
-      <button type="warn" v-if="!isUpdate && !isShowTable" @click="saveRemarks">娣诲姞涓嶅悎鏍兼弿杩�</button>
-    </view>
-	
-	<view class="plus-button">
-	  <button type="warn" v-if="!isUpdate && !isShowTable && this.formData.fsubmit != 1" @click="cleanResult">娓呴櫎妫�楠岀粨鏋�</button>
-	</view>
-	
-<!--    <view class="plus-button">
-      <button type="warn" v-if="!isUpdate && !formData.fcheckResu && !isShowTable" @click="removeXJ">鍒犻櫎鍗曟嵁</button>
-    </view> -->
-
-    <view class="plus-button">
-      <button type="warn" v-if="isShowTable" @click="getTable">鑾峰彇妫�楠岄」鐩�</button>
-    </view>
-
-    <view class="plus-button">
-      <button type="warn" v-if="isShowTable && isUpdate" @click="saveTable">鐢熸垚妫�楠岄」鐩�</button>
-    </view>
-
-
-    <view v-if="showPopup" class="overlay">
-      <view class="popup">
-        <h3>淇敼涓嶅悎鏍兼弿杩�</h3>
-        <form>
-          <view class="form-group">
-            <label class="form-label">涓嶅悎鏍兼弿杩�:</label>
-            <input class="form-input" type="text" v-model="remarks"/>
-          </view>
-          <button type="warn" @click="edit">淇敼</button>
-          <button @click="showPopup = !showPopup">鍙栨秷</button>
-        </form>
+    <view class="container">
+      <!-- 澶撮儴 -->
+      <view class="header">
+        <view class="title">鍏ュ簱妫�楠�</view>
+        <view class="order-number">妫�楠屽崟鍙�: {{formData.releaseNo}}</view>
       </view>
+  
+      <!-- 鍩烘湰淇℃伅 -->
+      <view class="section">
+        <view class="section-header">鍩烘湰淇℃伅</view>
+        <view class="section-body">
+          <view class="info-grid">
+            <view class="info-item">
+              <view class="info-label">妫�楠屽崟鍙�</view>
+              <view class="info-value">{{ formData.releaseNo }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">鍒涘缓浜�</view>
+              <view class="info-value">{{ formData.createBy }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">鍒涘缓鏃堕棿</view>
+              <view class="info-value">{{ formData.createDate }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">鐢熶骇绾垮埆</view>
+              <superwei-combox v-if="isUpdate" :candidates="DAA020List" placeholder="璇烽�夋嫨鎴栬緭鍏�"
+                               v-model="formData.lineName"
+                               @select="onDaa020Change"
+                               class="picker-input"></superwei-combox>
+              <view v-else class="info-value">{{ formData.daa015 }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">宸ュ崟鍙�</view>
+              <superwei-combox v-if="isUpdate" :candidates="DAA001List" placeholder="璇烽�夋嫨鎴栬緭鍏�"
+                               v-model="formData.rBillNo"
+                               @select="onDaa001Change"
+                               class="picker-input"></superwei-combox>
+              <view v-else class="info-value">{{ formData.rBillNo }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">閫佹鎵规</view>
+              <superwei-combox v-if="isUpdate" :candidates="billNoList" placeholder="璇烽�夋嫨"
+                               v-model="formData.billNo"
+                               @select="onBillNoChange"
+                               class="picker-input"></superwei-combox>
+              <view v-else class="info-value">{{ formData.billNo }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">鐗╂枡缂栫爜</view>
+              <view class="info-value">{{ formData.itemNo }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">浜у搧鍚嶇О</view>
+              <view class="info-value">{{ formData.itemName }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">瑙勬牸鍨嬪彿</view>
+              <view class="info-value">{{ formData.itemModel }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">閫佹鏁伴噺</view>
+              <view class="info-value highlight">{{ formData.quantity }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">鎶ュ伐浜�</view>
+              <view class="info-value">{{ formData.bgr }}</view>
+            </view>
+            <view class="info-item">
+              <view class="info-label">妫�楠岀粨鏋�</view>
+              <view class="info-value">{{ formData.fcheckResu }}</view>
+            </view>
+            <view class="info-item" v-if="formData.remarks">
+              <view class="info-label">涓嶅悎鏍兼弿杩�</view>
+              <view class="info-value danger">{{ formData.remarks }}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    
+      <!-- 妫�楠岄」鐩� -->
+      <view class="section" v-if="tableData.length > 0">
+        <view class="section-header">妫�楠岄」鐩�</view>
+        <view class="section-body">
+          <view class="inspection-table">
+            <table>
+              <thead>
+                <tr>
+                  <th width="20%" style="text-align: center;">妫�楠岄」鐩�</th>
+                  <th width="50%" style="text-align: center;">妫�楠屾弿杩�</th>
+                  <th width="15%" style="text-align: center;">璁板綍(鐐瑰嚮)</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr v-for="(item, index) in tableData" :key="index">
+                  <td>{{ item.projName }}</td>
+                  <td>
+                    <view v-if="item.result=='鍚堟牸'" class="watermark approved">
+                      {{ getStatusText(item.result) }}
+                    </view>
+                    <view v-if="item.result=='涓嶅悎鏍�'" class="watermark rejected">
+                      {{ getStatusText(item.result) }}
+                    </view>
+                    <view v-if="item.result==null || item.result=='鏈畬鎴�'" class="watermark pending">
+                      {{ getStatusText(item.result) }}
+                    </view>
+                    <view class="description-text">{{ item.projName }}</view>
+                  </td>
+                  <td>
+                    <button v-if="item.isCheck >= item.levelNum" class="record-btn" @click="toDetail(item)">鏌ョ湅</button>
+                    <button v-else class="record-btn" @click="toDetail(item)">濉啓</button>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </view>
+        </view>
+      </view>
+    
+      <!-- 鎿嶄綔鎸夐挳 -->
+      <view class="action-buttons">
+        <button class="action-btn primary" v-if="isUpdate && !isShowTable" @click="getItem">鐢熸垚妫�楠屽崟</button>
+        <button class="action-btn secondary" v-if="!isUpdate && !isShowTable" @click="toImage">涓婁紶/鏌ョ湅鍥剧墖</button>
+        <button class="action-btn warning" v-if="!isUpdate && !isShowTable" @click="saveRemarks">娣诲姞涓嶅悎鏍兼弿杩�</button>
+        <button class="action-btn danger" v-if="!isUpdate && !isShowTable && this.formData.fsubmit != 1" @click="cleanResult">娓呴櫎妫�楠岀粨鏋�</button>
+        <button class="action-btn primary" v-if="isShowTable" @click="getTable">鑾峰彇妫�楠岄」鐩�</button>
+        <button class="action-btn primary" v-if="isShowTable && isUpdate" @click="saveTable">鐢熸垚妫�楠岄」鐩�</button>
+      </view>
+    
+    
+      <!-- 淇敼涓嶅悎鏍兼弿杩板脊鍑烘 -->
+      <view v-if="showPopup" class="overlay">
+        <view class="popup">
+          <view class="popup-header">
+            <h3>淇敼涓嶅悎鏍兼弿杩�</h3>
+          </view>
+          <view class="popup-content">
+            <view class="input-group">
+              <view class="input-label">涓嶅悎鏍兼弿杩帮細</view>
+              <input class="input-field" type="text" v-model="remarks" placeholder="璇疯緭鍏ヤ笉鍚堟牸鎻忚堪"/>
+            </view>
+          </view>
+          <view class="popup-actions">
+            <button class="action-btn primary" @click="edit">淇敼</button>
+            <button class="action-btn secondary" @click="showPopup = !showPopup">鍙栨秷</button>
+          </view>
+        </view>
+      </view>
+  
     </view>
-
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      formData: {
-        id: "",
-        releaseNo: "",
-        createBy: "",
-        createDate: "",
-        daa020: "",
-        itemNo: "",
-        billNo: "",
-        catQty: "",
-        detailMem: "",
-        taskNo: "",
-        fcheckResu: "",
-        remarks: ""
+  </template>
+    
+    <script>
+    export default {
+      data() {
+        return {
+          formData: {
+            id: "",
+            releaseNo: "",
+            createBy: "",
+            createDate: "",
+            daa020: "",
+            itemNo: "",
+            billNo: "",
+            catQty: "",
+            detailMem: "",
+            taskNo: "",
+            fcheckResu: "",
+            remarks: "",
+            rbillNo: ""
+          },
+    
+          DAA020List: [],
+    
+          DAA001List: [],
+    
+          BillNoList: [],
+    
+          lineList: [],
+    
+          lineNo: "",
+    
+          tableData: [],
+    
+          isSubmit: true,
+    
+          isUpdate: true,
+    
+          isShowTable: false,
+    
+          remarks: "",
+    
+          showPopup: false,
+          billNoList: [],
+        };
       },
-
-      DAA020List: [],
-
-      DAA001List: [],
-
-      BillNoList: [],
-
-      lineList: [],
-
-      lineNo: "",
-
-      tableData: [],
-
-      isSubmit: true,
-
-      isUpdate: true,
-
-      isShowTable: false,
-
-      remarks: "",
-
-      showPopup: false,
-    };
-  },
-  onLoad(options) {
-    //options涓寘鍚簡url闄勫甫鐨勫弬鏁�
-
-    let params = options;
-
-    if (params["id"]) {
-      this.isUpdate = false;
-      this.formData.id = params["id"];
-      this.formData.releaseNo = params["releaseNo"];
-      //getQaItemXj02
-      this.init();
-    } else {
-      //鍒濆鍖栨楠屽崟鍙�
-      this.$post({
-        url: "/RKJ/getMaxReleaseNo"
-      }).then(res => {
-        this.formData.releaseNo = res.data.tbBillList;
-        this.formData.createBy = this.$loginInfo.account;
-        this.formData.createDate = this.$getDate("yyyy-mm-dd");
-      });
-
-      //杞﹂棿涓嬫媺妗嗙殑鍒濆鍖�
-      this.$post({
-        url: "/XJ/getLineAll"
-      }).then(res => {
-        this.lineList = res.data.tbBillList;
-        this.DAA020List = res.data.tbBillList.map(item => item.lineName);
-      })
-    }
-  },
-  methods: {
-    removeXJ() {
-      if (this.formData.id) {
-        this.$post({
-          url: "/RKJ/removeXJ",
-          data: {
-            id: this.formData.id
-          }
-        }).then(res => {
-          if (res.data.tbBillList > 0) {
-            this.$showMessage("鍒犻櫎鎴愬姛");
-            //鍏抽棴褰撳墠椤甸潰锛岃繑鍥炰笂涓�椤甸潰鎴栧绾ч〉闈�
-            uni.navigateBack();
-          } else {
-            this.$showMessage("鍒犻櫎澶辫触");
-          }
-        });
-      } else {
-        this.$showMessage("璇峰厛閫夋嫨妫�楠屽崟鍙�");
-      }
-    },
-    getItem() {
-
-      if (!this.formData.billNo) {
-        this.$showMessage("璇烽�夋嫨閫佹鎵规鍙�");
-        return;
-      }
-
-      if (this.isSubmit) {
-        this.$showMessage("姝ょ墿鏂欐棤鍚敤鐨勬楠岄」鐩紝璇风淮鎶�!");
-        return;
-      }
-
-      this.$post({
-        url: "/RKJ/save",
-        data: {
-          from: this.formData,
-          userNo: this.$loginInfo.account,
-          //moidNum: this.formData.moidNum
-          items: this.tableData
-        }
-      }).then(res => {
-        this.formData.id = res.data.tbBillList;
-        this.$showMessage("鐢熸垚妫�楠岄」鐩垚鍔�");
-        this.init();
-        this.isUpdate = false;
-      });
-    },
-    //鐢熶骇绾垮埆閫夋嫨骞跺垵濮嬭瘽宸ュ崟鍙�
-    onDaa020Change(event) {
-      //鑾峰彇鐢熶骇绾垮埆鐨勪笅鏍囧湴鍧�
-      this.formData.lineName = event;
-
-      this.lineNo = this.lineList[this.DAA020List.indexOf(event)].lineNo;
-
-      this.formData.line = this.lineNo;
-
-      this.$post({
-        url: "/RKJ/getDaa001",
-        data: {
-          lineNo: this.formData.lineName
-        }
-      }).then(res => {
-        this.BillNoList = res.data.tbBillList;
-        this.DAA001List = res.data.tbBillList.map(s => s.billNo);
-
-        this.formData.billNo = "";
-        this.formData.mocode = "";
-        this.formData.boardModel = "";
-        this.formData.taskNo = "";
-        this.formData.itemNo = "";
-        this.formData.boardName = "";
-        this.formData.quantity = "";
-        this.tableData = [];
-      })
-    },
-    //閫夊彇宸ュ崟濉厖鐗╂枡鍙峰拰鍏朵粬淇℃伅
-    onDaa001Change(e) {
-
-      this.formData.billNo = e;
-
-      let data = this.BillNoList[this.DAA001List.indexOf(e)];
-
-      //褰撹繑鍥炵殑缁撴灉闆嗕负绌烘椂缃┖鍘熸湁鐨勫��
-      if (!data) {
-        this.formData.billNo = "";
-        this.formData.mocode = "";
-        this.formData.boardModel = "";
-        this.formData.taskNo = "";
-        this.formData.itemNo = "";
-        this.formData.boardName = "";
-        this.formData.quantity = "";
-        this.tableData = [];
-        return;
-      }
-      //涓嶄负绌烘椂璧嬪��
-      this.formData.billNo = data.billNo;
-      this.formData.mocode = data.mocode;
-      this.formData.boardModel = data.boardModel;
-      this.formData.taskNo = data.taskNo;
-      this.formData.itemNo = data.itemNo;
-      this.formData.boardName = data.boardName;
-      this.formData.quantity = data.quantity;
-
-
-      this.$post({
-        url: "/RKJ/setJYItem",
-        data: {
-          itemNo: this.formData.itemNo,
-          quantity:this.formData.quantity
-        }
-      }).then(res => {
-        this.tableData = res.data.tbBillList;
-        if (this.tableData.length === 0) {
-          this.$showMessage("璇ョ墿鏂欐潯鐮佹病鏈夋楠岄」鐩�");
-          this.isSubmit = true;
-          this.tableData = [];
+      onLoad(options) {
+        //options涓寘鍚簡url闄勫甫鐨勫弬鏁�
+    
+        let params = options;
+    
+        if (params["id"]) {
+          this.isUpdate = false;
+          this.formData.id = params["id"];
+          this.formData.releaseNo = params["releaseNo"];
+          //getQaItemXj02
+          this.init();
         } else {
-          this.isSubmit = false;
-        }
-      });
-    },
-    init() {
-      this.$post({
-        url: "/RKJ/getPage",
-        data: {
-          id: this.formData.id,
-		  createUser: this.$loginInfo.account,
-          pageIndex: 1,
-          limit: 1,
-        }
-      }).then(res => {
-        let data = res.data.tbBillList[0];
-        if (data) {
-          this.formData = data;
-
+          //鍒濆鍖栨楠屽崟鍙�
           this.$post({
-            url: "/RKJ/getItems",
-            data: {
-              pid: this.formData.id
-            }
-          }).then(res1 => {
-
-            let tableData = res1.data.tbBillList
-
-            //褰撳凡妫�楠屼釜鏁伴兘涓嶄负绌烘椂鎸夌収妫�娴嬬粨鏋勬帓搴�
-            tableData.sort((a, b) => {
-              if (a.result === '鏈畬鎴�' && b.result === '鍚堟牸') {
-                return -1;
-              } else if (a.result === '鍚堟牸' && b.result === '鏈畬鎴�') {
-                return 1;
-              } else {
-                return 0;
-              }
-            });
-            this.tableData = tableData;
-
-            if (this.tableData.length === 0) {
-              this.isShowTable = true;
-            }
+            url: "/RKJ/getMaxReleaseNo"
+          }).then(res => {
+            this.formData.releaseNo = res.data.tbBillList;
+            this.formData.createBy = this.$loginInfo.account;
+            this.formData.createDate = this.$getDate("yyyy-mm-dd");
+          });
+    
+          //杞﹂棿涓嬫媺妗嗙殑鍒濆鍖�
+          this.$post({
+            url: "/XJ/getLineAll"
+          }).then(res => {
+            this.lineList = res.data.tbBillList;
+            this.DAA020List = res.data.tbBillList.map(item => item.lineName);
           })
         }
-      });
-    },
-    toDetail(item) {
-
-      if (this.isUpdate) {
-        uni.showToast({
-          icon: "none",
-          title: "璇峰厛鐢熸垚妫�楠岄」鐩�",
-          duration: 2000,
-        });
-      } else {
-        uni.navigateTo({
-          url: 'detail?id=' + item.id + '&billNo=' + this.formData.billNo + '&gid=' + this.formData
-              .id + '&itemInId=' + this.formData.itemInId
-        });
-      }
-    },
-    toImage() {
-      uni.navigateTo({
-        url: 'ImageItem?id=' + this.formData.id
-      });
-    },
-    saveRemarks() {
-      this.showPopup = !this.showPopup;
-      this.remarks = this.formData.remarks;
-    },
-    edit() {
-      if (this.remarks) {
-        //saveRemarksGid
-        this.$post({
-          url: "/RKJ/saveRemarksGid",
-          data: {
-            gid: this.formData.id,
-            remarks: this.remarks
+      },
+      methods: {
+        getStatusClass(result) {
+          if (result === '鍚堟牸') return 'status-pass';
+          if (result === '涓嶅悎鏍�') return 'status-fail';
+          return 'status-pending';
+        },
+        
+        getStatusText(status) {
+          const statusMap = {
+            approved: '鍚堟牸',
+            rejected: '涓嶅悎鏍�',
+            pending: '寰呯‘璁�'
           }
-        }).then(res => {
-          if(res.data.tbBillList > 0){
-            this.formData.remarks = this.remarks;
-            this.showPopup = !this.showPopup;
-            this.$showMessage("淇濆瓨鎴愬姛");
+          if (status == null || status == '鏈畬鎴�') {
+            return statusMap['pending'] || '寰呯‘璁�';
+          } else if (status == '鍚堟牸') {
+            return statusMap['approved'] || '鍚堟牸';
+          } else {
+            return statusMap['rejected'] || '涓嶅悎鏍�';
           }
-        })
-      }
-    },getTable() {
-      this.$post({
-        url: "/RKJ/setJYItem",
-        data: {
-          itemNo: this.formData.itemNo,
-          quantity:this.formData.quantity
-        }
-      }).then(res => {
-
-        this.tableData = res.data.tbBillList;
-        if (this.tableData.length === 0) {
-          this.$showMessage("璇ョ墿鏂欐潯鐮佹病鏈夋楠岄」鐩�");
-          this.isSubmit = true;
+        },
+        
+        removeXJ() {
+          if (this.formData.id) {
+            this.$post({
+              url: "/RKJ/removeXJ",
+              data: {
+                id: this.formData.id
+              }
+            }).then(res => {
+              if (res.data.tbBillList > 0) {
+                this.$showMessage("鍒犻櫎鎴愬姛");
+                //鍏抽棴褰撳墠椤甸潰锛岃繑鍥炰笂涓�椤甸潰鎴栧绾ч〉闈�
+                uni.navigateBack();
+              } else {
+                this.$showMessage("鍒犻櫎澶辫触");
+              }
+            });
+          } else {
+            this.$showMessage("璇峰厛閫夋嫨妫�楠屽崟鍙�");
+          }
+        },
+        getItem() {
+    
+          if (!this.formData.billNo) {
+            this.$showMessage("璇烽�夋嫨宸ュ崟鍙�");
+            return;
+          }
+    
+          if (this.isSubmit) {
+            this.$showMessage("姝ょ墿鏂欐棤鍚敤鐨勬楠岄」鐩紝璇风淮鎶�!");
+            return;
+          }
+    
+          this.$post({
+            url: "/RKJ/save",
+            data: {
+              from: this.formData,
+              userNo: this.$loginInfo.account,
+              //moidNum: this.formData.moidNum
+              items: this.tableData
+            }
+          }).then(res => {
+            this.formData.id = res.data.tbBillList;
+            this.$showMessage("鐢熸垚妫�楠岄」鐩垚鍔�");
+            this.init();
+            this.isUpdate = false;
+          });
+        },
+        //鐢熶骇绾垮埆閫夋嫨骞跺垵濮嬭瘽宸ュ崟鍙�
+        onDaa020Change(event) {
+          //鑾峰彇鐢熶骇绾垮埆鐨勪笅鏍囧湴鍧�
+          this.formData.lineName = event;
+    
+          this.lineNo = this.lineList[this.DAA020List.indexOf(event)].lineNo;
+    
+          this.formData.line = this.lineNo;
+    
+          this.$post({
+            url: "/RKJ/getDaa001",
+            data: {
+              lineNo: this.lineNo
+            }
+          }).then(res => {
+            this.BillNoList = res.data.tbBillList;
+            // 宸ュ崟鍙峰幓閲嶏紝鍙樉绀哄敮涓�
+            this.DAA001List = Array.from(new Set(res.data.tbBillList.map(s => s.rBillNo)));
+            this.formData.rBillNo = "";
+            this.formData.billNo = "";
+            this.formData.itemName = "";
+            this.formData.itemNo = "";
+            this.formData.quantity = "";
+            this.billNoList = [];
+            this.tableData = [];
+          })
+        },
+        //閫夊彇宸ュ崟濉厖鐗╂枡鍙峰拰鍏朵粬淇℃伅
+        onDaa001Change(e) {
+    
+          this.formData.rBillNo = e;
+    
+          // 鎵惧嚭鎵�鏈夊睘浜庤宸ュ崟鍙风殑閫佹鎵规
+          this.billNoList = this.BillNoList.filter(item => item.rBillNo === e).map(item => item.billNo);
+          this.formData.billNo = "";
+          this.formData.itemName = "";
+          this.formData.itemNo = "";
+          this.formData.quantity = "";
           this.tableData = [];
-          this.isShowTable = true;
-          this.isUpdate = false;
-        } else {
-          this.isSubmit = false;
-          this.isShowTable = true;
-          this.isUpdate = true;
+        },
+        onBillNoChange(e) {
+          this.formData.billNo = e;
+          // 鎵惧埌褰撳墠宸ュ崟鍙�+閫佹鎵规鍙风殑瀹屾暣鏁版嵁
+          let data = this.BillNoList.find(item => item.rBillNo === this.formData.rBillNo && item.billNo === e);
+          if (!data) {
+            this.formData.itemName = "";
+            this.formData.itemNo = "";
+            this.formData.quantity = "";
+            this.formData.itemModel = "";
+            this.tableData = [];
+            return;
+          }
+          this.formData.itemName = data.itemName;
+          this.formData.itemNo = data.itemNo;
+          this.formData.quantity = data.quantity;
+          this.formData.itemModel = data.itemModel || "";
+          // 濡傞渶鑷姩璇锋眰妫�楠岄」鐩紝鍙湪姝ゅ琛ュ厖閫昏緫
+        },
+        init() {
+          this.$post({
+            url: "/RKJ/getPage",
+            data: {
+              id: this.formData.id,
+              createUser: this.$loginInfo.account,
+              pageIndex: 1,
+              limit: 1,
+            }
+          }).then(res => {
+            let data = res.data.tbBillList[0];
+            if (data) {
+              this.formData = data;
+    
+              this.$post({
+                url: "/RKJ/getItems",
+                data: {
+                  pid: this.formData.id
+                }
+              }).then(res1 => {
+    
+                let tableData = res1.data.tbBillList
+    
+                //褰撳凡妫�楠屼釜鏁伴兘涓嶄负绌烘椂鎸夌収妫�娴嬬粨鏋勬帓搴�
+                tableData.sort((a, b) => {
+                  if (a.result === '鏈畬鎴�' && b.result === '鍚堟牸') {
+                    return -1;
+                  } else if (a.result === '鍚堟牸' && b.result === '鏈畬鎴�') {
+                    return 1;
+                  } else {
+                    return 0;
+                  }
+                });
+                this.tableData = tableData;
+    
+                if (this.tableData.length === 0) {
+                  this.isShowTable = true;
+                }
+              })
+            }
+          });
+        },
+        toDetail(item) {
+    
+          if (this.isUpdate) {
+            uni.showToast({
+              icon: "none",
+              title: "璇峰厛鐢熸垚妫�楠岄」鐩�",
+              duration: 2000,
+            });
+          } else {
+            uni.navigateTo({
+              url: 'detail?id=' + item.id + '&billNo=' + this.formData.billNo + '&gid=' + this.formData
+                  .id + '&itemInId=' + this.formData.itemInId
+            });
+          }
+        },
+        toImage() {
+          uni.navigateTo({
+            url: 'ImageItem?id=' + this.formData.id
+          });
+        },
+        saveRemarks() {
+          this.showPopup = !this.showPopup;
+          this.remarks = this.formData.remarks;
+        },
+        edit() {
+          if (this.remarks) {
+            //saveRemarksGid
+            this.$post({
+              url: "/RKJ/saveRemarksGid",
+              data: {
+                gid: this.formData.id,
+                remarks: this.remarks
+              }
+            }).then(res => {
+              if(res.data.tbBillList > 0){
+                this.formData.remarks = this.remarks;
+                this.showPopup = !this.showPopup;
+                this.$showMessage("淇濆瓨鎴愬姛");
+              }
+            })
+          }
+        },getTable() {
+          this.$post({
+            url: "/RKJ/setJYItem",
+            data: {
+              itemNo: this.formData.itemNo,
+              quantity:this.formData.quantity
+            }
+          }).then(res => {
+    
+            this.tableData = res.data.tbBillList;
+            if (this.tableData.length === 0) {
+              this.$showMessage("璇ョ墿鏂欐潯鐮佹病鏈夋楠岄」鐩�");
+              this.isSubmit = true;
+              this.tableData = [];
+              this.isShowTable = true;
+              this.isUpdate = false;
+            } else {
+              this.isSubmit = false;
+              this.isShowTable = true;
+              this.isUpdate = true;
+            }
+          });
+        },
+        saveTable() {
+          if (this.tableData.length === 0) {
+            return;
+          }
+    
+          this.$post({
+            url: "/RKJ/saveItem",
+            data: {
+              gid: this.formData.id,
+              items: this.tableData,
+              userNo: this.$loginInfo.account
+            }
+          }).then(res => {
+            this.formData.id = res.data.tbBillList;
+            this.isShowTable = false;
+            this.isUpdate = false;
+            this.init();
+          })
+        },
+        cleanResult(){
+            this.$post({
+              url: "/RKJ/cleanReqResult",
+              data: {
+                gid: this.formData.id,
+                userNo: this.$loginInfo.account
+              }
+            }).then(res => {
+                console.log(res);
+                if(res.status == 0){
+                    this.init();
+                }else{
+                    this.$showMessage(res.message);
+                }
+              
+            })
         }
-      });
-    },
-    saveTable() {
-      if (this.tableData.length === 0) {
-        return;
-      }
-
-      this.$post({
-        url: "/RKJ/saveItem",
-        data: {
-          gid: this.formData.id,
-          items: this.tableData,
-          userNo: this.$loginInfo.account
+      },
+      onShow() {
+        //姣忔杩涘叆椤甸潰閮戒細鎵ц鐨勬柟娉�
+        if (this.formData.id) {
+          this.init();
         }
-      }).then(res => {
-        this.formData.id = res.data.tbBillList;
-        this.isShowTable = false;
-        this.isUpdate = false;
-        this.init();
-      })
-    },
-	cleanResult(){
-		this.$post({
-		  url: "/RKJ/cleanReqResult",
-		  data: {
-		    gid: this.formData.id,
-		    userNo: this.$loginInfo.account
-		  }
-		}).then(res => {
-			console.log(res);
-			if(res.status == 0){
-				this.init();
-			}else{
-				this.$showMessage(res.message);
-			}
-		  
-		})
-	}
-  },
-  onShow() {
-    //姣忔杩涘叆椤甸潰閮戒細鎵ц鐨勬柟娉�
-    if (this.formData.id) {
-      this.init();
+      },
+    };
+    </script>
+    
+    <style scoped>
+    /* 鍩虹鏍峰紡 */
+    .container {
+      padding: 10px;
+      background-color: #f5f7fa;
+      min-height: 100vh;
     }
-  },
-};
-</script>
-
-<style>
-.form-group {
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #c9c9c9;
-}
-
-.form-label {
-  margin-bottom: 0;
-  padding: 5px;
-}
-
-.form-input {
-  flex: 1;
-  margin-bottom: 0;
-  padding: 5px;
-}
-
-
-.picker {
-  flex: 1;
-  margin-bottom: 0;
-  padding: 5px;
-  font-size: 12px;
-}
-
-.uni-form-item {
-  display: flex;
-  border-bottom: 1px solid #c9c9c9;
-}
-
-.edit {
-  background-color: white;
-}
-
-/* 榛樿鏍峰紡 */
-.list-container {
-  height: 60vh;
-  /* 璁剧疆鍒楄〃瀹瑰櫒鐨勯珮搴︿负鍓╀綑绌洪棿锛屽苟鍑忓幓琛ㄥ崟瀹瑰櫒鐨勯珮搴� */
-  overflow-y: auto;
-  /* 鍏佽鍒楄〃瀹瑰櫒鍨傜洿婊氬姩 */
-  padding: 10px;
-  /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛锛屼娇鍒楄〃鍐呭鏇寸編瑙� */
-}
-
-/* 鍦ㄥ皬灞忓箷璁惧涓婏紝閲嶇疆楂樺害涓洪�傚簲灞忓箷 */
-@media (max-width: 768px) {
-  .list-container {
-    height: calc(100vh - 500px);
-    /* 閫傚綋璋冩暣楂樺害 */
-  }
-}
-
-
-.form-container {
-  padding: 10px;
-  /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛锛屼娇琛ㄥ崟鍐呭鏇寸編瑙� */
-}
-
-.th {
-  background-color: lightskyblue;
-  color: #FFFFFF;
-}
-
-
-.plus-button {
-  line-height: 59px;
-  font-size: 24px;
-  cursor: pointer;
-  z-index: 1000;
-  margin-bottom: 10px;
-}
-
-.overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.popup {
-  background-color: #fff;
-  padding: 20px;
-  border: 1px solid #ccc;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-  width: 68vw;
-  /* 璁剧疆瀹藉害涓鸿鍙e搴︾殑80% */
-  height: 25vh;
-  /* 璁剧疆楂樺害涓鸿鍙i珮搴︾殑80% */
-}
-</style>
\ No newline at end of file
+    
+    /* 澶撮儴鏍峰紡 */
+    .header {
+      background-color: white;
+      padding: 20px;
+      border-radius: 8px;
+      box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
+      margin-bottom: 20px;
+    }
+    
+    .title {
+      font-size: 24px;
+      font-weight: 600;
+      color: #2c3e50;
+      margin-bottom: 8px;
+    }
+    
+    .order-number {
+      font-size: 14px;
+      color: #3498db;
+      font-weight: 500;
+    }
+    
+    /* 鍖哄煙鏍峰紡 */
+    .section {
+      background-color: white;
+      border-radius: 8px;
+      box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
+      margin-bottom: 20px;
+      overflow: hidden;
+    }
+    
+    .section-header {
+      background-color: #f8f9fa;
+      padding: 32px 32px;
+      border-bottom: 1px solid #eee;
+      font-size: 20px;
+      font-weight: 600;
+      color: #2c3e50;
+    }
+    
+    .section-body {
+      padding: 56px 40px;
+    }
+    
+    /* 淇℃伅缃戞牸 */
+    .info-grid {
+      display: grid;
+      grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+      gap: 48px;
+    }
+    
+    .info-item {
+      display: flex;
+      flex-direction: column;
+      gap: 5px;
+    }
+    
+    .info-label {
+      font-size: 16px;
+      font-weight: 600;
+      color: #7f8c8d;
+    }
+    
+    .info-value {
+      font-size: 18px;
+      font-weight: 500;
+      color: #2c3e50;
+    }
+    
+    .info-value.highlight {
+      font-weight: 600;
+      color: #3498db;
+      font-size: 16px;
+    }
+    
+    .info-value.danger {
+      color: #e74c3c;
+      font-weight: 500;
+    }
+    
+    /* 杈撳叆妗嗘牱寮� */
+    .info-input {
+      padding: 14px 20px;
+      border: 1px solid #ddd;
+      border-radius: 4px;
+      font-size: 16px;
+      background-color: white;
+    }
+    
+    /* 閫夋嫨鍣ㄦ牱寮� */
+    .picker-input {
+      border: 1px solid #ddd;
+      border-radius: 4px;
+      padding: 14px 20px;
+      background-color: white;
+      cursor: pointer;
+      font-size: 16px;
+      color: #2c3e50;
+    }
+    
+    /* 妫�楠岄」鐩〃鏍� */
+    .inspection-table {
+      width: 100%;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+      margin: 25px 0;
+    }
+    
+    .inspection-table table {
+      width: 100%;
+      border-collapse: collapse;
+    }
+    
+    .inspection-table th {
+      background-color: #f8f9fa;
+      color: #34495e;
+      padding: 12px 15px;
+      font-weight: bold;
+      text-align: left;
+      border: 1px solid #ddd;
+    }
+    
+    .inspection-table td {
+      padding: 12px 15px;
+      text-align: left;
+      border: 1px solid #ddd;
+    }
+    
+    .inspection-table tr:nth-child(even) {
+      background-color: #f9f9f9;
+    }
+    
+    .inspection-table tr:hover {
+      background-color: #f1f5f9;
+    }
+    
+    /* 姘村嵃鏍峰紡 */
+    .watermark {
+      position: absolute;
+      font-size: 40px;
+      font-weight: bold;
+      opacity: 1;
+      z-index: 1;
+      pointer-events: none;
+      transform: rotate(-15deg);
+      width: 100%;
+      text-align: center;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%) rotate(-15deg);
+    }
+    
+    .watermark.approved {
+      color: #2ecc71;
+    }
+    
+    .watermark.rejected {
+      color: #e74c3c;
+    }
+    
+    .watermark.pending {
+      color: #f39c12;
+    }
+    
+    /* 鎻忚堪鏂囨湰瀹瑰櫒 */
+    .description-text {
+      position: relative;
+      z-index: 2;
+      padding: 25px;
+      background-color: rgba(255, 255, 255, 0.7);
+    }
+    
+    /* 璋冩暣琛ㄦ牸鍗曞厓鏍� */
+    .inspection-table td:nth-child(2) {
+      position: relative;
+      overflow: hidden;
+      padding: 0;
+    }
+    
+    .record-btn {
+      padding: 6px 12px;
+      background-color: #f8f9fa;
+      border: 1px solid #ddd;
+      border-radius: 3px;
+      cursor: pointer;
+      transition: all 0.2s;
+      font-size: 14px;
+      color: #333;
+    }
+    
+    .record-btn:hover {
+      background-color: #e9ecef;
+    }
+    
+    
+    /* 鎿嶄綔鎸夐挳 */
+    .action-buttons {
+      display: flex;
+      flex-direction: row;
+      justify-content: flex-end;
+      gap: 20px;
+      margin-bottom: 20px;
+    }
+    
+    .action-btn {
+      padding: 12px 20px;
+      border: none;
+      border-radius: 6px;
+      font-size: 14px;
+      font-weight: 500;
+      cursor: pointer;
+      transition: all 0.2s;
+    }
+    
+    .action-btn.primary {
+      background-color: #3498db;
+      color: white;
+    }
+    
+    .action-btn.secondary {
+      background-color: #95a5a6;
+      color: white;
+    }
+    
+    .action-btn.danger {
+      background-color: #e74c3c;
+      color: white;
+    }
+    
+    .action-btn.warning {
+      background-color: #f39c12;
+      color: white;
+    }
+    
+    /* 寮瑰嚭妗嗘牱寮� */
+    .overlay {
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      background-color: rgba(0, 0, 0, 0.5);
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      z-index: 1000;
+    }
+    
+    .popup {
+      background-color: white;
+      border-radius: 8px;
+      box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+      width: 90%;
+      max-width: 400px;
+      max-height: 80vh;
+      overflow-y: auto;
+    }
+    
+    .popup-header {
+      padding: 20px;
+      border-bottom: 1px solid #eee;
+    }
+    
+    .popup-header h3 {
+      font-size: 18px;
+      font-weight: 600;
+      color: #2c3e50;
+      margin: 0;
+    }
+    
+    .popup-content {
+      padding: 20px;
+    }
+    
+    .input-group {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+    }
+    
+    .input-label {
+      font-size: 14px;
+      color: #7f8c8d;
+      font-weight: 500;
+    }
+    
+    .input-field {
+      padding: 8px 12px;
+      border: 1px solid #ddd;
+      border-radius: 4px;
+      font-size: 14px;
+      background-color: white;
+    }
+    
+    .popup-actions {
+      padding: 20px;
+      border-top: 1px solid #eee;
+      display: flex;
+      gap: 10px;
+      justify-content: flex-end;
+    }
+    
+    /* 鍝嶅簲寮忚璁� */
+    @media (max-width: 768px) {
+      .info-grid {
+        grid-template-columns: 1fr;
+        gap: 20px;
+      }
+      
+      .action-buttons {
+        flex-direction: column;
+        justify-content: flex-start;
+        gap: 10px;
+      }
+    }
+    </style>
\ No newline at end of file

--
Gitblit v1.9.3