From 1648bd01b55f58dff42096be49ad65f36f141220 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 06 八月 2025 09:02:32 +0800
Subject: [PATCH] 1.调拨出库

---
 H5/Dbck.aspx  |  126 ++++++++++++++++++-------------
 H5/Js/Dbck.js |   95 ++++++++++++++---------
 2 files changed, 131 insertions(+), 90 deletions(-)

diff --git a/H5/Dbck.aspx b/H5/Dbck.aspx
index 6b5b081..dad1e08 100644
--- a/H5/Dbck.aspx
+++ b/H5/Dbck.aspx
@@ -29,18 +29,16 @@
   ><template #button>
     <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
   </template></van-field>
- <van-field
-     ref="barcode"
-  value=""
-  label="鐗╂枡鏉$爜"
-   clearable 
- placeholder="璇锋壂鐮�"
-     @keyup.enter.native ="getBarcode"
-    <%-- @change="getBarcode"--%>
-  :right-icon-size="19"
-     v-model="barcode"
-  v-focus.noKeyboard
-></van-field>
+                <van-field
+                    ref="barcode"
+                    v-model="barcode"
+                    label="鐗╂枡鏉$爜"
+                    clearable 
+                    placeholder="璇锋壂鐮�"
+                    :right-icon-size="19"
+                    v-focus.noKeyboard
+                    @keyup.enter.native="getScan">
+                </van-field>
  <van-field
   value=""
   label="鐗╂枡缂栫爜"
@@ -51,52 +49,72 @@
   v-focus.noKeyboard
      disabled
 ></van-field>
-   <van-field
-  value=""
-       v-model="num"
-  label="鏁伴噺"
-  placeholder="鏁伴噺"
-  disabled
-></van-field>
- <van-field
+                <van-field
+                    v-model="scanInfo.barcodeNum"
+                    label="鏉$爜鏁伴噺"
+                    placeholder="鏉$爜鏁伴噺"
+                    disabled>
+                </van-field>
+<van-field
+    ref="splitNum"
+    v-model="scanInfo.splitNum"
     center
     clearable
-    v-model="fum"
-    label="鎷嗗垎鏁伴噺"
-    placeholder="鎷嗗垎鏁伴噺"
- ><template #button>
-    <van-button size="small" type="info" plain @click="tmcf" >鏉$爜鎷嗗垎</van-button>
-  </template></van-field>
+    label="鍙戞枡鏁伴噺"
+    placeholder="鍙戞枡鏁伴噺">
+    <van-button 
+        slot="button" 
+        type="info" 
+        size="small"  
+        plain 
+        @click="getChaiFen">
+        鏉$爜鎷嗗垎
+    </van-button>
+</van-field>
 </van-cell-group>
     </div>
 
-    <div  class="van-tab-left">
-              <van-tabs @click="onClick" color="#000" title-active-color="#0283EF" >
-                  <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
-    <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="(itm,index) in ItemBlDetail" :key="index">
-        <van-col span="12"  class="text-left padding-left">
-             <div>{{itm.itemNo}}</div>
-             <div>{{itm.itemName}}</div>
-        </van-col>
-        <van-col span="6">{{itm.fQty}}</van-col>
-        <!-- <van-col span="6">{{itm.sQty ?? 0}}</van-col> -->
-       <van-col span="6">{{ itm.sQty != null ? itm.sQty : 0 }}</van-col>
-  </van-row>
-</van-tab>
-<%--  <van-tab title="寰呭嚭鐗╂枡">
-    <van-row v-for="value in ItemBlDetail" class="font">
-          <van-col span="12">鐗╂枡:{{value.itemNo}}</van-col>
-          <van-col span="6">璁″垝鏁皗{value.qd007}}</van-col>
-          <van-col span="6">瀹屾垚鏁皗{value.qd008}}</van-col>
-    </van-row>
-  </van-tab>
-</van-tabs>--%>
-    </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="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-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 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="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>
 
 </asp:Content>
@@ -105,5 +123,5 @@
   <%--<comback ></comback>--%>
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Dbck.js?<%=1231 %>"></script>
+ <script src="Js/Dbck.js?<%=123111114 %>"></script>
 </asp:Content>
diff --git a/H5/Js/Dbck.js b/H5/Js/Dbck.js
index 4a5a8c4..42df939 100644
--- a/H5/Js/Dbck.js
+++ b/H5/Js/Dbck.js
@@ -17,6 +17,8 @@
             active: 0,
             show: false,
             actions: [],
