From 42020c854d6087a5af50d97de658b57e55996939 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 02 九月 2024 09:13:52 +0800
Subject: [PATCH] 1.工艺路线：复制、编辑 进入页面没有带出数据 原因：Gy_RoutingBillMain表缺少字段HBeginDate、HEndDate 处理方法：在表中增加字段
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkEdit.html | 115 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 39 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..291a064 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"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -57,6 +58,7 @@
</div>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align:center;"><b>宸ュ簭娴佽浆鍗℃淳宸�</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -91,34 +93,24 @@
</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 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-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">
@@ -130,7 +122,7 @@
<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
</div>
</div>
- </div>
+ </div>
</div>
</div>
<!--鍏朵粬淇℃伅-->
@@ -251,6 +243,13 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "3798";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -303,6 +302,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(),
@@ -401,7 +401,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -411,10 +411,10 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- HMaterName: checkStatus.data[0].HName
+ HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О
, HMaterID: checkStatus.data[0].HItemID
- , HMaterNumber: checkStatus.data[0].HNumber
- , HMaterModel: checkStatus.data[0].HModel
+ , HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜
+ , HMaterModel: checkStatus.data[0].瑙勬牸鍨嬪彿
});
layer.close(layer.index);
@@ -435,7 +435,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -445,9 +445,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- HUnitName: checkStatus.data[0].HName
+ HUnitName: checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
, HUnitID: checkStatus.data[0].HItemID
- , HUnitNumber: checkStatus.data[0].HNumber
+ , HUnitNumber: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜
});
layer.close(layer.index);
@@ -581,6 +581,11 @@
}
});
+ //鎵撳嵃
+ form.on('submit(btn_print)', function (data) {
+ get_print(data);
+ });
+
//閫夋嫨鐢熶骇杞﹂棿寮圭獥
form.on('submit(btnSearchWorkShop)', function () {
layer.open({
@@ -590,7 +595,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -600,7 +605,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HWorkShopName").val(checkStatus.data[0].HName);
+ $("#HWorkShopName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HWorkShopID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -654,9 +659,19 @@
//琛ㄥご
columns = [ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { type: 'numbers', title: '搴忓彿' }
+ , { 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: '娴佽浆鍗℃暟閲�',totalRow: true }
+ , { field: 'HQty', title: '娲惧伐鏁伴噺', totalRow: true, 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: '浜у搧浠ｇ爜', edit: 'text', event: "HMaterCheck" }
, { field: 'HMaterName', title: '浜у搧鍚嶇О' }
@@ -668,16 +683,12 @@
, { field: 'HSourceNumber', title: '鐢熶骇璧勬簮浠ｇ爜', 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: '鐝粍浠ｇ爜', edit: 'text', event: "HGroupCheck" }
- , { field: 'HGroupName', title: '鐝粍鍚嶇О' }
- , { field: 'HPlanQty', title: '娴佽浆鍗℃暟閲�' }
- , { field: 'HQty', title: '娲惧伐鏁伴噺', edit: 'text'}
+ , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', 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 }
@@ -688,6 +699,7 @@
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: false
+ , totalRow: true
, cellMinWidth: 120
, height: 400
, cols: [columns]
@@ -712,6 +724,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 +762,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]["浜у搧浠ｇ爜"], "HMaterName": result.data[i]["浜у搧鍚嶇О"], "HMaterModel": result.data[i]["瑙勬牸鍨嬪彿"], "HUnitID": result.data[i]["HUnitID"], "HUnitNumber": result.data[i]["鍗曚綅浠ｇ爜"], "HUnitName": result.data[i]["鍗曚綅"],
"HSourceID": result.data[i]["HSourceID"], "HSourceNumber": result.data[i]["鐢熶骇璧勬簮浠ｇ爜"], "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]["鐝粍浠ｇ爜"], "HGroupName": result.data[i]["鐝粍"], "HPlanQty": result.data[i]["娴佽浆鍗℃暟閲�"], "HQty": 0, "HBatchNo": result.data[i][""], "HPlanBeginDate": new Date(),
@@ -777,7 +791,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 +798,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 +866,32 @@
})
}
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTablemainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //鎵撳嵃
+ 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