From abe0836db24952b36585aba4021050debc45f804 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 01 十二月 2022 15:07:20 +0800
Subject: [PATCH] 代码上传

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index 0b4e5cf..2172355 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
     <link rel="stylesheet" href="../../layuiadmin/layui/css/style-self.css" media="all">
-  
+
 </head>
 <body>
     <div id="layout1" class="layui-fluid">
@@ -220,8 +220,6 @@
             type: "GET",
             data: { "sMsg": linterid },
             success: function (d) {
-                console.log(d.data);
-                //$("#HDate").val(d.)
                 $("#HInterID").val(d.data[0].HInterID);
                 $("#HBillNo").val(d.data[0].HBillNo);
                 $("#HRemark").val(d.data[0].HRemark);
@@ -257,8 +255,6 @@
                 //debugger;
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                console.log(sMainStr)
-                console.log(sSubStr)
                 var sMainSub = sMainStr + ';' + sSubStr;
                 layer.load(3)
                 $.ajax(
@@ -327,8 +323,6 @@
                 //debugger;
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                console.log(sMainStr)
-                console.log(sSubStr)
                 var sMainSub = sMainStr + ';' + sSubStr;
                 layer.load(3)
                 $.ajax(
@@ -411,7 +405,7 @@
                                 layer.msg(data.Message, { icon: 1 });
                                 element.tabDelete('tabDemo', '2'); //鍒犻櫎
                                 element.tabDelete('tabDemo', '3'); //鍒犻櫎
-                                
+
                                 element.tabAdd('tabDemo', {
                                     title: '澶栫鏉$爜'
                                     , content: '<table class="layui-hide" id="subTable" lay-filter="subTable"></table>' //鏀寔浼犲叆(html浠g爜锛変笉鎸佹敮鐩存帴浼犲叆html椤甸潰
@@ -442,13 +436,11 @@
                                         , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', width: 100 }
 
                                     ]]
-                                    // , data: [linterid]
-                                    //  , page: true
                                     , done: function () {
                                         layer.closeAll("loading");
                                     }
                                 });
-                                
+
                                 element.tabAdd('tabDemo', {
                                     title: '鍐呯鏉$爜'
                                     , content: '<table class="layui-hide" id="subTable2" lay-filter="subTable2"></table>' //鏀寔浼犲叆(html浠g爜锛変笉鎸佹敮鐩存帴浼犲叆html椤甸潰
@@ -499,7 +491,6 @@
                     });
                 return false;
             });
-
             form.on('submit(Print)', function (data) {//鎵撳嵃
                 var data1 = layui.table.cache["subTable"]
                     , data2 = layui.table.cache["subTable2"];
@@ -543,7 +534,6 @@
                 var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
                 parent.layer.close(index); //鍐嶆墽琛屽叧闂�
             });
-
             //鐩戝惉鎻愪氦
             form.verify({
                 numberOrEmpty: function (value, item) {
@@ -555,7 +545,6 @@
                 }
             });
             layer.load(3)
-
             table.render({
                 elem: '#mainTable'
                 , url: GetWEBURL() + subUrl
@@ -565,13 +554,16 @@
                 , cols: [[
                     , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
                     , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
-                    , { field: 'HMaterShortNumber', title: '鐗╂枡浠g爜', width: 120 }
+                    , { field: 'HMaterShortNumber', title: '鐗╂枡浠g爜', width: 120, hide: true }
                     , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
                     , { field: 'HUnitName', title: '璁¢噺鍗曚綅', width: 100 }
                     , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', width: 100, hide: true }
                     , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
-                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                    , { field: 'HDDQty', title: '璁㈠崟鏁伴噺', width: 100 }
+                    , { field: 'HBarcodeCount', title: '宸茬敓鎴愭潯鐮佹暟閲�', width: 135 }
+                    , { field: 'HNotBarcodeCount', title: '鏈敓鎴愭潯鐮佹暟閲�', width: 135 }
+                    , { field: 'HQty', title: '鏈鐢熸垚鏉$爜鏁伴噺', width: 135, edit: 'text' }
                     , { field: 'HMinQty', title: '鍐呯鍖呰鏁�', width: 100, edit: 'text' }
                     , { field: 'HBQty', title: '鍐呯鏁�', width: 100 }
                     , { field: 'HWXQty', title: '澶栫鍖呰鏁�', width: 100, edit: 'text' }
@@ -602,7 +594,6 @@
 
                 ]]
                 , done: function (res, curr, count) {
-                    console.log(res);
                     layer.closeAll("loading");
                 }
             });

--
Gitblit v1.9.1