From b74ed2e356c5cb28fd3cf536e32705164eaf1512 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 13 三月 2025 16:27:50 +0800
Subject: [PATCH] 1.生产退料 2.全局明细表格样式

---
 Images/Style.css |   14 ++++++
 Mst.master       |    2 
 H5/Js/Sctl.js    |    8 ++--
 H5/Sctl.aspx     |   47 ++++++++++++++++++++++-
 4 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/H5/Js/Sctl.js b/H5/Js/Sctl.js
index 56f2cbb..b757f6a 100644
--- a/H5/Js/Sctl.js
+++ b/H5/Js/Sctl.js
@@ -17,7 +17,7 @@
             depot: {},
             show: false,
             actions: [],
-            ItemTblDetail:[]
+            ItemDetail:[]
         }
     },
     mounted() {
@@ -81,13 +81,13 @@
                 .then(function (res) {
                     var json = res;
                     if (json.status == 0) {
-                        that.ItemTblDetail = json.data.tbBillList;
+                        that.ItemDetail = json.data.tbBillList;
                         that.$refs.sectionCode.focus();
                     }
                     else {
                         that.$toast.fail(json.message);
                         that.$refs.billNo.focus();
-                        that.ItemTblDetail = null;
+                        that.ItemDetail = null;
                         that.billNo = null;
                     }
                     that.isLoading = false;
@@ -96,7 +96,7 @@
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
                     that.$refs.billNo.focus();
-                    that.ItemTblDetail = null;
+                    that.ItemDetail = null;
                     that.billNo = null;
                     console.log(error);
                 });
diff --git a/H5/Sctl.aspx b/H5/Sctl.aspx
index 3fa5540..8b58bf5 100644
--- a/H5/Sctl.aspx
+++ b/H5/Sctl.aspx
@@ -70,16 +70,57 @@
 </van-cell-group>
     </div>
 
-      <van-tabs  color="#000" title-active-color="#0283EF" >
+<%--      <van-tabs  color="#000" title-active-color="#0283EF" >
   <van-tab title="寰呴��鏄庣粏">
     <van-row v-for="value in ItemTblDetail" class="font">
           <van-col span="12">鐗╂枡:{{value.itemNo}}</van-col>
-          <%--<van-col span="18">鐗╂枡鍚嶇О:{{value.itemName}}</van-col>--%>
           <van-col span="6">鐢宠鏁�:{{value.tld005}}</van-col>
           <van-col span="6">宸查��鏁�:{{value.tld006}}</van-col>
     </van-row>
   </van-tab>
           <van-tab title="宸查��鏄庣粏"></van-tab>
+</van-tabs>--%>
+
+      <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-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-tabs>
 
     <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -90,6 +131,6 @@
     <%--<comback ></comback>--%>
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Sctl.js?<%=161 %>"></script>
+ <script src="Js/Sctl.js?<%=162 %>"></script>
 </asp:Content>
 
diff --git a/Images/Style.css b/Images/Style.css
index 69a18be..384d48f 100644
--- a/Images/Style.css
+++ b/Images/Style.css
@@ -432,4 +432,16 @@
 
 /* 2025-02-19 姹犲崡楠忎慨鏀�
     end
-*/
\ No newline at end of file
+*/
+
+/*琛ㄦ牸鏍峰紡 2025-03-13 姹犲崡楠忔柊澧�*/
+.van-col {
+    font-size: 12px; /* 璋冩暣瀛椾綋澶у皬 */
+    word-wrap: break-word;
+    word-break: break-all;
+}
+
+.blue-text {
+    color: #1989fa; /* 璁剧疆瀛椾綋棰滆壊涓鸿摑鑹� */
+    font-weight: bold; /* 瀛椾綋鍔犵矖 */
+}
\ No newline at end of file
diff --git a/Mst.master b/Mst.master
index 3f3386c..c1bb4f6 100644
--- a/Mst.master
+++ b/Mst.master
@@ -14,7 +14,7 @@
     <script src="/scripts/config.js?<%=1234 %>"></script>
     <link href="/scripts/vant/vant.css" rel="stylesheet" />
     <script src="/scripts/vant/vant.js"></script>
-    <link href="/Images/Style.css?<%=14 %>" rel="stylesheet" />
+    <link href="/Images/Style.css?<%=15 %>" rel="stylesheet" />
     <script src="/Scripts/uni.webview.1.5.2.js"></script>
     <asp:ContentPlaceHolder ID="head" runat="server">
     </asp:ContentPlaceHolder>

--
Gitblit v1.9.3