From b50ca3ca2cb9f0add65268b324cddd502744f6b2 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 03 九月 2025 13:05:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/QXPDA
---
H5/Xsth.aspx | 86 +++++++++++++++++++++++--------------------
1 files changed, 46 insertions(+), 40 deletions(-)
diff --git a/H5/Xsth.aspx b/H5/Xsth.aspx
index 0d13722..e708b80 100644
--- a/H5/Xsth.aspx
+++ b/H5/Xsth.aspx
@@ -8,6 +8,12 @@
</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>
+
<van-nav-bar
title="閿�鍞��璐�"
left-text="杩斿洖"
@@ -69,46 +75,46 @@
</div>
- <van-tabs color="#000" title-active-color="#0283EF">
- <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="8">寰呭叆搴撴暟</van-col>
- <%--<van-col span="4">鏉＄爜寮犳暟</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-col>
- <van-col span="8" class="text-left padding-left">
- <div>{{itm.itemModel}}</div>
- </van-col>
- <van-col span="8" class="blue-text">{{itm.dsQty}}</van-col>
- <%--<van-col span="4">{{itm.recoKw}}</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>
- <%--<van-col span="4">闇�姹傛暟</van-col>--%>
- <van-col span="8">宸插叆搴撴暟</van-col>
+<van-tabs color="#000" title-active-color="#0283EF">
+ <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.ysitems" :key="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="4">{{itm.fQty}}</van-col>--%>
- <van-col span="8" class="blue-text">{{itm.sQty}}</van-col>
- </van-row>
- </van-tab>
+ <van-row v-for="(itm,index) in ItemTblDetail.items" :key="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-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>
+ <van-col span="3">闇�棰嗘暟</van-col>
+ <van-col span="5">宸查鏁�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemTblDetail.ysitems" :key="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">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
+ </van-row>
+ </van-tab>
</van-tabs>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -119,6 +125,6 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Xsth.js?<%=161 %>"></script>
+ <script src="Js/Xsth.js?<%=162 %>"></script>
</asp:Content>
--
Gitblit v1.9.3