From dabdd8650e5b963dda830ae1e88d4479ae8a9e52 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 27 十月 2025 09:42:54 +0800
Subject: [PATCH] 1.条码打印样式调整 2.一件送检 3.巡检子表新增检验项目描述

---
 H5/IPQC_XJ/Add.aspx |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/H5/IPQC_XJ/Add.aspx b/H5/IPQC_XJ/Add.aspx
index e21e52b..bb89f8f 100644
--- a/H5/IPQC_XJ/Add.aspx
+++ b/H5/IPQC_XJ/Add.aspx
@@ -198,6 +198,10 @@
                           center v-else-if="item.fcheckResu === 'N:涓嶅悎鏍�'">
                           <van-tag round plain type="danger" style="font-size:15px" @click="togglePopup(index)">涓嶅悎鏍�</van-tag>   
                         </van-cell>
+                           <van-cell center
+                          center v-else-if="item.fcheckResu === '/'">
+                          <van-tag round plain type="default" color ="#c2bcbd" style="font-size:15px" @click="togglePopup(index)">/</van-tag>   
+                        </van-cell>
                             <van-cell center
                               center v-else >
                               <van-tag round plain type="warning" style="font-size:15px" @click="togglePopup(index)">杩涜涓�</van-tag>   
@@ -226,7 +230,7 @@
           <div  class="content-wrapper-jymx">
             <van-tabs v-model="tabActive" sticky color="#000" round  ellipsis="false"  @click="handleTabClick">
                 <van-tab v-for="(itm,index) in tableData" round  :key="index" :name="index" >
-                    <template #title > {{itm.fcheckItem}} <van-icon v-if="itm.fenterQty >=itm.checkQyt" name="success" color="#1989fa" class="badge-icon" ></van-icon></template>
+                    <template #title > {{itm.fcheckItem}} <van-icon v-if="itm.fenterQty >=itm.checkQyt || itm.fcheckResu === '/'" name="success" color="#1989fa" class="badge-icon" ></van-icon></template>
                     <template>
                           <van-cell-group>
                               <van-field label="椤圭洰鍚嶇О" colon="true" v-model="jymxData.fcheckItem" readonly ></van-field>
@@ -246,18 +250,39 @@
                                    <template #input>
                                        <van-tag round plain v-if="jymxData.fcheckResu === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
                                        <van-tag round plain v-else-if="jymxData.fcheckResu === 'N:涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
+                                       <van-tag round plain v-else-if="jymxData.fcheckResu === '/'" type="default" color ="#c2bcbd">/</van-tag>
                                        <van-tag round plain v-else type="warning">杩涜涓�</van-tag>
                                    </template>
                                 </van-field>
-                             
+                                 
+                                <van-field label="妫�楠岄」鐩弿杩�" colon v-model="checkItemDesc" readonly class="wrap-field"> 
+                                  <template #input>
+                                      <div class="wrap-content">{{ checkItemDesc }}</div>
+                                    </template>
+                                  <template #button>
+                                      <van-button size="small" type="info" @click="updateCheckItemDesc(jymxData.guid)" >杈撳叆</van-button>
+                                  </template>
+                                </van-field>
+                                
+                                <van-dialog v-model="showCheckItemDescDialog" title="妫�楠岄」鐩弿杩�" :show-cancel-button="false" @confirm="checkItemDescConfirm">
+                                  <van-field
+                                    v-model="checkItemDesc"
+                                    rows="5"
+                                    autosize
+                                    type="textarea"
+                                    maxlength="500"
+                                    placeholder="璇疯緭鍏ユ楠岄」鐩弿杩�"
+                                    show-word-limit
+                                />
+                               </van-dialog>
                     </template>
                     <template>
                               <!-- 杈撳叆妗� -->
-                              <div v-if="jymxData.fdownAllow !== '' && jymxData.fupAllow !== ''" class="si-input-box">
+                              <div v-if="jymxData.fdownAllow !== '' && jymxData.fdownAllow !== '0' && jymxData.fupAllow !== ''&& jymxData.fupAllow !== '0'" class="si-input-box">
                                 <div class="si-input__left">
                                   <span class="si-input__label">妫�楠屽�艰緭鍏�</span>
                                 </div>
-                                <div v-if="jymxData.fdownAllow !== '' && jymxData.fupAllow !== ''" class="si-status__right">
+                                <div v-if="jymxData.fdownAllow !== '' && jymxData.fdownAllow !== '0' && jymxData.fupAllow !== ''&& jymxData.fupAllow !== '0'" class="si-status__right">
                                   <van-field
                                       :ref="'inputValue' + tabActive"
                                       v-model="inputValue"
@@ -291,6 +316,16 @@
                             >
                               涓嶅悎鏍�
                             </van-button>
+                            <van-button 
+                              type="default" 
+                              color ="#c2bcbd"
+                              size="small"
+                              class="status-btn"
+                              @click="handleQualifiedCancel()"
+                            >
+                              /
+                            </van-button>
+
                           </div>
                       </div>
                     </template>
@@ -368,5 +403,5 @@
   <%--<comback ></comback>--%>
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_XJ/Add.js?<%=1111111111254 %>"></script>
+ <script src="../Js/IPQC_XJ/Add.js?<%=1111111111255 %>"></script>
 </asp:Content>

--
Gitblit v1.9.3