From 21777d31885b89a1c6f062786d5c4a2a4d21771b Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期四, 13 十一月 2025 19:29:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LB_PdaClient
---
H5/Scll.aspx | 126 ++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 52 deletions(-)
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index 92c098a..92ce845 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -1,26 +1,23 @@
锘�<%@ 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>
- .bg-info {
- background-color: #fff;
+ .bg-info {
+ background-color: #fff;
}
- .submit-btn {
- width: 90%;
- margin: 15px auto;
- display: block;
+ .org-info {
+ height: 0.5rem;
+ line-height: 0.5rem;
+ padding: 0 0.16rem;
}
- .center-button {
- display: flex;
- justify-content: center;
- align-items: center;
- }
- .content-wrapper {
- padding-bottom: 20px;
- }
- </style>
+</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="鐢熶骇澶囨枡"
@@ -29,22 +26,20 @@
@click-left="GoBack()">
</van-nav-bar>
+
<div class="mySolid">
<van-cell-group>
<van-field
- ref="selectKey"
- value=""
- label="宸ュ崟鏌ヨ"
- clearable
+ ref ="selectKey"
+ value=""
+ label="宸ュ崟鏌ヨ"
+ clearable
placeholder="璇疯緭鍏ュ伐鍗曞彿杩涜鏌ヨ"
- :right-icon-size="19"
+ :right-icon-size="19"
v-model="selectKey"
- >
- <template #button>
- <van-button size="small" type="info" plain @click="getInfo">閫夋嫨</van-button>
- </template>
- </van-field>
-
+ ><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template></van-field>
<van-field
ref="daa001"
v-model="modeInfo.daa001"
@@ -58,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>
@@ -100,25 +113,10 @@
鏉＄爜鎷嗗垎
</van-button>
</van-field>
-
- <van-field class="center-button">
- <div slot="button" style="display: flex; justify-content: center; width: 100%;">
- <van-button
- type="info"
- size="small"
- plain
- @click="getModelAll">
- 鏌ョ湅宸ュ崟鍏ㄩ儴鐗╂枡
- </van-button>
- </div>
- </van-field>
</van-cell-group>
</div>
- <%-- <!-- 閫佹鎸夐挳鏀惧湪瀛楁缁勫閮� -->
- <van-button class="submit-btn" type="primary" @click="submitInspection" :loading="load" loading-text="鍙戦�佷腑">閫佹</van-button>--%>
-
- <van-action-sheet v-model="show" :actions="actions" @select="onSelect"></van-action-sheet>
+ <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">
@@ -128,16 +126,40 @@
<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-row>
+ </van-tab>
+
+ <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="3" class="blue-text">{{itm.dsQty}}</van-col>
- <van-col span="5">{{itm.recoKw}}</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>
@@ -169,5 +191,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scll.js?<%=12333616 %>"></script>
+ <script src="Js/Scll.js?<%=1233361592 %>"></script>
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3