+            ItemDetail: [],
+            scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
         }
     },
     mounted() {
@@ -82,7 +84,7 @@
                 .then(function (res) {
                     var json = res;
                     if (json.status == 0) {
-                        that.ItemBlDetail = json.data.tbBillList;
+                        that.ItemDetail = json.data.tbBillList;
                         that.$refs.barcode.focus();
                         that.barcode = "";
                     }
@@ -90,7 +92,7 @@
                         that.$toast.fail(json.message);
                         that.$refs.billNo.focus();
                         that.billNo = "";
-                        that.ItemBlDetail = null;
+                        that.ItemDetail = null;
                     }
                     that.isLoading = false;
                 })
@@ -103,7 +105,7 @@
                     //console.log(error);
                 });
         },
-        getBarcode() {
+        getScan() {
 
             //this.barcode = value;
 
@@ -137,15 +139,22 @@
                     var json = res;
                     if (json.status == 0) {
 
-                        that.itemNo = json.data.form.itemNo;
-                        //that.num = json.data.form.num;
-                        //that.fum = json.data.form.fum;
-                        that.ItemBlDetail = json.data.items
+                        //that.itemNo = json.data.tbBillList.itemNo;
+                        ////that.num = json.data.form.num;
+                        ////that.fum = json.data.form.fum;
+                        //that.ItemBlDetail = json.data.items
                         that.$notify({ type: 'success', message: '鎵爜鎴愬姛' });
 
                         that.$refs.barcode.focus();
                         that.barcode = "";
                         //that.GetMesItemBlDetailByBillNo();
+                        that.GetMesItemBlDetailByBillNo();
+                    }
+                    else if (json.status == 2) {
+                        that.itemNo = json.data.tbBillList.itemNo;
+                        that.$refs.splitNum.focus();
+                        that.scanInfo.splitNum = json.data.tbBillList.splitNum;
+                        that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum;
                     }
                     else {
                         that.$toast.fail(json.message);
@@ -162,57 +171,71 @@
                     that.barcode = "";
                 });
         },
-        tmcf() {
+        getChaiFen() {
+            //this.isPrinterPopupVisible = true; // 鏄剧ず寮圭獥
+
+            if (this.isLoading) {
+                return;
+            }
+
             var that = this;
-            
-            if (!that.userInfo.loginAccount) {
-                this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+            if (that.billNo.length <= 0) {
+                that.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖锛�");
                 return;
             }
+            if (that.scanInfo.splitNum * 1 <= 0) {
+                that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+                return;
+            }
+            if (that.barcode.length * 1 <= 0) {
+                that.$toast.fail("鐗╂枡鏉$爜涓嶈兘涓虹┖锛�");
+                return;
+            }
+            //that.ip = "";
+            //that.prot = "";
+            //that.getPrintInfo();
 
-            if (!that.barcode) {
-                this.$toast.fail("鏉$爜涓嶈兘涓虹┖");
-                return;
-            }
-
-            if (!that.billNo) {
-                this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
-                return;
-            }
-
-            if (!that.fum) {
-                this.$toast.fail("鎷嗗垎鏁颁笉鑳戒负绌�");
-                return;
-            }
+            //if (that.ip.length <= 0 || that.prot.length <= 0) {
+            //    alert(that.ip);
+            //    alert(that.prot);
+            //    return;
+            //}
 
             that.isLoading = true;
-            that.AxiosHttp("post", 'TransferOut/SplitBarcode', {
+            that.AxiosHttp("post", 'TransferOut/ScanCodeCF', {
+                daa001: that.billNo,
                 userName: that.userInfo.loginAccount,
                 barcode: that.barcode,
-                billNo: that.billNo,
-                fum: that.fum
+                Num: that.scanInfo.splitNum,
             }, false)
                 .then(function (res) {
                     var json = res;
                     if (json.status == 0) {
+                        //  that.modeInfo = json.data.tbBillList;
+                        that.scanInfo.splitNum = null;
+                        that.scanInfo.barcodeNum = null;
+                        that.scanInfo.barcode = null;
+                        that.$notify({ type: 'success', message: json.message });
+                        that.$playSound('success');
 
-                        that.itemNo = json.data.form.itemNo;
-                        that.num = json.data.form.num;
-                        that.barcode = json.data.form.barcode;
-                        that.fum = json.data.form.fum;
-                        that.ItemBlDetail = json.data.items
-                        that.$notify({ type: 'success', message: '鎵爜鎴愬姛' });
+                        that.sendPrintMessage(json.data.tbBillList);
+
+                        that.$refs.barcode.focus();
+                        that.barcode = "";
+                        //that.GetMesItemBlDetailByBillNo();
+                        that.GetMesItemBlDetailByBillNo();
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
-                    console.log(error);
+                    that.$playSound('error');
                 });
-        }
+        },
     }
 })
\ No newline at end of file

--
Gitblit v1.9.3