From b48cbaed482a5e530052a9e31fa0d2e8fd06cec4 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 08 九月 2025 09:00:51 +0800
Subject: [PATCH] 1.巡检上下限为0的，判定为选择合格不合格(已更新) 2.AGV选择点位 3.现场收料新增参数
---
H5/IPQC_XJ/Add.aspx | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/H5/IPQC_XJ/Add.aspx b/H5/IPQC_XJ/Add.aspx
index 86cf8ec..83c79b1 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
@@ -220,8 +237,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>--%>
@@ -236,11 +253,11 @@
</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"
@@ -351,5 +368,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?<%=1111111111254 %>"></script>
</asp:Content>
--
Gitblit v1.9.3