From 1ad8334fa579f1746efe55303a7773ad85aeee51 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 20 六月 2025 08:17:44 +0800
Subject: [PATCH] 1.生产补料优化 2.生产退料优化
---
H5/LLJ/List.aspx | 97 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 74 insertions(+), 23 deletions(-)
diff --git a/H5/LLJ/List.aspx b/H5/LLJ/List.aspx
index c0a5857..a49f79c 100644
--- a/H5/LLJ/List.aspx
+++ b/H5/LLJ/List.aspx
@@ -5,7 +5,20 @@
.bg-info {
background-color: #fff;
}
- </style>
+ .van-search {
+ padding: 10px;
+ background: #f7f8fa;
+ }
+ .van-search__action {
+ color: #1989fa; /* 璁剧疆瀛椾綋棰滆壊涓鸿摑鑹� */
+ }
+
+ .van-cell__title {
+ text-align: left;
+ }
+
+ </style>
+
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
<van-nav-bar
@@ -14,9 +27,20 @@
left-arrow
@click-left="GoBack()"
></van-nav-bar>
- <div>
- <van-tabs v-model="current" @click="onClickTab">
- <van-tab title="鏈楠�">
+ <van-search
+ v-model="searchKeyword"
+ placeholder="杈撳叆鍗曞彿/鐗╂枡/渚涘簲鍟嗙瓑鎼滅储"
+ show-action
+ @search="handleSearch"
+ >
+ <template #action>
+ <%--<van-tag plain round type="primary" @click="handleSearch">鎼滅储</van-tag>--%>
+ <div @click="handleSearch">鎼滅储</div>
+ </template>
+ </van-search>
+ <div class ="content-wrapper">
+<%-- <van-tabs v-model="current" @click="onClickTab">
+ <van-tab title="鏈楠�">--%>
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model="loading"
@@ -28,25 +52,44 @@
<van-cell-group>
<van-cell :title="item.releaseNo" is-link :url="'Add.aspx?id='+item.guid+'&lotNo='+item.lotNo+'&releaseNo='+item.releaseNo" ></van-cell>
<van-field label="鍒拌揣鍗曞彿" colon="true" v-model="item.lotNo" readonly ></van-field>
- <van-checkbox v-model="item.ftype" disabled>濮斿</van-checkbox>
- <van-checkbox v-model="item.urgentFlag == 1" disabled>鎬ユ枡鏍囪瘑</van-checkbox>
- <van-field label="鍒涘缓鏃堕棿" colon="true" v-model="item.createDate" readonly ></van-field>
- <van-field label="鍒涘缓浜�" colon="true" v-model="item.createBy" readonly ></van-field>
+ <!-- 鑷畾涔夊瓧娈电敤浜庢樉绀轰袱涓爣璇� -->
+ <van-field label="鏍囪瘑" colon="true" readonly >
+ <template #input>
+ <div class="checkbox-container">
+ 濮斿<van-checkbox v-model="item.ftype" disabled></van-checkbox>
+ 鎬ユ枡<van-checkbox v-model="item.urgentFlag" disabled></van-checkbox>
+ </div>
+ </template>
+ </van-field>
+<%-- <van-checkbox v-model="item.ftype" disabled>濮斿</van-checkbox>
+ <van-checkbox v-model="item.urgentFlag == 1" disabled>鎬ユ枡鏍囪瘑</van-checkbox>--%>
+ <%--<van-field label="鍒涘缓鏃堕棿" colon="true" v-model="item.createDate" readonly ></van-field>
+ <van-field label="鍒涘缓浜�" colon="true" v-model="item.createBy" readonly ></van-field>--%>
<van-field label="鐗╂枡缂栫爜" colon="true" v-model="item.itemNo" readonly ></van-field>
<van-field label="鐗╂枡鍚嶇О" colon="true" v-model="item.itemName" readonly ></van-field>
- <van-field label="瑙勬牸鍨嬪彿" colon="true" v-model="item.itemModel" readonly ></van-field>
- <van-field label="鏁伴噺" colon="true" v-model="item.fcovertQty" readonly ></van-field>
+ <%--<van-field label="瑙勬牸鍨嬪彿" colon="true" v-model="item.itemModel" readonly ></van-field>--%>
+ <van-field label="鏁伴噺" colon="true" v-model="item.fbatchQty" readonly ></van-field>
<van-field label="渚涘簲鍟�" colon="true" v-model="item.suppName" readonly ></van-field>
- <van-field label="妫�楠屼汉" colon="true" v-model="item.fcheckBy" readonly ></van-field>
- <van-field label="妫�娴嬬粨鏋�" colon="true" v-model="item.fcheckResu" readonly ></van-field>
+ <%--<van-field label="妫�楠屼汉" colon="true" v-model="item.fcheckBy" readonly ></van-field>--%>
+
+ <van-field label="妫�娴嬬粨鏋�" colon="true" readonly >
+ <template #input>
+ <van-tag round plain v-if="item.fcheckResu === 'N:涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
+ <van-tag round plain v-else-if="item.fcheckResu === 'I:杩涜涓�'" type="warning">杩涜涓�</van-tag>
+ <van-tag round plain v-else-if="item.fcheckResu === 'W:鏈煡'" type="warning">鏈煡</van-tag>
+ <van-tag round plain v-else-if="item.fcheckResu === ''" type="warning">鏈煡</van-tag>
+ <van-tag round plain v-else-if="item.fcheckResu === 'Y:鍚堟牸'" type="warning">鍚堟牸</van-tag>
+ <van-tag round plain v-else type="danger">鏈煡</van-tag>
+ </template>
+ </van-field>
</van-cell-group>
</div>
</van-cell>
</van-list>
</van-pull-refresh>
- </van-tab>
- <van-tab title="宸叉楠�">
- <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
+<%-- </van-tab>
+ <van-tab title="宸叉楠�">--%>
+ <%--<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list
v-model="loading"
:finished="finished"
@@ -57,9 +100,17 @@
<van-cell-group>
<van-cell :title="item.releaseNo" is-link :url="'Add.aspx?id='+item.guid+'&lotNo='+item.lotNo+'&releaseNo='+item.releaseNo" ></van-cell>
<van-field label="鍒拌揣鍗曞彿" colon="true" v-model="item.lotNo" readonly ></van-field>
- <van-checkbox v-model="item.ftype" disabled>濮斿</van-checkbox>
- <van-checkbox v-model="item.urgentFlag == 1" disabled>鎬ユ枡鏍囪瘑</van-checkbox>
- <van-field label="鍒涘缓鏃堕棿" colon="true" v-model="item.createDate" readonly ></van-field>
+ <van-field label="鏍囪瘑" colon="true" readonly>
+ <template #input>
+ <div class="checkbox-container">
+ 濮斿<van-checkbox v-model="item.ftype" disabled></van-checkbox>
+ 鎬ユ枡<van-checkbox v-model="item.urgentFlag" disabled></van-checkbox>
+ </div>
+ </template>
+ </van-field>--%>
+ <%--<van-checkbox v-model="item.ftype" disabled>濮斿</van-checkbox>
+ <van-checkbox v-model="item.urgentFlag == 1" disabled>鎬ユ枡鏍囪瘑</van-checkbox>--%>
+<%-- <van-field label="鍒涘缓鏃堕棿" colon="true" v-model="item.createDate" readonly ></van-field>
<van-field label="鍒涘缓浜�" colon="true" v-model="item.createBy" readonly ></van-field>
<van-field label="鐗╂枡缂栫爜" colon="true" v-model="item.itemNo" readonly ></van-field>
<van-field label="鐗╂枡鍚嶇О" colon="true" v-model="item.itemName" readonly ></van-field>
@@ -72,15 +123,15 @@
</div>
</van-cell>
</van-list>
- </van-pull-refresh>
- </van-tab>
- </van-tabs>
+ </van-pull-refresh>--%>
+<%-- </van-tab>
+ </van-tabs>--%>
</div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
<comloading v-if="isLoading"></comloading>
- <comback ></comback>
+ <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/LLJ/List.js?<%=114 %>"></script>
+ <script src="../Js/LLJ/List.js?<%=116 %>"></script>
</asp:Content>
--
Gitblit v1.9.3