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/Scll.aspx | 167 +++++++++++++++++++++++++++----------------------------
1 files changed, 81 insertions(+), 86 deletions(-)
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index f5f4f52..92ce845 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -1,94 +1,45 @@
锘�<%@ Page Title="鐢熶骇棰嗘枡" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Scll.aspx.cs" Inherits="H5_Scll" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<style>
-/* 鍏ㄥ眬鏍峰紡浼樺寲 */
-.content-wrapper {
- margin: 8px;
- background: #f8f9fa;
- border-radius: 8px;
- padding: 3px;
- box-shadow: 0 2px 4px rgba(0,0,0,0.05);
-}
-
-/* 琛ㄥ崟瀛楁鍒嗛殧绾� */
-.van-cell-group .van-cell:not(:last-child)::after {
- border-bottom: 1px solid #eee !important;
- left: 0;
- right: 0;
-}
-
-.mySolid .van-row {
- border-bottom: .00267rem solid #b1b1b1;
-}
-
-/* 鏍囩棰滆壊璁剧疆 */
-.van-field__label {
- color: #7c7a7a;
- flex-basis: 28%;
-}
-
-/* 鏁版嵁鏂囨湰棰滆壊 */
-.van-field__value,
-.van-field__control {
- color: #333;
-}
-
-/* 琛屽鍣ㄦ牱寮� */
-.van-tab__panel .van-row {
- padding: 2px 0;
- margin: 2px 0;
- position: relative;
- border-bottom: 1px solid #eee;
-}
-
-/* 鏁版嵁鍒楁牱寮� */
-.van-col {
- padding: 2px 2px;
- margin: 2px 0;
- border: 1px solid #f0f0f0;
- border-radius: 4px;
- background: white;
- font-size: 12px;
- line-height: 1.6;
- box-sizing: border-box;
-}
-
-/* 鐗规畩鏂囨湰鏍峰紡 */
-.blue-text {
- color: #1989fa;
- font-weight: 500;
-}
-
-/* 鍝嶅簲寮忎紭鍖� */
-@media (max-width: 375px) {
- .van-field__label {
- flex-basis: 30%;
- font-size: 12px;
+ .bg-info {
+ background-color: #fff;
}
- .van-col {
- padding: 2px 1px;
- margin: 1px 0;
- font-size: 11px;
+ .org-info {
+ height: 0.5rem;
+ line-height: 0.5rem;
+ padding: 0 0.16rem;
}
- .van-tab__panel .van-row {
- padding: 1px 0;
- margin: 1px 0;
- }
-}
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
<div class="content-wrapper">
<van-nav-bar
- title="鐢熶骇棰嗘枡"
+ title="鐢熶骇澶囨枡"
left-text="杩斿洖"
left-arrow
@click-left="GoBack()">
</van-nav-bar>
+
<div class="mySolid">
<van-cell-group>
+ <van-field
+ ref ="selectKey"
+ value=""
+ label="宸ュ崟鏌ヨ"
+ clearable
+ placeholder="璇疯緭鍏ュ伐鍗曞彿杩涜鏌ヨ"
+ :right-icon-size="19"
+ v-model="selectKey"
+ ><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template></van-field>
<van-field
ref="daa001"
v-model="modeInfo.daa001"
@@ -102,11 +53,29 @@
</van-field>
<van-field
- v-model="modeInfo.planNo"
+ v-model="DaaInfo.workNo"
label="浠诲姟鍗曞彿"
clearable
:right-icon-size="19"
placeholder="浠诲姟鍗曞彿"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.startTime"
+ label="寮�宸ユ椂闂�"
+ clearable
+ :right-icon-size="19"
+ placeholder="寮�宸ユ椂闂�"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.lineName"
+ label="绾夸綋鍚嶇О"
+ clearable
+ :right-icon-size="19"
+ placeholder="绾夸綋鍚嶇О"
disabled>
</van-field>
@@ -147,28 +116,54 @@
</van-cell-group>
</div>
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
<van-tabs color="#000" title-active-color="#0283EF">
- <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
<van-row>
<van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
<van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
<van-col span="3">寰呮壂</van-col>
<van-col span="5">鎺ㄨ崘搴撲綅</van-col>
</van-row>
- <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
- <van-col span="8" class="text-left padding-left">
- <div class="blue-text">{{itm.itemNo}}</div>
- <div>{{itm.itemName}}</div>
+ <van-row
+ v-for="(itm,index) in ItemDetail.items"
+ :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
</van-col>
- <van-col span="8" class="text-left padding-left">
- <div>{{itm.itemModel}}</div>
- </van-col>
- <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
- <van-col span="5">{{itm.recoKw}}</van-col>
</van-row>
</van-tab>
- <van-tab title="宸查鐗╂枡" class="mySolid font">
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
<van-row>
<van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
<van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
@@ -196,5 +191,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scll.js?<%=123336 %>"></script>
+ <script src="Js/Scll.js?<%=1233361592 %>"></script>
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3