From 960cda766a86bcc1be692525361f00836f2a59d5 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 10 二月 2025 14:43:33 +0800
Subject: [PATCH] 1.生产补料优化 2.生产领料字段名称调整

---
 H5/Js/Scbl.js |   17 +++++++++++------
 H5/Scll.aspx  |    2 +-
 H5/Scbl.aspx  |   22 ++++++++++++++++++----
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/H5/Js/Scbl.js b/H5/Js/Scbl.js
index 97962e9..bea1c7a 100644
--- a/H5/Js/Scbl.js
+++ b/H5/Js/Scbl.js
@@ -82,8 +82,8 @@
                 .then(function (res) {
                     var json = res;
                     if (json.status == 0) {
-                        that.ItemBlDetail = json.data.tbBillList.item;
-                        that.daa001 = json.data.tbBillList.bl001;
+                        that.ItemBlDetail = json.data.tbBillList.item2;
+                        that.daa001 = json.data.tbBillList.item1;
                     }
                     else {
                         that.$toast.fail(json.message);
@@ -138,11 +138,16 @@
                     var json = res;
                     if (json.status == 0) {
 
-                        that.barcode = json.data.tbBillList.item.barcode;
-                        that.sms = json.data.tbBillList.item.fum;
-                        that.num = json.data.tbBillList.item.num;
-                        that.ItemBlDetail = json.data.tbBillList.pendingList
+                        that.barcode = null;
+                        that.sms = null;
+                        that.num = null;
+                        //that.ItemBlDetail = json.data.tbBillList.item2
                         that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+                        that.GetMesItemBlDetailByBillNo();
+                    } else if (json.status == 2) {
+                        that.$refs.splitNum.focus();
+                        that.scanInfo.splitNum = json.data.tbBillList.splitNum;
+                        that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum;
                     }
                     else {
                         that.$toast.fail(json.message);
diff --git a/H5/Scbl.aspx b/H5/Scbl.aspx
index 09c7dcb..2487884 100644
--- a/H5/Scbl.aspx
+++ b/H5/Scbl.aspx
@@ -34,6 +34,7 @@
       v-model="daa001"
    :right-icon-size="19"
    placeholder="宸ュ崟鍙�"
+      disabled
 ></van-field>
  <van-field
   value=""
@@ -67,12 +68,25 @@
 
     <div  class="van-tab-left">
               <van-tabs @click="onClick" color="#000" title-active-color="#0283EF" >
-  <van-tab title="寰呭彂鐗╂枡">
-    <van-row v-for="value in ItemBlDetail" class="font">
+  <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
+<%--    <van-row v-for="value in ItemBlDetail" class="font">
           <van-col span="12">鐗╂枡:{{value.bld002}}</van-col>
           <van-col span="6">鐢宠鏁皗{value.bld007}}</van-col>
           <van-col span="6">宸查鏁皗{value.bld008}}</van-col>
-    </van-row>
+    </van-row>--%>
+        <van-row>
+        <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
+         <van-col span="6">闇�棰�</van-col>
+        <van-col span="6">宸叉壂</van-col>
+</van-row>
+<van-row  v-for="value in ItemBlDetail" class="font">
+      <van-col span="12"  class="text-left padding-left">
+           <div>{{value.bld002}}</div>
+           <div>{{value.bld003}}</div>
+      </van-col>
+      <van-col span="6">{{value.bld007}}</van-col>
+     <van-col span="6">{{value.bld008}}</van-col>
+</van-row>
   </van-tab>
 </van-tabs>
     </div>
@@ -85,5 +99,5 @@
   <comback ></comback>
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scbl.js?<%=123114 %>"></script>
+ <script src="Js/Scbl.js?<%=12313 %>"></script>
 </asp:Content>
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index adb8188..d792906 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -19,7 +19,7 @@
   <van-field 
     ref="daa001"
     v-model="modeInfo.daa001"
-    label="棰嗘枡鍗曞彿"
+    label="宸ュ崟鍗曞彿"
     clearable 
      placeholder="璇锋壂鐮�"
     :right-icon-size="19"

--
Gitblit v1.9.3