From a442e2c4bd43c15bba79e44c0673311ce7918b5a Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 09 四月 2021 08:25:46 +0800
Subject: [PATCH] 委外工序发出完善-合并
---
WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanList.html | 205 ++++++++++++++++++++++++++++-----------------------
1 files changed, 112 insertions(+), 93 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
index f60f6cd..a086c9d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
@@ -67,7 +67,7 @@
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="detail"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Pushdown"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon"></i>娣诲姞</button>
</div>
@@ -77,30 +77,6 @@
</div>
</div>
</div>
-
- <!--layer寮圭獥-->
- <div class="site-text" style="margin: 5%; display: none" id="window" target="test123">
- <form class="layui-form" id="book" method="post" lay-filter="example">
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" id="HBillNo" name="HBillNo" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ュ崟鎹彿" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">浠诲姟鍗曞彿</label>
- <div class="layui-input-block">
- <input type="text" id="HICMOBillNo" name="HICMOBillNo" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ヤ换鍔″崟鍙�" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐢熶骇鏁伴噺</label>
- <div class="layui-input-block">
- <input type="text" id="HPlanQty" name="HPlanQty" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ョ敓浜ф暟閲�" class="layui-input">
- </div>
- </div>
- </form>
- </div>
<script type="text/html" id="barDemo">
<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
@@ -136,55 +112,91 @@
, cols: [[
{ type: 'checkbox' }
//{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
- ,{ field: 'HDate', title: '鏃ユ湡', sort: true, width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
+ ,{ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
//, { field: 'HBillStatus ', title: '鍗曟嵁鐘舵��', width: 105 }
- , { field: 'HICMOBillNo', title: '浠诲姟鍗曞彿' }
+ , { field: 'HMaterID', title: 'HMaterID' }
////, { field: 'hunitid', title: 'hunitid' }
- , { field: 'HMaterID ', title: '浜у搧ID ', width: 115 }
- , { field: 'HMaterNumber', title: '浜у搧浠ｇ爜' }
+ , { field: '鐗╂枡浠ｇ爜 ', title: '鐗╂枡浠ｇ爜 ', width: 115 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
////, { field: 'hempid', title: 'hempid' }
- , { field: 'HUnitID', title: '鍗曚綅ID', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
, { field: 'HUnitNumber', title: '鍗曚綅浠ｇ爜' }
- , { field: 'HPlanQty', title: '鐢熶骇鏁伴噺' }
- , { field: 'HPlanBeginDate', title: '璁″垝寮�宸ユ棩鏈�' }
- , { field: 'HPlanEndDate', title: '璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鍗曚綅', title: '鍗曚綅' }
+ , { field: 'hunitid', title: 'hunitid' }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
////, { field: 'HCenterID', title: 'HCenterID' }
- , { field: 'HExplanation', title: '鎽樿' }
- , { field: 'HRemark ', title: '澶囨敞' }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ , { field: '鐢熶骇鏁伴噺 ', title: '鐢熶骇鏁伴噺' }
////, { field: 'hbomid', title: 'hbomid' }
- , { field: 'HInnerBillNo', title: '鍐呴儴鍗曟嵁鍙�' }
- , { field: 'HSupID', title: '濮斿鍔犲伐鍗曚綅' }
- , { field: 'HMarker', title: '妫�楠屼汉' }
- , { field: 'HBacker', title: '閫�鍥炰汉' }
- , { field: 'HBackDate', title: '閫�鍥炴棩鏈�' }
- , { field: 'HChecker', title: '瀹℃牳浜�' }
- , { field: 'HCheckDate', title: '瀹℃牳鏃ユ湡' }
- , { field: 'HMaker', title: '鍒跺崟浜�' }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡' }
- , { field: 'HUpDater', title: '淇敼浜�' }
- , { field: 'HUpDateDate', title: '淇敼鏃ユ湡' }
- , { field: 'HCloseMan', title: '鍏抽棴浜�' }
- , { field: 'HCloseDate', title: '鍏抽棴鏃ユ湡' }
- , { field: 'HCloseType', title: '鍏抽棴绫诲瀷' }
+ , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鎽樿', title: '鎽樿' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
+ , { field: 'hicmointerid', title: 'hicmointerid' }
+ , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
////, { field: 'hsubid', title: 'hsubid' }
- , { field: 'HDeleteMan', title: '浣滃簾浜�' }
- , { field: 'HDeleteDate', title: '浣滃簾鏃ユ湡' }
- //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
- //, { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- //, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- //, { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- //, { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
- //, { field: '淇敼浜�', title: '淇敼浜�' }
- //, { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- //, { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
- //, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
- //, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- //, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- //, { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
- //, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
- //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- //, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ , { field: 'hsubid', title: 'hsubid' , fixed: true, hide: true}
+ , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
+ , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
+ , { field: 'hprocid', title: 'hprocid' }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
+ , { field: '宸ュ簭', title: '宸ュ簭' }
+ , { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
+ , { field: '寮�宸ュ浐澶�', title: '寮�宸ュ浐澶�' }
+ , { field: '寮�宸ュ浐鏁�', title: '寮�宸ュ浐鏁�' }
+ , { field: 'HCenterID', title: 'HCenterID' }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ , { field: 'HDeptID', title: 'HDeptID' }
+ , { field: '鍔犲伐杞﹂棿浠ｇ爜', title: '鍔犲伐杞﹂棿浠ｇ爜' }
+ , { field: '鍔犲伐杞﹂棿', title: '鍔犲伐杞﹂棿' }
+ , { field: 'HGroupID', title: 'HGroupID' }
+ , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
+ , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
+ , { field: 'HWorkerID', title: 'HWorkerID' }
+ , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
+ , { field: 'HSourceID', title: 'HSourceID' }
+ , { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜' }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+ , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+ , { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
+ , { field: '璁″垝鍔犲伐鏃堕棿', title: '璁″垝鍔犲伐鏃堕棿' }
+ , { field: '宸ュ簭璁″垝寮�宸ユ棩鏈�', title: '宸ュ簭璁″垝寮�宸ユ棩鏈�' }
+ , { field: '宸ュ簭璁″垝瀹屽伐鏃ユ湡', title: '宸ュ簭璁″垝瀹屽伐鏃ユ湡' }
+ , { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
+ , { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
+ , { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+ , { field: '鎵规', title: '鎵规' }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
+ , { field: '閿�鍞鍗曚富ID', title: '閿�鍞鍗曚富ID' }
+ , { field: '閿�鍞鍗曞瓙ID', title: '閿�鍞鍗曞瓙ID' }
+ , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿' }
+ , { field: 'HBillType', title: 'HBillType' }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ , { field: 'HBillSubType', title: 'HBillSubType' }
+ , { field: 'HQtyDecimal', title: 'HQtyDecimal' }
+ , { field: 'HPriceDecimal', title: 'HPriceDecimal' }
+
//,{fixed: 'right', title:'鎿嶄綔', toolbar: '#barDemo', width:150}
]]
};
@@ -216,41 +228,48 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
- case 'detail':
- if (checkStatus.data.length < 1) {
+ case 'btn-Pushdown':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ ajaxLabelData = data;
+ var rows = '';
+ var HEntry = '';
+ for (var i = 0; i < data.length; i++) {
+ rows += data[i].hmainid.toString() + ',' ;
+
+ }
+
+ if (checkStatus.data.length < 1)
+ {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺�');
} else
{
//椤甸潰灞�
layer.open({
- type: 1 //Page灞傜被鍨�
- ,skin: 'layui-layer-molv'
- ,area: ['666px', '666px']
- ,title: ['缂栬緫淇℃伅','font-size:18px']
- ,btn: ['纭畾', '鍙栨秷']
- ,shadeClose: true
- ,shade: 0 //閬僵閫忔槑搴�
- ,maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- ,content:$("#window")
- , success: function () {
- $('#HBillNo').val();
- $('#HICMOBillNo').val("HICMOBillNo");
- $('#HPlanQty').val("HPlanQty");
- }
- , yes: function () {
- alert('asdasd');
- }
+ type: 2 //Page灞傜被鍨�
+ ,area: ['100%', '100%']
+ ,title: '鏂板娲惧伐鍗�'
+ ,shade: 0.6 //閬僵閫忔槑搴�
+ ,maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html?HInterID=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString().substring(0, rows.length - 1), '&PlanBeginDate=' + data[0].璁″垝寮�宸ユ棩鏈�.toString(), '&PlanEndDate=' + data[0].璁″垝瀹屽伐鏃ユ湡.toString(), 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+
});
-
-
- //var data = checkStatus.data;
- //layer.alert(JSON.stringify(data));
}
break;
case 'add':
- layer.msg('娣诲姞');
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "/" + month + "/" + day;
+ layer.msg(shijian);
break;
case '':
layer.msg('');
@@ -263,7 +282,7 @@
var index0 = layer.load(0, { shade: false });
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/LEMS/MES_Sc_ProcessPlanMain_Json',
+ url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
@@ -310,7 +329,7 @@
}
var index = layer.load(0, { shade: false });
$.ajax({
- url: GetWEBURL() + '/LEMS/MES_Sc_ProcessPlanMain_Json',
+ url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
--
Gitblit v1.9.1