From 01bb4cc6da9641e41d24f6ac7dea6e84cb8ba768 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 01 四月 2023 10:48:31 +0800
Subject: [PATCH] 便捷方式,扫码模板,条码生成、列表,工序出站

---
 WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkEdit.html |   66 ++++++++++++++++++---------------
 1 files changed, 36 insertions(+), 30 deletions(-)

diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
index 468f0b3..0c67ccb 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkEdit.html"
@@ -90,35 +90,25 @@
                                                     <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                                 </select>
                                             </div>
-                                        </div>
-                                        <!--<div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鐢熶骇缁勭粐</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="hidden" name="HPRDORGID" id="HPRDORGID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchORG" id="btnSearchORG" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+                                        </div>                                      
                                         <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <label class="layui-form-label">娲惧伐鏃ユ湡</label>
                                             <div class="layui-input-inline">
                                                 <input type="date" class="layui-input" name="HDate" id="HDate">
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鎽樿</label>
+                                    <div class="layui-row">                                   
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">鎽樿</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="background-color:#efefef4d;">
+                                                <input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="background-color:#efefef4d;width:600px;">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">澶囨敞</label>
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" style="background-color:#efefef4d;">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" style="background-color:#efefef4d;width:600px;">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs3 layui-inline" style="display:none">
@@ -303,6 +293,7 @@
                 , data = checkStatus.data;
             //鏂板琛岃〃鏍兼暟鎹�
             var NewRow = {
+                "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "",
                 "HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
                 "HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "",
                 "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HPlanQty": 0, "HQty": 0, "HBatchNo": "", "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
@@ -581,6 +572,11 @@
             }
         });
 
