From fc71ee8c3873c099ee9cce2b2db6ec97aa6e793e Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期日, 29 五月 2022 23:28:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 2
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 49 +++++++++++++++-
WebTM/views/车间管理/叫料管理/Jl_CallGoodsBillMain.html | 2
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 94 ++++++++++++++++++++++++++++---
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 4 +
WebTM/views/index.html | 24 ++++----
6 files changed, 148 insertions(+), 27 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 34b13ae..620ecd2 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -363,43 +363,43 @@
<dd>
<a>鐢熶骇璁″垝骞冲彴</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">鐢熶骇璁″垝骞冲彴</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">瀵煎叆</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>
</dl>
</dd>
<dd>
<a>鏃ヨ鍒掑伐鍗�</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html">鏃ヨ鍒掑伐鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>
</dl>
</dd>
<dd>
<a>瑕佹枡璁″垝</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html">瑕佹枡璁″垝鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
</dl>
</dd>
<dd>
<a>鎻愭枡璁″垝</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html">鎻愭枡璁″垝鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
</dl>
</dd>
<dd>
<a>鍩虹璧勬枡</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
</dl>
</dd>
<dd>
<a>鍗虫椂搴撳瓨</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html">鍗虫椂搴撳瓨鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
</dl>
</dd>
</dl>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index 1dee345..3f766d1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -272,6 +272,8 @@
<label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo">
+ <input type="text" class="layui-input" lay-verify="HMainSourceInterID" name="HMainSourceInterID" id="HMainSourceInterID" hidden>
+ <input type="text" class="layui-input" lay-verify="HMainSourceEntryID" name="HMainSourceEntryID" id="HMainSourceEntryID" hidden>
</div>
</div>
<div class="layui-inline">
@@ -1271,6 +1273,8 @@
, "HPlanBeginDate": Format(new Date(d.data[0].璁″垝寮�濮嬫棩鏈�), "yyyy-MM-dd")
, "HPlanEndDate":Format(new Date(d.data[0].璁″垝缁撴潫鏃ユ湡), "yyyy-MM-dd")
, "HICMOBillNo": d.data[0].鐢熶骇璁㈠崟鍙�
+ , "HMainSourceInterID": d.data[0].婧愬崟涓诲唴鐮�
+ , "HMainSourceEntryID": d.data[0].婧愬崟瀛愬唴鐮�
, "HOwnerID": d.data[0].璐т富缂栫爜
, "HBatchNo": d.data[0].鎵规
, "HYX": d.data[0].浼樺厛绾�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index ee2ab03..cee9a13 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -58,7 +58,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 6921a65..450ff51 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -177,6 +177,35 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //琛屽唴榧犳爣绂诲紑浜嬩欢
+ table.on('edit(mainTable)', function (obj) {
+ var myDate = new Date();
+ var yyyy = myDate.getFullYear();
+ var MM = myDate.getMonth() + 1;
+ var dd = myDate.getDate();
+ var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+ var dateHQty = 0;
+
+ for (var i = 0; i <= (SumMonth - dd); i++) {
+ if (obj.field == "鐢熶骇璧勬簮") {
+ return;
+ }
+ if (obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')] != null) {
+ dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]);
+ }
+ }
+ for (var i = 1; i < dd; i++) {
+ if (obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')] != null) {
+ dateHQty += parseInt(obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')]);
+ }
+ }
+ console.log(dateHQty)
+ //淇敼鏁版嵁
+ obj.update({
+ "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty
+ });
+ })
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
@@ -194,7 +223,7 @@
}
else {
data[0]["鐢熶骇璧勬簮"] = "";
- data[0]["HSourceID"] = 0;
+ data[0]["HSourceID"] = "";
data[0]["hmainid"] = "";
data[0]["鍗曟嵁鍙�"] = "";
var copydata = JSON.stringify(data);
@@ -238,6 +267,10 @@
set_ClearQuery();
});
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -258,17 +291,18 @@
//鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
+ var Organization = "";
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
for (var i = 0; i < data.length; i++) {
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HProdORGID").append(Organization);
+ $("#HProdORGID").val(sessionStorage["OrganizationID"])
form.render('select');
}
layer.closeAll("loading");
@@ -286,7 +320,6 @@
var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
columns.push({ type: 'checkbox', fixed: 'left' });
- columns.push({ field: 'hmainid', title: 'hmainid', hide: true });
columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true });
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width:150 });
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width:150 });
@@ -302,7 +335,7 @@
columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true});
columns.push({ field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width:150 });
columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width:150 });//0
- columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150 });//0
+ columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150 });//0
columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width:150 });
columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
@@ -310,16 +343,16 @@
columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150 });//0
columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width:150 });
columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
- columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width:150 });
+ columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150});
columns.push({ field: 'HSourceID', title: 'HSourceID', hide:true });
- columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width:150 });
+ columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
for (var i = 0; i <= (SumMonth - dd); i++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), edit: 'text',width:120 })//0
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width: 70 })//0
}
for (var i = 1; i < dd; i++) {
- columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), edit: 'text',width: 120 })//0
+ columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 70 })//0
}
- columns.push({ field: 'T31', title: 'T31', width: 150 });//0
+ columns.push({ field: 'T31', title: 'T31', width: 70 });//0
columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150 });
columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150 });
@@ -329,7 +362,7 @@
columns.push({ field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 150 });
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
- columns.push({ field: '鏃ヨ鍒掑伐鍗曚富鐮�', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150 });
+ columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150 });
option = {
elem: '#mainTable'
@@ -516,6 +549,47 @@
}
});
}
+
+ //琛屽唴蹇嵎閿�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鐢熶骇璧勬簮
+ if (obj.event == "HSourceID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HSourceID": checkStatus.data[0].HItemID
+ , "鐢熶骇璧勬簮": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+
+ })
+ }
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
index e4df184..f62154c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
@@ -142,6 +142,7 @@
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj);//琛屽唴蹇嵎閿瓫閫�
});
//鏂囦欢涓婁紶
@@ -222,7 +223,7 @@
columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
columns.push({ field: '鐢熶骇杞﹂棿缂栫爜*', title: '鐢熶骇杞﹂棿' });
columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
- columns.push({ field: '鐢熶骇璧勬簮缂栫爜*', title: '鐢熶骇璧勬簮' });
+ columns.push({ field: '鐢熶骇璧勬簮缂栫爜*', title: '鐢熶骇璧勬簮', edit: 'text', event: "HSourceID" });
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�' });
columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
columns.push({ field: '鍛樺伐', title: '鍛樺伐' });
@@ -237,11 +238,13 @@
columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 200 });
columns.push({ field: '鐢熶骇璁㈠崟鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 200 });
columns.push({ field: '鎬婚綈濂楁暟閲�', title: '鎬婚綈濂楁暟閲�', width: 200 });
+ columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true});
+ columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
for (var i = 0; i <= (SumMonth - dd); i++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), edit: 'text' })
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:60 })
}
for (var i = 1; i < dd; i++) {
- columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), edit: 'text' })
+ columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 60 })
}
columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
@@ -312,6 +315,46 @@
}
}
+ //琛屽唴鍒犻櫎蹇嵎閿�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鐢熶骇璧勬簮
+ if (obj.event == "HSourceID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HSourceID": checkStatus.data[0].HItemID
+ , "鐢熶骇璧勬簮缂栫爜*": checkStatus.data[0].鐢熶骇璧勬簮浠ｇ爜
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+
+ })
+ }
+
//鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
index 3d7172c..36e8707 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
@@ -158,7 +158,7 @@
//#endregion
//#region 鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
//#endregion
--
Gitblit v1.9.1