From 408b576b8aa155c9f7c8b919be3cd82be52a1da8 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 25 十一月 2025 08:52:44 +0800
Subject: [PATCH] 1.标准代码更新（2025-11-25）
---
H5/IPQC_XJ/Add.aspx | 80 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 14 deletions(-)
diff --git a/H5/IPQC_XJ/Add.aspx b/H5/IPQC_XJ/Add.aspx
index 86cf8ec..bb89f8f 100644
--- a/H5/IPQC_XJ/Add.aspx
+++ b/H5/IPQC_XJ/Add.aspx
@@ -89,11 +89,15 @@
:right-icon-size="19"
v-model="selectKey"
><template #button>
- <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ <van-button size="small" type="info" @click="getInfo" >閫夋嫨</van-button>
</template></van-field>
<van-action-sheet v-model="daashow" :actions="actions" @select="onSelect" ></van-action-sheet>
- <van-field label="鎸囦护宸ュ崟" colon="true" v-model="formData.lotNo" @keyup.enter.native="createByWomdaa" ></van-field>
+ <van-field label="鎸囦护宸ュ崟" colon="true" v-model="formData.lotNo" @keyup.enter.native="createByWomdaa" >
+ <template #button>
+ <van-button size="small" type="info" @click="scanOnH5DAA " >鎵弿</van-button>
+ </template>
+ </van-field>
<van-field label="妫�楠屾椂娈�" colon="true" v-model="formData.checkTimeSlot" readonly ></van-field>
<%-- <van-field label="鍒涘缓鏃堕棿" colon="true" v-model="formData.createDate" readonly ></van-field>
<van-field label="鍒涘缓浜�" colon="true" v-model="formData.createBy" readonly ></van-field>--%>
@@ -111,15 +115,23 @@
<div class="wrap-content">{{ formData.itemModel }}</div>
</template>
</van-field>
+
<%-- <van-field label="鏁伴噺" colon="true" v-model="formData.fcovertQty" readonly ></van-field>--%>
<van-field label="涓嶅悎鏍兼弿杩�" v-if='formData.fCheckResu == "N:涓嶅悎鏍�"' colon v-model="remarks" readonly class="wrap-field">
<template #input>
<div class="wrap-content">{{ remarks }}</div>
</template>
<template #button>
- <van-tag type="primary" style="font-size:15px" @click="updateRemarks(formData.guid)">杈撳叆</van-tag>
+ <%--<van-tag type="primary" style="font-size:15px" @click="updateRemarks(formData.guid)">杈撳叆</van-tag>--%>
+ <van-button size="small" type="info" @click="updateRemarks(formData.guid)" >杈撳叆</van-button>
</template>
</van-field>
+ <van-field label="妫�楠屽伐浣�" colon="true" v-model="jyGw" @keyup.enter.native="selIpqcItemsByGw" >
+ <template #button>
+ <van-button size="small" type="info" @click="scanOnH5GW" >鎵弿</van-button>
+<%-- <van-tag type="primary" style="font-size:15px" @click="scanOnH5">鎵弿</van-tag>--%>
+ </template>
+ </van-field>
<van-dialog v-model="showDialog" title="涓嶅悎鏍兼弿杩�" :show-cancel-button="false" @confirm="remarksConfirm">
<van-field
v-model="remarks"
@@ -158,19 +170,24 @@
<van-tabs color="#000" title-active-color="#0283EF" style="padding-bottom: 120px;">
<van-tab title="妫�楠岄」鐩�" class="mySolid font">
<van-row type="flex" justify="center">
- <van-col span="10" center class="text-left padding-left">妫�楠岄」鐩�</van-col>
- <van-col span="8">宸叉鏁�/鎶芥鏁�</van-col>
+ <van-col span="8" center class="text-left padding-left">妫�楠岄」鐩�</van-col>
+ <van-col span="5">宸叉鏁�/鎶芥鏁�</van-col>
+ <van-col span="5">宸ヤ綅</van-col>
<van-col span="6">妫�楠岀粨鏋�</van-col>
</van-row>
<van-row v-for="(item,index) in tableData" :key="index" type="flex" justify="left">
- <van-col span="10" center class="text-left padding-left" >
+ <van-col span="8" center class="text-left padding-left" >
<van-cell center
center :title="item.fcheckItem" @click="togglePopup(index)"></van-cell>
</van-col>
- <van-col span="8" >
+ <van-col span="5" >
<van-cell center
center :title="item.fenterQty + '/' + item.checkQyt" @click="togglePopup(index)"></van-cell>
+ </van-col>
+ <van-col span="5" >
+ <van-cell center
+ center :title="item.stationName" @click="togglePopup(index)"></van-cell>
</van-col>
<van-col center span="6" >
<van-cell center
@@ -180,6 +197,10 @@
<van-cell center
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 >
@@ -209,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>
@@ -220,8 +241,8 @@
<van-field label="鏍囧噯鍊�" colon="true" v-model="jymxData.fstand" readonly ></van-field>
<van-field label="涓婇檺" colon="true" v-model="jymxData.fupAllow" readonly ></van-field>
<%--<van-field label="AC鏁�" colon="true" v-model="jymxData.facQty" readonly ></van-field>--%>
- <van-field label="RE鏁�" colon="true" v-model="jymxData.freQty" readonly ></van-field>
- <van-field label="鏍锋湰鏁�" colon="true" v-model="jymxData.ybsl" readonly ></van-field>
+<%-- <van-field label="RE鏁�" colon="true" v-model="jymxData.freQty" readonly ></van-field>
+ <van-field label="鏍锋湰鏁�" colon="true" v-model="jymxData.ybsl" readonly ></van-field>--%>
<%--<van-field label="棰勮缁撴灉" colon="true" v-model="jymxData.result" readonly ></van-field>--%>
<%--<van-field label="缁撴灉褰曞叆" colon="true" v-model="resultValue" placeholder="璇疯緭鍏K-鏁板瓧鎴朜G-鏁板瓧"></van-field>--%>
@@ -229,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"
@@ -274,6 +316,16 @@
>
涓嶅悎鏍�
</van-button>
+ <van-button
+ type="default"
+ color ="#c2bcbd"
+ size="small"
+ class="status-btn"
+ @click="handleQualifiedCancel()"
+ >
+ /
+ </van-button>
+
</div>
</div>
</template>
@@ -351,5 +403,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_XJ/Add.js?<%=11111111111 %>"></script>
+ <script src="../Js/IPQC_XJ/Add.js?<%=1111111111255 %>"></script>
</asp:Content>
--
Gitblit v1.9.3