+        //鎵撳嵃
+        form.on('submit(btn_print)', function (data) {
+            get_print(data);
+        });
+
         //閫夋嫨鐢熶骇杞﹂棿寮圭獥
         form.on('submit(btnSearchWorkShop)', function () {
             layer.open({
@@ -655,8 +651,18 @@
             columns = [ //琛ㄥご
                 { type: 'checkbox', totalRowText: '鍚堣琛�' }
                 , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                , { field: 'HMainID', title: '娲惧伐鍗曚富ID', hide: true }// 鐢ㄤ簬鎵撳嵃鏃惰幏鍙栨暟鎹�
+                , { field: 'HEntryID', title: '娲惧伐鍗曞瓙ID', hide: true }// 鐢ㄤ簬鎵撳嵃鏃惰幏鍙栨暟鎹�
+                , { field: 'HSourceInterID', title: '娴佽浆鍗D', hide: true }
+                , { field: 'HSourceEntryID', title: '娴佽浆鍗″瓙ID', hide: true }
+                , { field: 'HSourceBillNo', title: '娴佽浆鍗″彿', width: 165 }
+                , { field: 'HSourceBillType', title: '鍗曟嵁绫诲瀷', hide: true }
                 , { field: 'HProcNo', title: '娴佹按鍙�' }
                 , { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
+                , { field: 'HPlanQty', title: '娴佽浆鍗℃暟閲�' }
+                , { field: 'HQty', title: '娲惧伐鏁伴噺', edit: 'text'}
+                , { field: 'HPlanBeginDate', title: '瑕佹眰寮�宸ユ棩鏈�', width: 120, templet: "<div>{{d.HPlanBeginDate ==null ?'':layui.util.toDateString(d.HPlanBeginDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanBeginDate' }
+                , { field: 'HPlanEndDate', title: '瑕佹眰瀹屽伐鏃ユ湡', width: 120, templet: "<div>{{d.HPlanEndDate ==null ?'':layui.util.toDateString(d.HPlanEndDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanEndDate' }
                 , { field: 'HMaterID', title: '浜у搧ID', hide: true }
                 , { field: 'HMaterNumber', title: '浜у搧浠g爜', edit: 'text', event: "HMaterCheck" }
                 , { field: 'HMaterName', title: '浜у搧鍚嶇О' }
@@ -668,16 +674,12 @@
                 , { field: 'HSourceNumber', title: '鐢熶骇璧勬簮浠g爜', edit: 'text', event: "HSourceCheck" }
                 , { field: 'HSourceName', title: '鐢熶骇璧勬簮鍚嶇О' }
                 , { field: 'HWorkerID', title: '鎿嶄綔宸D', hide: true }
-                , { field: 'HWorkerNumber', title: '鎿嶄綔宸ヤ唬鐮�', edit: 'text', event: "HWorkerCheck" }
-                , { field: 'HWorkerName', title: '鎿嶄綔宸ュ悕绉�' }
+                , { field: 'HWorkerNumber', title: '鎿嶄綔宸ヤ唬鐮�', edit: 'text', event: "HWorkerCheck", hide: true }
+                , { field: 'HWorkerName', title: '鎿嶄綔宸ュ悕绉�', hide: true }
                 , { field: 'HGroupID', title: '鐝粍ID', hide: true }
-                , { field: 'HGroupNumber', title: '鐝粍浠g爜', edit: 'text', event: "HGroupCheck" }
-                , { field: 'HGroupName', title: '鐝粍鍚嶇О' }
-                , { field: 'HPlanQty', title: '娴佽浆鍗℃暟閲�' }
-                , { field: 'HQty', title: '娲惧伐鏁伴噺', edit: 'text'}
+                , { field: 'HGroupNumber', title: '鐝粍浠g爜', edit: 'text', event: "HGroupCheck", hide: true}
+                , { field: 'HGroupName', title: '鐝粍鍚嶇О', hide: true}
                 , { field: 'HBatchNo', title: '鎵规', edit: 'text' }
-                , { field: 'HPlanBeginDate', title: '瑕佹眰寮�宸ユ棩鏈�', width: 120, templet: "<div>{{d.HPlanBeginDate ==null ?'':layui.util.toDateString(d.HPlanBeginDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanBeginDate' }
-                , { field: 'HPlanEndDate', title: '瑕佹眰瀹屽伐鏃ユ湡', width: 120, templet: "<div>{{d.HPlanEndDate ==null ?'':layui.util.toDateString(d.HPlanEndDate, 'yyyy-MM-dd')}}</div>", event: 'HPlanEndDate' }
                 , { field: 'HICMOBillNo', title: '浠诲姟鍗曞彿', hide: true }
                 , { field: 'HICMOInterID', title: '浠诲姟鍗旾D', hide: true }
                 , { field: 'HICMOEntryID', title: '浠诲姟鍗曞瓙鍐呯爜', hide: true }
@@ -712,6 +714,7 @@
                 }
             };
             option.data = [{
+                "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HSourceBillType": "",
                 "HProcNo": 0, "HProcName": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",
                 "HSourceID": 0, "HSourceNumber": "", "HSourceName": "", "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "",
                 "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HPlanQty": 0, "HQty": 0, "HBatchNo": "", "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
@@ -749,6 +752,7 @@
                         for (var i = 0; i < result.data.length; i++) {
                             rowdata.push(
                                 {
+                                    "HSourceInterID": result.data[i]["hmainid"], "HSourceEntryID": result.data[i]["HEntryID"], "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"], "HSourceBillType": result.data[i]["HBillType"],
                                     "HProcNo": result.data[i]["娴佹按鍙�"], "HProcName": result.data[i]["宸ュ簭鍚嶇О"], "HMaterID": result.data[i]["HMaterID"], "HMaterNumber": result.data[i]["浜у搧浠g爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HUnitID": result.data[i]["HUnitID"], "HUnitNumber": result.data[i]["鍗曚綅浠g爜"], "HUnitName": result.data[i]["鍗曚綅"],
                                     "HSourceID": result.data[i]["HSourceID"], "HSourceNumber": result.data[i]["鐢熶骇璧勬簮浠g爜"], "HSourceName": result.data[i]["鐢熶骇璧勬簮"], "HWorkerID": result.data[i]["HWorkerID"], "HWorkerNumber": result.data[i]["鎿嶄綔宸ヤ唬鐮�"], "HWorkerName": result.data[i]["鎿嶄綔宸�"],
                                     "HGroupID": result.data[i]["HGroupID"], "HGroupNumber": result.data[i]["鐝粍浠g爜"], "HGroupName": result.data[i]["鐝粍"], "HPlanQty": result.data[i]["娴佽浆鍗℃暟閲�"], "HQty": 0, "HBatchNo": result.data[i][""], "HPlanBeginDate": new Date(),
@@ -777,7 +781,6 @@
 
         //淇濆瓨HMaker
         function set_AddNew(data) {
-
             var num_1 = [];
             for (var i = 0; i < table.cache["mainTable"].length; i++) {
                 if (table.cache["mainTable"][i] != "") {
@@ -785,11 +788,9 @@
                     num_1.push(table.cache["mainTable"][i])
                 }
             }
-
             var sMainStr = JSON.stringify(data.field);
             var sSubStr = JSON.stringify(num_1);
             var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
-
             var index = layer.load();
             $.ajax({
                 type: "POST",
@@ -855,6 +856,11 @@
             })
         }
 
+        //鎵撳嵃
+        function get_print(data) {
+           
+        }
+
         function get_UrlVars() {
             var vars = [], hash;
             var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');

--
Gitblit v1.9.1