From ff839abadc8309f72341a0b43f10fc63f48c7835 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 07 三月 2024 11:39:01 +0800
Subject: [PATCH] 1
---
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 10
WebTM/views/基础资料/公用基础资料/Gy_ProjectMoney.html | 82 ++-
WebTM/views/项目管理/工程项目/PM_ProjectMoneyBillMainList.html | 4
WebTM/views/模治具管理/模治具管理/Gy_MaterialMouldBillMainList.html | 4
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.htmlList.html | 60 +-
WebTM/views/设备管理/Sb_EquipDotCheckBillList_PDA.html | 10
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 9
WebTM/views/基础资料/公用基础资料/Gy_EquipType.html | 49 ++
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 17
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 9
WebTM/views/设备管理/Sb_EquipConkBookBillList_PDA.html | 7
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 135 +++++
WebTM/views/车间管理/工序流转/MES_ColorRecordBill_PDA.html | 4
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 2
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 4
WebTM/views/项目管理/工程项目/PM_CustomerTaskBillMainList.html | 4
WebTM/views/项目管理/工程项目/PM_WorkPlanMonthBillMain.html | 4
WebTM/views/设备管理/Sb_EquipRepairCheckBillList_PDA.html | 7
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html | 171 +++++++
WebTM/views/设备管理/Sb_EqpMaintenanceBillList_PDA.html | 7
WebTM/views/项目管理/工程项目/PM_WorkPlanMonthBillMainList.html | 4
WebTM/views/项目管理/周计划/PM_WorkReportWeekBillMain.html | 4
WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html | 134 +++++
WebTM/views/设备管理/Sb_EquipMaintainBillList_PDA.html | 7
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMainList.html | 4
WebTM/views/质量管理/工序检验单/MES_ProcessCheckBill_PDA.html | 30 +
WebTM/views/项目管理/周计划/PM_WorkReportWeekBillMainList.html | 4
WebTM/views/Baseset/基础资料/Gy_WorkCenterList.html | 30 +
WebTM/views/设备管理/设备档案/Gy_EquipFileBillResume.html | 52 ++
WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html | 234 +++++++++-
WebTM/views/应收管理/报表分析/YS_CusShouldIncomeEntryReport.html | 96 ++++
WebTM/views/模治具管理/模治具管理/Gy_MaterialMouldBillMain.html | 4
32 files changed, 1,020 insertions(+), 182 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html"
index f7136ac..3ef47bc 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterList.html"
@@ -29,7 +29,7 @@
</div>
</div>
</div>
- <table class="layui-hide" id="mainTable"></table>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
@@ -38,7 +38,8 @@
layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
, form = layui.form
- , layer = layui.layer;
+ , layer = layui.layer;
+
//蹇�熸煡璇�
form.on('submit(HQuery)', function () {
//var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -53,14 +54,35 @@
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
- RoadQuery($('#Value').val());
+
+ RoadQuery($('#Value').val());
+
+ table.on('row(mainTable)', 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;
+ }
+ });
+ })
+
table.render({
elem: '#mainTable'
// , url: '/demo/table/user/'
, data: []
//, cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
, cols: [[
- { type: 'radio' }
+ { type: 'checkbox' }
, { field: 'HItemID', title: 'HItemID', hide: true }
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', sort: true }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipType.html"
index c7fd8fc..3dc4a37 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipType.html"
@@ -52,6 +52,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -123,6 +125,14 @@
break;
//鍙嶅叧闂�
case 'set_CancelCloseBill': set_CloseBill(2);
+ //绂佺敤鎸夐挳
+ case 'btn-Stop':
+ set_De_Stop(0);
+ break;
+ //鍙嶇鐢ㄦ寜閽�
+ case 'btn-DeStop':
+ set_De_Stop(1);
+ break;
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -395,7 +405,44 @@
else {
layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
}
- }
+ }
+
+ // 鍙嶇鐢�/绂佺敤鏁版嵁
+ function set_De_Stop(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ layer.confirm("纭瑕佺鐢ㄥ悧?", function (index) {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_EquipTypeBill/StopGy_EquipTypeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
//淇敼鎸夐挳
function set_ShowBill() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProjectMoney.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProjectMoney.html"
index 956c712..037d341 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProjectMoney.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProjectMoney.html"
@@ -125,7 +125,6 @@
//#endregion
-
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -179,7 +178,7 @@
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(1);
});
// 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -214,8 +213,12 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_Display(sWhere);
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
+
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -307,7 +310,7 @@
layer.close(index);
}
//蹇�熸煡璇�
- function get_FastQuery() {
+ function get_FastQuery(number) {
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
var ColName = $("#ColName").val();//澶嶉�夋
@@ -386,24 +389,28 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var hID = data[0].HItemID.toString();
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缂栬緫椤圭洰璐圭敤'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
-
+ if (data[0].瀹℃牳浜� == "" && data[0].瀹℃牳浜� == null && data[0].绂佺敤浜� == "" && data[0].绂佺敤浜� == null ) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫椤圭洰璐圭敤'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ else {
+ layer.msg('鍗曟嵁涓嶆槸鍒涘缓鐘舵�侊紒鏃犳硶缂栬緫锛�');
+ }
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -518,8 +525,33 @@
}
//#endregion
-
-
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+
+ if (openType == 2) {
+ sWhere += " and ISNULL(瀹℃牳浜�,'') != '' ";
+
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
index 1c07150..24f56a0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
@@ -58,6 +58,7 @@
<div class="layui-input-block">
<input type="radio" name="FixedItems" value="SProc" title="宸ュ簭">
<input type="radio" name="FixedItems" value="SMater" title="鐗╂枡">
+ <input type="radio" name="FixedItems" value="SWorkCenter" title="宸ヤ綔涓績">
<input type="radio" name="FixedItems" value="SFree" title="鑷敱" checked>
</div>
</div>
@@ -114,6 +115,22 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDept" id="btnSearchDept" 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-xs4 layui-inline">
+ <label class="layui-form-label">宸ヤ綔涓績</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkCenterName" id="HWorkCenterName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HWorkCenterID" id="HWorkCenterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkCenter" id="btnSearchWorkCenter" 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-xs4 layui-inline">
+ <label class="layui-form-label">涓績浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkCenterNumber" id="HWorkCenterNumber" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -251,7 +268,7 @@
var option = [];
var HModName = "Gy_ProcPrice";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID","HDeptID","HMaterIDCol","HProcIDCol","HSourceIDCol"];
+ var titleData = ["HItemID", "HDeptID", "HMaterIDCol", "HProcIDCol", "HSourceIDCol"];
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -295,9 +312,11 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
"HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcIDCol": "",
- "HProcNumberCol": "", "HProcNameCol": "","HSourceIDCol":"", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
+ "HProcNumberCol": "", "HProcNameCol": "", "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "0",
"HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "false", "HFlowFlagCol": "false", "HPayFlagCol": "false",
- "HRemarkCol": ""
+ "HRemarkCol": "",
+ "HWorkCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HWorkQty": 0, "HStdEmp": 0, "HChangeTimes": 0,
+ "HChangeMoney": 0, "HProcNo": 0, "HPieceTimes": 0, "HMouldQty": 0, "HChangeMouldMoney": 0, "HRushQty": 0
};
switch (obj.event) {
case 'btn-AddLine':
@@ -315,6 +334,11 @@
NewRow.HProcIDCol = $("#HProcID").val();
NewRow.HProcNumberCol = $("#HProcNumber").val();
NewRow.HProcNameCol = $("#HProcName").val();
+ }
+ else if (FixedItems == "SWorkCenter") {
+ NewRow.HWorkCenterID = $("#HWorkCenterID").val();
+ NewRow.HWorkCenterNumber = $("#HWorkCenterNumber").val();
+ NewRow.HWorkCenterName = $("#HWorkCenterName").val();
}
NewRow.HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
NewRow.HEndDateCol = "2100-01-01";
@@ -404,7 +428,7 @@
var field = $(this).data('field');
laydate.render({
elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
+ , show: true //鐩存帴鏄剧ず
, closeStop: this
, done: function (nowDate) {
//鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
@@ -419,7 +443,7 @@
var field = $(this).data('field');
laydate.render({
elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
+ , show: true //鐩存帴鏄剧ず
, closeStop: this
, done: function (nowDate) {
//鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
@@ -429,14 +453,84 @@
}
});
}
+ else if (obj.event == 'inputHPrice') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ //鍙兘杈撳叆灏忔暟鐐瑰拰鏁板瓧锛屼繚鐣�6浣嶅皬鏁�
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHWorkQty') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHStdEmp') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHChangeTimes') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHChangeMoney') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHProcNo') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHPieceTimes') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHMouldQty') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHChangeMouldMoney') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
+ else if (obj.event == 'inputHRushQty') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
+ });
+ }
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event == 'HMaterCheck')
- {
+ if (obj.event == 'HMaterCheck') {
layer.open({
type: 2,
- skin: 'layui-layer-rim',
+ skin: 'layui-layer-rim',
title: '鐗╂枡鍒楄〃',
closeBtn: 1,
shift: 2,
@@ -445,7 +539,7 @@
content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index]
+ var iframeWindow = window['layui-layer-iframe' + index]
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
@@ -472,11 +566,10 @@
}
});
}
- if (obj.event == 'HProcCheck')
- {
+ if (obj.event == 'HProcCheck') {
layer.open({
type: 2,
- skin: 'layui-layer-rim',
+ skin: 'layui-layer-rim',
title: '宸ュ簭鍒楄〃',
closeBtn: 1,
shift: 2,
@@ -485,7 +578,7 @@
content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index]
+ var iframeWindow = window['layui-layer-iframe' + index]
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
@@ -504,7 +597,7 @@
, HMaterModelCol: $("#HMaterModel").val()
});
}
- layer.close(layer.index);
+ layer.close(layer.index);
}
, btn2: function (index, layero) {
},
@@ -542,7 +635,37 @@
}
});
}
-
+ if (obj.event == 'HWorkCenterCheck') {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim',
+ title: '宸ヤ綔涓績鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index]
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HWorkCenterID: checkStatus.data[0].HItemID
+ , HWorkCenterNumber: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜
+ , HWorkCenterName: checkStatus.data[0].宸ヤ綔涓績
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+ }
+ });
+ }
+
obj.event = "";
return false;
@@ -730,15 +853,54 @@
}
});
});
+ //琛ㄥご淇℃伅宸ヤ綔涓績寮圭獥
+ form.on('submit(btnSearchWorkCenter)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ヤ綔涓績鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HWorkCenterID").val(checkStatus.data[0].HItemID);
+ $("#HWorkCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
+ $("#HWorkCenterNumber").val(checkStatus.data[0].宸ヤ綔涓績浠ｇ爜);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
rowdata = [{
"HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcIDCol": "",
- "HProcNumberCol": "", "HProcNameCol": "", "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
+ "HProcNumberCol": "", "HProcNameCol": "", "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "0",
"HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "false", "HFlowFlagCol": "false", "HPayFlagCol": "false",
- "HRemarkCol": ""
+ "HRemarkCol": "",
+ "HWorkCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HWorkQty": 0, "HStdEmp": 0, "HChangeTimes": 0,
+ "HChangeMoney": 0, "HProcNo": 0, "HPieceTimes": 0, "HMouldQty": 0, "HChangeMouldMoney": 0, "HRushQty": 0
}];
option = {
elem: '#mainTable'
@@ -748,11 +910,11 @@
, limit: 50
, height: 'full-250'
, cellMinWidth: 90
- , cols: [[
+ , cols: [[
{ type: 'checkbox' }
, { field: 'HMaterIDCol', title: '鐗╂枡ID', edit: 'text', hide: true }
, { field: 'HMaterNumberCol', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HMaterCheck", width: 200 }
- , { field: 'HMaterNameCol', title: '鐗╂枡鍚嶇О', width:200 }
+ , { field: 'HMaterNameCol', title: '鐗╂枡鍚嶇О', width: 200 }
, { field: 'HMaterModelCol', title: '瑙勬牸鍨嬪彿', width: 200 }
, { field: 'HProcIDCol', title: '宸ュ簭ID', edit: 'text', hide: true }
, { field: 'HProcNumberCol', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
@@ -760,7 +922,19 @@
, { field: 'HSourceIDCol', title: '璧勬簮ID', edit: 'text', hide: true }
, { field: 'HSourceNumberCol', title: '璧勬簮浠ｇ爜', edit: 'text', event: "HSourceCheck" }
, { field: 'HSourceNameCol', title: '璧勬簮鍚嶇О' }
- , { field: 'HPriceCol', title: '鍗曚环', edit: 'text' }
+ , { field: 'HPriceCol', title: '鍗曚环', edit: 'text', event: "inputHPrice" }
+ , { field: 'HWorkCenterID', title: '宸ヤ綔涓績ID', edit: 'text', hide: true }
+ , { field: 'HWorkCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterCheck", width: 120 }
+ , { field: 'HWorkCenterName', title: '宸ヤ綔涓績', edit: 'text', width: 120 }
+ , { field: 'HWorkQty', title: '灏忔椂浜ц兘', edit: 'text', event: "inputHWorkQty" }
+ , { field: 'HStdEmp', title: '鏍囧噯浜哄姏', edit: 'text', event: "inputHStdEmp" }
+ , { field: 'HChangeTimes', title: '鎹㈢嚎鏃堕棿', edit: 'text', event: "inputHChangeTimes" }
+ , { field: 'HChangeMoney', title: '鎹㈢嚎琛ヨ创', edit: 'text', event: "inputHChangeMoney" }
+ , { field: 'HProcNo', title: '宸ヨ壓璺嚎娴佹按鍙�', edit: 'text', width: 150, event: "inputHProcNo" }
+ , { field: 'HPieceTimes', title: '鍗曚欢鍔犲伐鏃堕棿', edit: 'text', width: 150, event: "inputHPieceTimes" }
+ , { field: 'HMouldQty', title: '妯″叿鏁伴噺', edit: 'text', event: "inputHMouldQty" }
+ , { field: 'HChangeMouldMoney', title: '鎹㈡ā琛ヨ创', edit: 'text', event: "inputHChangeMouldMoney" }
+ , { field: 'HRushQty', title: '鍗曚欢鍐叉娆℃暟', edit: 'text', width: 150, event: "inputHRushQty" }
, { field: 'HBeginDateCol', title: '寮�濮嬫棩鏈�', event: "HBeginDateCol" }
, { field: 'HEndDateCol', title: '缁撴潫鏃ユ湡', event: "HEndDateCol" }
, { field: 'HCostFlagCol', title: '鎴愭湰蹇呴��', templet: '#HCostFlagCol' }
@@ -839,7 +1013,7 @@
if (HItemID == '' || HItemID == null) {
HItemID = 0;
}
- var ajaxLoad = layer.load();
+ var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + "/Gy_ProcPrice/GetProcPriceValue",
type: "GET",
@@ -860,16 +1034,26 @@
, "HDeptID": d.data[0].Hdeptid
, "HMakeDate": Format(new Date(d.data[0].鍒跺崟鏃ユ湡), 'yyyy-MM-dd')
, "HMaker": d.data[0].鍒跺崟浜�
+ , "HWorkCenterID": d.data[0].HWorkCenterID
+ , "HWorkCenterNumber": d.data[0].宸ヤ綔涓績浠ｇ爜
+ , "HWorkCenterName": d.data[0].宸ヤ綔涓績
});
var rowdata = [];
for (var i = 0; i < d.data.length; i++) {
//瀛愯〃 璧嬪��
rowdata.push({
- "HMaterIDCol": d.data[i].HMaterID, "HMaterNumberCol": d.data[i].鐗╂枡浠ｇ爜, "HMaterNameCol": d.data[i].鐗╂枡鍚嶇О, "HMaterModelCol": d.data[i].瑙勬牸鍨嬪彿, "HProcIDCol": d.data[i].HProcID,
- "HProcNumberCol": d.data[i].宸ュ簭浠ｇ爜, "HProcNameCol": d.data[i].宸ュ簭鍚嶇О, "HSourceIDCol": d.data[i].HSourceID, "HSourceNumberCol": d.data[i].璧勬簮浠ｇ爜, "HSourceNameCol": d.data[i].璧勬簮鍚嶇О, "HPriceCol": d.data[i].鍗曚环,
- "HBeginDateCol": Format(new Date(d.data[i].寮�濮嬫棩鏈�), 'yyyy-MM-dd'), "HEndDateCol": Format(new Date(d.data[i].缁撴潫鏃ユ湡), 'yyyy-MM-dd'), "HCostFlagCol": (d.data[i].HCostFlag == 0 ? false : true), "HFlowFlagCol": (d.data[i].HFlowFlag == 0 ? false : true), "HPayFlagCol": (d.data[i].HPayFlag == 0 ? false : true),
- "HRemarkCol": d.data[i].澶囨敞
+ "HMaterIDCol": d.data[i].HMaterID, "HMaterNumberCol": d.data[i].鐗╂枡浠ｇ爜, "HMaterNameCol": d.data[i].鐗╂枡鍚嶇О,
+ "HMaterModelCol": d.data[i].瑙勬牸鍨嬪彿, "HProcIDCol": d.data[i].HProcID, "HProcNumberCol": d.data[i].宸ュ簭浠ｇ爜,
+ "HProcNameCol": d.data[i].宸ュ簭鍚嶇О, "HSourceIDCol": d.data[i].HSourceID, "HSourceNumberCol": d.data[i].璧勬簮浠ｇ爜,
+ "HSourceNameCol": d.data[i].璧勬簮鍚嶇О, "HPriceCol": d.data[i].鍗曚环, "HBeginDateCol": Format(new Date(d.data[i].寮�濮嬫棩鏈�), 'yyyy-MM-dd'),
+ "HEndDateCol": Format(new Date(d.data[i].缁撴潫鏃ユ湡), 'yyyy-MM-dd'), "HCostFlagCol": (d.data[i].HCostFlag == 0 ? false : true),
+ "HFlowFlagCol": (d.data[i].HFlowFlag == 0 ? false : true), "HPayFlagCol": (d.data[i].HPayFlag == 0 ? false : true),
+ "HRemarkCol": d.data[i].澶囨敞,
+ "HWorkCenterID": d.data[i].HWorkCenterID, "HWorkCenterNumber": d.data[i].宸ヤ綔涓績浠ｇ爜, "HWorkCenterName": d.data[i].宸ヤ綔涓績,
+ "HWorkQty": d.data[i].灏忔椂浜ц兘, "HStdEmp": d.data[i].鏍囧噯浜哄姏, "HChangeTimes": d.data[i].鎹㈢嚎鏃堕棿, "HChangeMoney": d.data[i].鎹㈢嚎琛ヨ创,
+ "HProcNo": d.data[i].宸ヨ壓璺嚎娴佹按鍙�, "HPieceTimes": d.data[i].鍗曚欢鍔犲伐鏃堕棿, "HMouldQty": d.data[i].妯″叿鏁伴噺,
+ "HChangeMouldMoney": d.data[i].鎹㈡ā琛ヨ创, "HRushQty": d.data[i].鍗曚欢鍐叉娆℃暟
});
}
option.data = rowdata;
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html"
index 9fe7c5a..d68e023 100644
--- "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html"
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html"
@@ -295,6 +295,102 @@
});
//#endregion
+ //#region 鍙屽嚮杩涘叆缂栬緫
+ table.on('rowDouble(mainTable)', function (obj) {
+ //閫変腑楂樹寒 鍙屽嚮琛�
+ obj.tr.find(':checkbox').prop('checked', true);
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = true;
+ }
+ });
+ var HBillNo = obj.data["鍗曟嵁鍙�"];
+ var sWhere = "";
+
+ if (obj.data.鍗曟嵁绫诲瀷 == "閿�鍞嚭搴撳崟") {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ $.ajax({
+ url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var linterid = data1.data[0].hmainid
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫閿�鍞鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=10'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+
+ }
+ })
+ }
+
+ else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ } else if (obj.data.鍗曟嵁绫诲瀷 == "鏀舵鍗�") {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ $.ajax({
+ url: GetWEBURL() + '/YS_ReceiveBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var linterid = data1.data[0].hmainid
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫閿�鍞鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../閿�鍞鐞�/鏀舵鍗�/YS_ReceiveBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=10'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+
+ }
+ })
+ }else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ });
+ //#endregion
+
//#region 瀵煎嚭Execel
function get_Export() {
table.exportFile(ins.config.id, option.data, "xls");
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMain.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMain.html"
index f5f39a9..20ec95e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMain.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMain.html"
@@ -836,7 +836,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -862,7 +862,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMainList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMainList.html"
index 7366bc9..33f343f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMainList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMainList.html"
@@ -526,7 +526,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -556,7 +556,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 8a73f8d..58acfca 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -358,6 +358,20 @@
<input type="text" class="layui-input" name="HNextMainDate" id="HNextMainDate" readonly>
</div>
</div>
+ <div class="layui-inline" style="margin-left:10px;">
+ <label class="layui-form-label">鍣ㄥ叿鍒嗙被</label>
+ <div class="layui-input-block">
+ <select name="HMouldClass" lay-filter="HMouldClass" id="HMouldClass">
+ <option value="妯″叿" selected="selected">妯″叿</option>
+ <option value="宸ヨ">宸ヨ</option>
+ <option value="澶瑰叿">澶瑰叿</option>
+ <option value="鍒�鍏�">鍒�鍏�</option>
+ <option value="妫�鍏�">妫�鍏�</option>
+ <option value="鍛ㄨ浆鍣ㄥ叿">鍛ㄨ浆鍣ㄥ叿</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -1250,6 +1264,7 @@
$("#HBarCode").val(d.data[0].鏉＄爜缂栧彿);
$("#HMadeSupID").val(d.data[0].HMadeSupID);
$("#HMadeSupName").val(d.data[0].鍒堕�犲巶鍟�);
+ $("#HMouldClass").val(d.data[0].鍣ㄥ叿鍒嗙被);
//$("#HNowSupID").val(d.data[0].HNowSupID);
//$("#HNowSupName").val(d.data[0].铏氭嫙浠�);
var HCycleUnit = d.data[0].鍛ㄦ湡鍗曚綅;
@@ -1258,6 +1273,8 @@
if ( !(HCycleUnit == null || HCheckCycle == null ) ) {
calculateHNextMainDate(d.data[0].hmainid, HCycleUnit, HCheckCycle);
}
+
+ form.render('select');
}
});
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index 04468ad..de77ef0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -8,11 +8,18 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <style type="text/css">
- </style>
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
-
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -47,7 +54,16 @@
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
@@ -68,27 +84,23 @@
</div>
</div>
</div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
- , soulTable = layui.soulTable
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ , tree = layui.tree
var sWhere = "";
var option = [];
//#endregion
@@ -156,6 +168,8 @@
//鏌ヨ
get_Display(sWhere);
+ //鏌ヨ鍣ㄥ叿鍒嗙被
+ get_Display_Tree();
}
//鍒濆鍖栬〃鏍�
@@ -497,6 +511,89 @@
}
}
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Mould/TreeList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ var sql = "";
+ if (data.id == "0") {
+ sql = "";
+ } else {
+ sql = " and HMouldTypeID='" + data.id + "' ";
+ }
+ get_Display(sql);
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
//鍒锋柊
function get_Refresh() {
$("#HNumber").val("");
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
index 5c28203..51d80cb 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
@@ -907,7 +907,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_MaterialTechParamBill/CheckGy_MaterialTechParamBillMain',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -933,7 +933,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_MaterialTechParamBill/CheckGy_MaterialTechParamBillMain',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
index 4ea137d..e1cab6f 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
@@ -526,7 +526,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_MaterialTechParamBill/CheckGy_MaterialTechParamBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -556,7 +556,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_MaterialTechParamBill/CheckGy_MaterialTechParamBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
index 37e359c..a39868a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList_PDA.html"
@@ -98,7 +98,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EqpMaintenanceBillList_PDA";
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEquipID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HRepairCheckID1", "HManagerID1", "HBillType", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -194,7 +195,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "WX" },
+ data: { "sWhere": sWhere, "Type": "WX", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -209,7 +210,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html"
index 47a064c..c57fa3b 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipConkBookBillList_PDA.html"
@@ -98,7 +98,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EquipConkBookBillList_PDA";
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEquipID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HConkTypeID", "HManagerID", "HBillType", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HConkReasonID","HManagerID1"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -194,7 +195,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "GZ" },
+ data: { "sWhere": sWhere, "Type": "GZ", "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -209,7 +210,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
index d77c8e2..52e28f4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
@@ -98,6 +98,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EquipDotCheckBillList_PDA";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "璁惧ID", "鐐规椤圭洰ID","璐熻矗浜篒D","hsubid","HBillType"];
//#endregion
@@ -167,9 +169,9 @@
//鍒濆鍖栨椂闂�
$("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
+ //鍒濆鍖栬〃鏍�
DisPlay_HideColumn();
}
@@ -194,7 +196,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "DJ" },
+ data: { "sWhere": sWhere, "Type": "DJ", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -209,7 +211,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
@@ -370,7 +372,7 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid","HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid","璁惧ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
index d0c8af5..0bf5279 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
@@ -98,7 +98,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EquipMaintainBillList_PDA";
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "璁惧ID", "鐐规椤圭洰ID", "璐熻矗浜篒D", "hsubid","閰嶄欢ID","鍗曚綅ID","hmaterid","HBillType","HEquipMaintainRuleInterID","婧愬崟涓诲唴鐮�","婧愬崟瀛愬唴鐮�"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -194,7 +195,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "BY" },
+ data: { "sWhere": sWhere, "Type": "BY", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -209,7 +210,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html"
index fa73f23..0d13c85 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairCheckBillList_PDA.html"
@@ -108,7 +108,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EquipRepairCheckBillList_PDA";
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEquipID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HConkTypeID", "HManagerID", "HBillType", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HConkReasonID", "HManagerID1","HRepairCheckID1"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -204,7 +205,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "YS" },
+ data: { "sWhere": sWhere, "Type": "YS", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -219,7 +220,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
index 2b15aa3..2510934 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
@@ -69,11 +69,12 @@
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
-
+
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
<li class="layui-this">鏃ュ父璁板綍</li>
<li>缁翠慨璁板綍</li>
+ <li>閰嶄欢鏇存崲娓呭崟</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -81,6 +82,9 @@
</div>
<div class="layui-tab-item">
<table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
</div>
</div>
</div>
@@ -97,6 +101,9 @@
{{d.LAY_TABLE_INDEX+1}}
</script>
<script type="text/html" id="xuhao1">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <script type="text/html" id="xuhao2">
{{d.LAY_TABLE_INDEX+1}}
</script>
@@ -126,6 +133,7 @@
, table = layui.table
, table1 = layui.table
, table2 = layui.table
+ , table3 = layui.table
, form = layui.form
, element = layui.element
, laypage = layui.laypage
@@ -138,6 +146,7 @@
var option = [];
var option1 = [];
var option2 = [];
+ var option3 = [];
//#endregion
@@ -181,6 +190,8 @@
table1.render(option1);
option2.data = data1.list[1];
table2.render(option2);
+ option3.data = data1.list[2];
+ table3.render(option3);
} else {
layer.alert("鑾峰彇澶辫触", { icon: 5 });
}
@@ -210,6 +221,8 @@
set_InitGrid1();
//鍒濆鍖栬〃鏍�(瀛愯〃2)
set_InitGrid2();
+ //鍒濆鍖栬〃鏍�(瀛愯〃3)
+ set_InitGrid3();
//鏌ヨ
get_Display(sWhere);
}
@@ -348,6 +361,43 @@
table2.render(option2);
layer.close(ajaxLoad);
}
+ //鍒濆鍖栬〃鏍�(瀛愯〃3)
+ function set_InitGrid3() {
+ var ajaxLoad = layer.load();
+ option3 = {
+ elem: '#mainTable3'
+ //, toolbar: '#toolbarDemo'
+ , height: '350'
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ //{ type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao2', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200 }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
+ , { field: '璁惧鍒嗙被', title: '璁惧鍒嗙被', width: 200 }
+ , { field: '璁惧鏉＄爜', title: '璁惧鏉＄爜', width: 200 }
+ , { field: '璁惧缂栫爜', title: '璁惧缂栫爜', width: 200, hide: true }
+ , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200 }
+ , { field: '璁惧瑙勬牸', title: '璁惧瑙勬牸', width: 200 }
+ , { field: '璁惧鍨嬪彿', title: '璁惧鍨嬪彿', width: 200 }
+ , { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜', width: 200 }
+ , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+
+ ]]
+ };
+ option3.data = [];
+ table3.render(option3);
+ layer.close(ajaxLoad);
+ }
//鍔犺浇缃戞牸
function get_Display(sWhere) {
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
index b3736b2..eaef1ec 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
@@ -8,9 +8,18 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <style type="text/css"></style>
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -45,7 +54,16 @@
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
@@ -66,27 +84,23 @@
</div>
</div>
</div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
- , soulTable = layui.soulTable
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ , tree = layui.tree
var sWhere = "";
var option = [];
//#endregion
@@ -153,6 +167,8 @@
//鏌ヨ
get_Display(sWhere);
+ //鏌ヨ璁惧鍒嗙被
+ get_Display_Tree();
}
//鍒濆鍖栬〃鏍�
@@ -268,6 +284,7 @@
}
});
}
+
//蹇�熻繃婊�
function get_FastQuery() {
@@ -484,6 +501,89 @@
}
}
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_EquipFileMain/TreeGetList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ var sql = "";
+ if (data.id == "0") {
+ sql = "";
+ } else {
+ sql = " and HEquipFileTypeID='" + data.id + "' ";
+ }
+ get_Display(sql);
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
//鍒锋柊
function get_Refresh() {
$("#HNumber").val("");
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
index 6cf0643..afd8877 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/MES_ProcessCheckBill_PDA.html"
@@ -290,6 +290,10 @@
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
</form>
</div>
</div>
@@ -655,14 +659,18 @@
"HMaterName": data.浜у搧,
"HMaterNumber": data.浜у搧浠ｇ爜,
"HMaterModel": data.瑙勬牸鍨嬪彿,
- "HPRDORGID": data.缁勭粐,
- "HPRDORGName": data.缁勭粐鍚嶇О,
+ "HPRDORGID": 0,//data.缁勭粐,
+ "HPRDORGName": '',//data.缁勭粐鍚嶇О,
"HUnitID": data.HUnitID,
"HUnitName": data.鍗曚綅,
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
"HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
@@ -690,10 +698,16 @@
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
"HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": 0,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.鍗曟嵁绫诲瀷,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
+
+ HProcExchBillNoFlag = true;
break;
case "MO00":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -714,10 +728,16 @@
"HProcName": data.褰撳墠宸ュ簭,
"HProcID": data.HProcID,
"HQCSchemeID": data.妫�楠屾柟妗圛D,
- "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�,
+ "HMainSourceInterID": data.hmainid,
+ "HMainSourceEntryID": data.hsubid,
+ "HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
+
+ HProcExchBillNoFlag = true;
break;
}
layer.close(index);
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/MES_ColorRecordBill_PDA.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/MES_ColorRecordBill_PDA.html"
index f3581b9..ce1819c 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/MES_ColorRecordBill_PDA.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/MES_ColorRecordBill_PDA.html"
@@ -290,6 +290,7 @@
<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
</form>
</div>
</div>
@@ -670,6 +671,7 @@
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": data.hsubid,
"HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
@@ -701,6 +703,7 @@
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": 0,
"HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.HBillType,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
@@ -729,6 +732,7 @@
"HMainSourceInterID": data.hmainid,
"HMainSourceEntryID": data.hsubid,
"HMainSourceBillNo": data.鍗曟嵁鍙�,
+ "HMainSourceBillType": data.鍗曟嵁绫诲瀷,
});
//鑾峰彇妫�楠屾柟妗�/妫�楠岄」鐩俊鎭�
get_CheckItem();
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
index 734f3f0..f0e2207 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
@@ -103,7 +103,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">椤圭洰璐圭敤</label>
+ <label class="layui-form-label">椤圭洰璐圭敤<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HProjectMoneyName" id="HProjectMoneyName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
<input type="hidden" name="HProjectMoneyID" id="HProjectMoneyID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -113,7 +113,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戠エ绫诲瀷</label>
+ <label class="layui-form-label">鍙戠エ绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<select name="HType" id="HType" lay-filter="HType" style="width:190px;">
</select>
@@ -128,25 +128,25 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">涓嶅惈绋庨噾棰�</label>
+ <label class="layui-form-label">涓嶅惈绋庨噾棰�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMoney" id="HMoney" value="0" autocomplete="off" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">绋庣巼</label>
+ <label class="layui-form-label">绋庣巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="0" autocomplete="off" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎬婚噾棰�</label>
+ <label class="layui-form-label">鎬婚噾棰�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" value="0" autocomplete="off">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁忔墜浜�</label>
+ <label class="layui-form-label">缁忔墜浜�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; " readonly>
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -317,6 +317,11 @@
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
OperationType = 1;
+
+
+ //鏍规嵁鐧诲綍鐢ㄦ埛 鑾峰彇 閮ㄩ棬 缁忔墜浜�
+ getCzyglByUser();
+
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -471,7 +476,10 @@
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
//#region 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- set_AddNew(data);
+ if (AllowLoadData(data)) {
+ set_AddNew(data);
+ }
+
});
//#endregion
@@ -679,9 +687,11 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HCusID").val(checkStatus.data[0].瀹㈡埛ID);
- $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О );
-
+ $("#HCusName").val(checkStatus.data[0].HName);
+ $("#HCusID").val(checkStatus.data[0].HItemID);
+ var HCusID=$("#HCusID").val();
+ getHTaxRateByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
+ getCustomerByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜�,绋庣巼
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -697,7 +707,7 @@
, area: ['90%', '90%']//澶у皬
, title: '椤圭洰璐圭敤鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney.html?OperationType=2", "yes"]
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -733,6 +743,52 @@
}
//#endregion
+ //#region 闈炵┖楠岃瘉
+ function AllowLoadData(data) {
+ //#region 琛ㄥご鏁版嵁妫�楠�
+ if ($("#HBillNo").val() == "") {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+ return false;
+ }
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HAccDate").val() == "") {
+ layer.msg("鏀舵鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HCusID").val() == "") {
+ layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HProjectMoneyID").val() == "0") {
+ layer.msg("璐圭敤椤圭洰鏈�夋嫨!");
+ return false;
+ }
+ if ($("#HType").val() == "") {
+ layer.msg("鍙戠エ绫诲瀷鏈�夋嫨!");
+ return false;
+ }
+ if ($("#HEmpID").val() == "0") {
+ layer.msg("缁忔墜浜烘湭閫夋嫨!");
+ return false;
+ }
+ if ($("#HMoney").val() == "0") {
+ layer.msg("涓嶅惈绋庨噾棰濅笉鑳戒负闆�");
+ return false;
+ }
+ if ($("#HTaxRate").val() == "0") {
+ layer.msg("绋庣巼涓嶈兘涓洪浂");
+ return false;
+ }
+ if ($("#HSumMoney").val() == "0") {
+ layer.msg("鎬婚噾棰濅笉鑳戒负闆�");
+ return false;
+ }
+ return true;
+ }
+ //#endregion
//#endregion
//#region 淇濆瓨HMaker
@@ -861,8 +917,87 @@
//#endregion
-
-
+ //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
+ function getHTaxRateByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ $("#HTaxRate").val(data.HTaxRate);
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐧诲綍鐢ㄦ埛 鑾峰彇閮ㄩ棬 缁忔墜浜�
+ function getCzyglByUser() {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCzyglByUser",
+ async: false,
+ type: "GET",
+ data: {
+ "CurUserName": sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ $("#HEmpID").val(data.HEmpID); //缁忔墜浜篿d
+ $("#HEmpName").val(data.HEmpName); //缁忔墜浜�
+ $("#HDeptID").val(data.HDeptID); //閮ㄩ棬id
+ $("#HDeptName").val(data.HDeptName); //閮ㄩ棬
+
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜� 绋庣巼
+ function getCustomerByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ $("#HCusID").val(data.HCusID);
+ $("#HCusName").val(data.HCusName);
+ $("#HCurID").val(data.HCurID);
+ $("#HCurName").val(data.HCurName);
+ $("#HExRate").val(data.HExRate);
+ $("#HTaxRate").val(data.HTaxRate);
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//#endregion
@@ -880,11 +1015,11 @@
$("#HEmpID").val(obj[0].HItemID);
}
- function GetHSupValue(obj) //杩斿洖瀹㈡埛
- {
- $("#HCusName").val(obj[0].HName);
- $("#HCusID").val(obj[0].HItemID);
- }
+ //function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ //{
+ // $("#HCusName").val(obj[0].HName);
+ // $("#HCusID").val(obj[0].HItemID);
+ //}
</script>
</body>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
index b294891..6a1fc52 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
@@ -254,18 +254,24 @@
});
var linterid = obj.data["hmainid"];
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏀舵鍗�-缂栬緫'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , btn: ['纭畾'],
- end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
- }
- })
+ if (obj.data.鍗曟嵁鐘舵�� == "鍒涘缓") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏀舵鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ else {
+ layer.alert('鍗曟嵁涓嶆槸鍒涘缓鐘舵��,涓嶈兘杩涜缂栬緫');
+ }
+
});
//#endregion
@@ -476,19 +482,23 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , btn: [],
- end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
- }
- })
+ if (data[0].鍗曟嵁鐘舵�� =="鍒涘缓") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ else {
+ layer.msg('鍗曟嵁涓嶆槸鍒涘缓鐘舵�侊紒鏃犳硶缂栬緫锛�');
+ }
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index d86564a..18a2866 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -701,7 +701,7 @@
]]
}
- option.data = rowdata;
+ option.data = [];
table.render(option);
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 1bb25bd..acb1321 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -266,6 +266,9 @@
, { field: '鎽樿', title: '鎽樿', sort: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', sort: true, hide: true }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', sort: true, hide: true }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', sort: true, hide: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 125, sort: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
@@ -388,12 +391,16 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
+ var HsupId = data[0].hsubid;
+ var HQty = data[0].鏁伴噺;
+ var HSourceInterID = data[0].婧愬崟涓诲唴鐮�;
+ var HSourceEntryID = data[0].婧愬崟瀛愬唴鐮�;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
url: GetWEBURL() + "Xs_SeOutStockBill/DeltetSeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
+ data: { "HInterID": InterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
index 7eba075..58231e4 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
@@ -86,7 +86,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
@@ -428,7 +428,7 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+ var closeType = params[params[3]];//瀹㈡埛搴旀敹璐︽鏄庣粏 鍙屽嚮寮圭獥寮瑰嚭鍙兘鏌ョ湅涓嶈兘缂栬緫 绂佺敤鎸夐挳
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -464,6 +464,11 @@
getCzyglByUser();
}
else if (OperationType == 3) { //缂栬緫
+ if (closeType == 10) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+
+ }
//鍔犺浇缂栬緫椤甸潰
RoadBillMain(linterid);
}
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html"
index ca02046..e8b98f2 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html"
@@ -858,7 +858,7 @@
$.ajax({
url: GetWEBURL() + '/PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain',
type: "GET",
- data: {"HInterID": $("#HInterID").val(), "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -884,7 +884,7 @@
$.ajax({
url: GetWEBURL() + '/PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
index 47f5ab1..848bb7b 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
@@ -526,7 +526,7 @@
$.ajax({
url: GetWEBURL() + '/PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -556,7 +556,7 @@
$.ajax({
url: GetWEBURL() + '/PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_CustomerTaskBillMainList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_CustomerTaskBillMainList.html"
index ba88aaa..836e553 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_CustomerTaskBillMainList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_CustomerTaskBillMainList.html"
@@ -567,7 +567,7 @@
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/CheckPM_CustomerTaskBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -597,7 +597,7 @@
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/CheckPM_CustomerTaskBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMainList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMainList.html"
index 153f900..06de436 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMainList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectMoneyBillMainList.html"
@@ -547,7 +547,7 @@
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/CheckPM_ProjectMoneyBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -577,7 +577,7 @@
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/CheckPM_ProjectMoneyBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMain.html"
index cabfe34..939e9de 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMain.html"
@@ -1049,7 +1049,7 @@
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/CheckPM_WorkPlanMonthBillMain',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -1075,7 +1075,7 @@
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/CheckPM_WorkPlanMonthBillMain',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMainList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMainList.html"
index 29cdaee..5ef7620 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMainList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_WorkPlanMonthBillMainList.html"
@@ -518,7 +518,7 @@
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/CheckPM_WorkPlanMonthBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -548,7 +548,7 @@
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/CheckPM_WorkPlanMonthBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 322a446..740f8ff 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -46,8 +46,8 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn-print">鎵撳嵃</button>
+ <button type="button" id="set_CheckBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button type="button" id="btn-print" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn-print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -469,6 +469,7 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]];//瀹㈡埛搴旀敹璐︽鏄庣粏 鍙屽嚮寮圭獥寮瑰嚭鍙兘鏌ョ湅涓嶈兘缂栬緫 绂佺敤鎸夐挳
}
//#endregion
@@ -489,6 +490,11 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 3) { //缂栬緫
+ if (closeType == 10) {
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#btn-print').addClass("layui-btn-disabled").attr("disabled", true);
+ }
//淇敼鏃朵富琛↖D
$("#HInterID").val(linterid);
--
Gitblit v1.9.1