From 7ed546192a84e33561330062cdb48790fcdb5eef Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 19 九月 2024 08:57:55 +0800
Subject: [PATCH] 1.设备/模具:保养规程 表头增加 HErrWarDays int --预警天数 2.设备/模具:保养计划单增加HErrBeginTime datetime --预警开始时间点,审核时把子表 预警开始时间点, 填入 3.设备启动点检清单/启动点检清单:增加字段HDotCheckType varchar(50) --点检类型(设备,模具,作业指导书,检验指导书) HRelationID int --关联ID(设备内码或模具内码) 4.启动点检单: 新增 子表界面 根据不同的点检类型,点击查看,弹出不同的数据(根据表头日期查询(按照当前月显示)) .工艺参数点检:增加附件上传功能 2.设备工艺参数趋势图:根据流转卡的子表进站出站时间查询工艺参数(增加一个选择框 采集来源:(设备采集,手动输入)) 3.开工:增加设备启动点检,防错验证控制
---
WebTM/views/设备管理/设备工艺参数订单点检表/Sb_EquipMentCollectionTechParam_ERRList.html | 2
WebTM/views/车间管理/启动点检单/Sc_WorkDotCheckBillList_Day.html | 366 +++++++++++++++++++++
WebTM/views/车间管理/防错验证/Qc_PreventErrMouldCheckBill.html | 4
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html | 13
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 7
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 7
WebTM/views/设备管理/设备报表/Sb_EquipMentCollectionTechParam.html | 4
WebTM/views/设备管理/设备报表/Sb_EquipMentCollectionTechParam_Temp.html | 4
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 11
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 205 +++++++++++
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBill.html | 177 ++++++++-
WebTM/WebTM.csproj | 1
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html | 196 +++++++++-
13 files changed, 914 insertions(+), 83 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index adaffc8..89f64b2 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -521,6 +521,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkDotCheckBillList_Day.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList.html" />
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/Sc_Add_MouldMaintainPlanBillList.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/Sc_Add_MouldMaintainPlanBillList.html"
index 5852bb1..3758c31 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/Sc_Add_MouldMaintainPlanBillList.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/Sc_Add_MouldMaintainPlanBillList.html"
@@ -83,7 +83,7 @@
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
- <option value="鍛�">鍛�</option>
+ <option value="骞�">骞�</option>
</select>
</div>
</div>
@@ -634,6 +634,7 @@
, { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
, { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
, { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�' }
+ , { field: 'HErrBeginTime', title: '棰勮寮�濮嬫椂闂寸偣' }
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
];
@@ -674,7 +675,7 @@
table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
table.render(option_plan);
}
@@ -820,7 +821,7 @@
rowdata.push(
{
"HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].瀹夊叏缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
- , "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
+ ,"HErrBeginTime": Pub_Format(data[i].棰勮寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
}
)
}
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/Sc_MouldMaintainRuleBillEdit.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/Sc_MouldMaintainRuleBillEdit.html"
index cee9d56..6583de5 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/Sc_MouldMaintainRuleBillEdit.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/Sc_MouldMaintainRuleBillEdit.html"
@@ -80,7 +80,7 @@
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
- <option value="鍛�">鍛�</option>
+ <option value="骞�">骞�</option>
</select>
</div>
</div>
@@ -104,6 +104,14 @@
<input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="0">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇棰勮澶╂暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
@@ -537,6 +545,7 @@
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
, "HUseQtys": data.淇濆吇鍐插埡鏁�
, "HSafeDays": data.淇濆吇瀹夊叏澶╂暟
+ , "HErrWarDays": data.淇濆吇棰勮澶╂暟
});
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index e7e71ff..014101d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -68,7 +68,7 @@
<div class="layui-input-block" style="margin-left: 120px;width: 185px;">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
<option value="澶�">澶�</option>
- <option value="鍛�">鍛�</option>
+ <!--<option value="鍛�">鍛�</option>-->
<option value="鏈�">鏈�</option>
<option value="骞�">骞�</option>
</select>
@@ -640,6 +640,7 @@
, { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
, { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
, { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�' }
+ , { field: 'HErrBeginTime', title: '棰勮寮�濮嬫椂闂寸偣' }
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
];
@@ -720,7 +721,7 @@
table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "","HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "","HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
table.render(option_plan);
}
//缂栬緫鑾峰彇琛ㄥご
@@ -868,7 +869,7 @@
rowdata.push(
{
"HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].瀹夊叏缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
- , "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
+ , "HErrBeginTime": Pub_Format(data[i].棰勮寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
}
)
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index a6d300b..7a7f77f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -53,6 +53,7 @@
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">闄勪欢淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -208,7 +209,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -293,6 +294,29 @@
</div>
</div>
</div>
+ <!--闄勪欢淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-upload">
+ <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+ <div class="layui-upload-list">
+ <table class="layui-table" lay-filter="fileTable">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>鍥剧墖</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList" class="ProImgByList">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
@@ -359,13 +383,14 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element','upload'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , upload = layui.upload
, element = layui.element;
var HModName = "SB_EquipICMOTechParamBill";
var HBillType = "3919";
@@ -423,6 +448,8 @@
if (OperationType == 1) { //鏂板
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
//鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂�
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HMaker").val(HMaker);
@@ -432,10 +459,15 @@
$("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(HInterID);
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
+ getFile();
}
else if (OperationType == 4) { //涓嬫帹
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
//鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂�
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HMaker").val(HMaker);
@@ -1554,6 +1586,109 @@
})
//#endregion
+ //#region 鏂囦欢涓婁紶
+ function PicUpload() {
+ //澶氬浘鐗囦笂浼�
+ //澶氭枃浠跺垪琛ㄧず渚�
+ var ProImgByList = $('#ProImgByList')
+ , uploadListIns = upload.render({
+ elem: '#testList'
+ , url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/UploadFile"
+ , accept: 'file'
+ , multiple: true
+ , auto: false
+ //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+ , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+ , choose: function (obj) {
+ var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+ //璇诲彇鏈湴鏂囦欢
+ obj.preview(function (index, file, result) {
+ var tr = $(['<tr id="upload-' + index + '">'
+ , '<td>' + file.name + '</td>'
+ , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + result + '" alt="' + file.name + '">' + '</td>'
+ , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+ , '<td>绛夊緟涓婁紶</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+
+ //鍗曚釜閲嶄紶
+ tr.find('.demo-reload').on('click', function () {
+ obj.upload(index, file);
+ return false;
+ });
+
+ //鍒犻櫎
+ tr.find('.demo-delete').on('click', function () {
+ delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+ tr.remove();
+ uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+ });
+
+ ProImgByList.append(tr);
+
+ });
+ }
+ , done: function (res, index, upload) {
+ if (res.code == 1) { //涓婁紶鎴愬姛
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(3).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+ tds.eq(4).html(''); //娓呯┖鎿嶄綔
+
+ return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+ }
+ this.error(index, upload);
+ }
+ , error: function (index, upload) {
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+ tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+ }
+ });
+ }
+ //#endregion
+
+ //#region 缂栬緫鏃�,鑾峰彇宸蹭笂浼犵殑鏂囦欢鍒楄〃
+ function getFile() {
+ var ProImgByList = $('#ProImgByList')
+ $.ajax({
+ url: GetWEBURL() + '/SB_EquipICMOTechParamBillController/Filelist',
+ type: "GET",
+ data: { "HBillNo": $("#HBillNo").val() },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var index = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ var tr = $(['<tr id="upload-' + i + '">'
+ , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
+ , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
+ , '<td>' + data1.data[i].HFileName + '</td>'
+ , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg' + i + '" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + data1.data[i].HFilePath + '" alt="' + data1.data[i].HFileName + '">' + '</td>'
+ , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
+ , '<td style="color: #5FB878;">涓婁紶鎴愬姛</td>'
+ , '<td style="display:none">' + data1.data[i].url + '</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>涓嬭浇</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+ $('#ProImgByList').append(tr);
+ }
+
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#endregion
});
@@ -1648,6 +1783,72 @@
}
return Result;
}
+
+ function previewImg(obj) {
+ var img = new Image();
+ img.src = obj.src;
+ var height = img.height * 1.2; //鑾峰彇鍥剧墖楂樺害
+ var width = img.width * 1.2; //鑾峰彇鍥剧墖瀹藉害
+ var imgHtml = "<img src='" + obj.src + "' width='100%' height='100%'/>";
+ //寮瑰嚭灞�
+ layer.open({
+ type: 1,
+ shade: 0.8,
+ offset: 'auto',
+ area: ['80%', '80%'],
+ shadeClose: true,
+ scrollbar: false,
+ title: "鍥剧墖棰勮", //涓嶆樉绀烘爣棰�
+ content: imgHtml, //鎹曡幏鐨勫厓绱狅紝娉ㄦ剰锛氭渶濂借鎸囧畾鐨勫厓绱犺瀛樻斁鍦╞ody鏈�澶栧眰锛屽惁鍒欏彲鑳借鍏跺畠鐨勭浉瀵瑰厓绱犳墍褰卞搷
+ cancel: function () {
+ //layer.msg('鎹曡幏灏辨槸浠庨〉闈㈠凡缁忓瓨鍦ㄧ殑鍏冪礌涓婏紝鍖呰９layer鐨勭粨鏋�', { time: 5000, icon: 6 });
+ }
+ });
+ }
+
+ //#region 涓嬭浇宸蹭笂浼犵殑鏂囦欢
+ function dowload(r) {
+ //寰楀埌褰撳墠鎵�鍦ㄨ
+ var rows = r.parentNode.parentNode.rowIndex;
+ //寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
+ var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(6)").html();
+ /*window.location.href = url;*/
+ window.open(url)
+ }
+ //#endregion
+
+ //#region 鍒犻櫎宸蹭笂浼犵殑鏂囦欢
+ function toManager(r) {
+ //寰楀埌褰撳墠鎵�鍦ㄨ
+ var rows = r.parentNode.parentNode.rowIndex;
+ //寰楀埌鎵�鍦ㄨ鐨勭涓�鍒楃殑鍐呭:涓婚敭ID
+ var HItemID = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(0)").html();
+ //寰楀埌鎵�鍦ㄨ鐨勭浜屽垪鐨勫唴瀹�:鍗曟嵁鍙�
+ var HSourceBillNo = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(1)").html();
+ //寰楀埌鎵�鍦ㄨ鐨勭涓夊垪鐨勫唴瀹�:鏂囦欢鍚嶇О
+ var HFileName = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(2)").html();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+
+ //鍒犻櫎宸蹭笂浼犳枃浠�
+ $.ajax({
+ url: GetWEBURL() + '/SB_EquipICMOTechParamBillController/DeleteFilelist',
+ type: "GET",
+ data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.alert(data1.Message, { icon: 1 });
+ $("#ProImgByList tr").eq((rows - 1)).remove();
+ }
+ else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/Sb_EquipMentCollectionTechParam_ERRList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/Sb_EquipMentCollectionTechParam_ERRList.html"
index 4d7d3ac..e3275b3 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/Sb_EquipMentCollectionTechParam_ERRList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/Sb_EquipMentCollectionTechParam_ERRList.html"
@@ -573,7 +573,7 @@
$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
form.render('select');
- $("#HInitTimeCycle").val("29");
+ $("#HInitTimeCycle").val("6");
}
//#endregion
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
index c9e0cf1..6dd50de 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
@@ -6,8 +6,8 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
index 6f76b1c..d05f4f6 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
@@ -6,8 +6,8 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
index 42f0d5e..3ae6539 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
@@ -53,11 +53,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">
- 淇濆吇瀹夊叏澶╂暟
- </label>
+ <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟</label>
<div class="layui-input-inline">
<input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="1">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇棰勮澶╂暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="1">
</div>
</div>
<div class="layui-inline" style="display:none;">
@@ -72,7 +76,7 @@
<label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
<div class="layui-input-inline">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
- <option value="鍛�">鍛�</option>
+ <option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
<option value="骞�">骞�</option>
</select>
@@ -533,6 +537,7 @@
, "HMaintainLevID": data.HMaintainLevID
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
, "HSafeDays": data.淇濆吇瀹夊叏澶╂暟
+ , "HErrWarDays": data.淇濆吇棰勮澶╂暟
});
} else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
index 5cf7235..8dd1a92 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
@@ -115,7 +115,7 @@
</div>
</div>
</div>
-
+
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">璁板綍浜嬮」</label>
@@ -245,7 +245,15 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
-
+ <!--琛屼笅鎷夐�夋嫨(缁撴灉)-->
+ <script type="text/html" id="HDotCheckType">
+ <select name="HDotCheckType" lay-filter="HDotCheckType" id="HDotCheckType{{d.LAY_TABLE_INDEX+1}}">
+ <option value="璁惧" selected>璁惧</option>
+ <option value="妯″叿">妯″叿</option>
+ <option value="浣滀笟鎸囧涔�">浣滀笟鎸囧涔�</option>
+ <option value="妫�楠屾寚瀵间功">妫�楠屾寚瀵间功</option>
+ </select>
+ </script>
<script>
layui.config({
@@ -296,7 +304,7 @@
//#endregion
-
+
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
@@ -306,7 +314,7 @@
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -322,7 +330,7 @@
//鍒濆鍖栧瓙琛�
get_InitGrid();
-
+
RoadBillMain(linterid);
//绂佺敤缁勭粐閫夐」
@@ -340,7 +348,7 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+ //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
//#region 閫夋嫨鐗╂枡鎸夐挳
form.on('submit(btnSearchHMater)', function () {
@@ -352,7 +360,7 @@
form.on('submit(btnSearchHSource)', function () {
get_checkSearchHSource();
});
- //#endregion
+ //#endregion
//#region 閫夋嫨宸ュ簭鎸夐挳
form.on('submit(btnSearchHProc)', function () {
@@ -389,15 +397,18 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HCheckNoteItemID": "0", "HCheckNoteItemName": "", "HCheckPostID": "0", "HCheckPostName": "","HRemark":"",
+ "HCheckNoteItemID": "0", "HCheckNoteItemName": "", "HCheckPostID": "0", "HCheckPostName": "", "HDotCheckType": "璁惧", "HRelationID": "0","HRelationName":"", "HRemark": "",
"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
};
switch (obj.event) {
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
-
- table.render(option);
+ table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDotCheckType' + i + '').find("option[value='" + option.data[i - 1].HDotCheckType + "']").attr("selected", true);
+ }
+ form.render('select');
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -411,15 +422,19 @@
var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
- option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDotCheckType' + i + '').find("option[value='" + option.data[i - 1].HDotCheckType + "']").attr("selected", true);
+ }
+ form.render('select');
}
break;
}
});
-
+
//#region 瀛愯〃锛氳鍐呬簨浠�
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
@@ -428,7 +443,7 @@
});
//#endregion
-
+
//#endregion
@@ -475,8 +490,11 @@
, { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'HCheckNoteItemID', title: 'HCheckNoteItemID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HCheckNoteItemName', title: '妫�鏌ラ」鐩�', edit: 'text', event: "HCheckNoteItemID", style: 'background-color: #f9f9f9;' } //f7
- , { field: 'HCheckPostID', title: 'HCheckPostID', hide: true, style: 'background-color: #f9f9f9;'}
+ , { field: 'HCheckPostID', title: 'HCheckPostID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HCheckPostName', title: '纭鑰呰鑹�', edit: 'text', event: "HCheckPostID", style: 'background-color: #f9f9f9;' }
+ , { field: 'HDotCheckType', title: '鐐规绫诲瀷', templet: '#HDotCheckType' }
+ , { field: 'HRelationID', title: 'HRelationID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HRelationName', title: '缂栫爜', edit: 'text', event: "HRelationID" }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
@@ -492,7 +510,10 @@
, "HCheckNoteItemName": ""
, "HCheckPostID": "0"
, "HCheckPostName": ""
- , "HRemark":""
+ , "HDotCheckType": "璁惧"
+ , "HRelationID": "0"
+ , "HRelationName": ""
+ , "HRemark": ""
, "HSourceInterID": "0"
, "HSourceEntryID": "0"
, "HSourceBillNo": ""
@@ -502,7 +523,20 @@
option.data = rowdata;
table.render(option);
}
- //#endregion
+ //#endregion
+
+ //#region 琛ㄦ牸琛岄�夋嫨澶勭悊
+ form.on('select(HDotCheckType)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HDotCheckType = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //#endregion
//#region 鑾峰彇鍙傛暟
function getUrlVars() {
@@ -533,7 +567,7 @@
});
}
//#endregion
-
+
//#region 鐗╂枡閫夋嫨椤甸潰
function get_checkSearchHMater() {
layer.open({
@@ -707,6 +741,71 @@
}
})
}
+ //绫诲瀷淇℃伅
+ if (obj.event == "HRelationID") {
+ if (obj.data.HDotCheckType == "璁惧") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁惧鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.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({
+ "HRelationID": checkStatus.data[0].hmainid,
+ "HRelationName": checkStatus.data[0].璁惧鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ }
+ })
+ } else if (obj.data.HDotCheckType=="妯″叿") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "妯″叿鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.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({
+ "HRelationID": checkStatus.data[0].hmainid,
+ "HRelationName": checkStatus.data[0].妯″叿鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ }
+ })
+ }
+
+ }
obj.event = "";
return false;
}
@@ -791,12 +890,12 @@
"HInterID": tableMain[0]["HInterID"]
, "HBillNo": tableMain[0]["鍗曟嵁鍙�"]
, "HDate": Format(new Date(tableMain[0]["鏃ユ湡"]), "yyyy-MM-dd")
-
+
, "HMaterID": tableMain[0]["HMaterID"]
, "HMaterName": tableMain[0]["鐗╂枡鍚嶇О"]
, "HSourceID": tableMain[0]["HSourceID"]
, "HSourceName": tableMain[0]["鐢熶骇璧勬簮"]
-
+
, "HProcID": tableMain[0]["HProcID"]
, "HProcName": tableMain[0]["宸ュ簭"]
, "HNote": tableMain[0]["璁板綍浜嬮」"]
@@ -820,18 +919,31 @@
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < tableSub.length; i++) {
+ var relationName = "";
+ if (tableSub[i]["鐐规绫诲瀷"] == "璁惧") {
+ relationName = tableSub[i]["璁惧鍚嶇О"];
+ } else if (tableSub[i]["鐐规绫诲瀷"] == "妯″叿") {
+ relationName = tableSub[i]["妯″叿鍚嶇О"];
+ }
rowdata.push(
{
"HCheckNoteItemID": tableSub[i]["HCheckNoteItemID"],
"HCheckNoteItemName": tableSub[i]["妫�鏌ラ」鐩�"],
"HCheckPostID": tableSub[i]["HCheckPostID"],
"HCheckPostName": tableSub[i]["纭鑰呰鑹�"],
- "HRemark": tableSub[i]["琛ㄤ綋澶囨敞"]
+ "HDotCheckType": tableSub[i]["鐐规绫诲瀷"],
+ "HRelationID": tableSub[i]["HRelationID"],
+ "HRelationName": relationName,
+ "HRemark": tableSub[i]["琛ㄤ綋澶囨敞"]
}
);
}
option.data = rowdata;
- table.render(option);
+ table.render(option);
+ for (var i = 0; i < rowdata.length; i++) {
+ $('#HDotCheckType' + (i + 1)).find("option[value='" + tableSub[i].鐐规绫诲瀷 + "']").attr("selected", true);
+ }
+ form.render('select');
}
})
}
@@ -839,7 +951,7 @@
- //#region 椤圭洰闃舵琛細鍒犻櫎鎸囧畾琛�
+ //#region 鍒犻櫎鎸囧畾琛�
function set_GridDelete(obj) {
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
@@ -854,7 +966,7 @@
option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);
for (var i = 0; i < oldData.length; i++) {
- $('#HCheckResult' + (i + 1)).find("option[value='" + oldData[i].HCheckResult + "']").attr("selected", true);
+ $('#HDotCheckType' + (i + 1)).find("option[value='" + oldData[i].HDotCheckType + "']").attr("selected", true);
}
form.render('select');
layer.close(index);
@@ -882,19 +994,19 @@
if ($("#HDate").val() == "") {
layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
return false;
- }
+ }
if ($("#HProcID").val() == "0") {
layer.msg("宸ュ簭涓嶈兘涓虹┖!");
return false;
}
-
+
//#region 瀛愯〃 鏁版嵁妫�楠�
-
+
for (var i = 0; i < option.data.length; i++) {
if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
- continue; // 璺宠繃闈炲璞￠」锛堝绌烘暟缁勶級
+ continue; // 璺宠繃闈炲璞￠」锛堝绌烘暟缁勶級
}
if (option.data[i]["HCheckNoteItemID"] == "0") {
@@ -906,7 +1018,7 @@
layer.msg("绗�" + i + "琛岋細纭鑰呰鑹叉湭閫夋嫨锛�");
return false;
}
-
+
}
//#endregion
@@ -933,10 +1045,9 @@
$("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
}
-
+
//宸ュ簭
- function GetProcessValue(obj)
- {
+ function GetProcessValue(obj) {
$("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
$("#HProcID").val(obj[0].HItemID);
}
@@ -949,7 +1060,7 @@
function GetGyPostValue(obj) {
OptionData = obj[0];
}
-
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
index d14befd..8be3475 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
@@ -292,9 +292,9 @@
</div>
</div>
</div>
- <!--椤圭洰闃舵琛細鍒犻櫎-->
+ <!--鍒犻櫎-->
<script type="text/html" id="barDemo">
- <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-xs" lay-event="edit">鏌ョ湅</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<!--琛屼笅鎷夐�夋嫨(缁撴灉)-->
@@ -302,6 +302,15 @@
<select name="HCheckResult" lay-filter="HCheckResult" id="HCheckResult{{d.LAY_TABLE_INDEX+1}}">
<option value="OK" selected>OK</option>
<option value="X">X</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(缁撴灉)-->
+ <script type="text/html" id="HDotCheckType">
+ <select name="HDotCheckType" lay-filter="HDotCheckType" id="HDotCheckType{{d.LAY_TABLE_INDEX+1}}">
+ <option value="璁惧" selected>璁惧</option>
+ <option value="妯″叿">妯″叿</option>
+ <option value="浣滀笟鎸囧涔�">浣滀笟鎸囧涔�</option>
+ <option value="妫�楠屾寚瀵间功">妫�楠屾寚瀵间功</option>
</select>
</script>
@@ -344,7 +353,7 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4 鎶ュ伐骞冲彴鎸夐挳璺宠浆
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+
//#endregion
@@ -367,7 +376,7 @@
//#endregion
-
+
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
@@ -377,7 +386,7 @@
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -394,19 +403,19 @@
//鍒濆鍖栧瓙琛�
get_InitGrid();
-
+
RoadBillMain(linterid);
//绂佺敤缁勭粐閫夐」
$('#HOrgID').attr("disabled", true);
}
- else if (OperationType==4) {
+ else if (OperationType == 4) {
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
@@ -504,7 +513,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HCheckNoteItemID": "0", "HCheckNoteItemName": "", "HCheckPostID": "0", "HCheckPostName": "", "HCheckResult": "","HRemark":"",
+ "HCheckNoteItemID": "0", "HCheckNoteItemName": "", "HCheckPostID": "0", "HCheckPostName": "", "HDotCheckType": "璁惧", "HRelationID": "0", "HRelationName": "", "HCheckResult": "", "HRemark": "",
"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
};
switch (obj.event) {
@@ -515,7 +524,9 @@
table.render(option);
for (var i = 1; i <= option.data.length; i++) {
$('#HCheckResult' + i + '').find("option[value='" + option.data[i - 1].HCheckResult + "']").attr("selected", true);
-
+ }
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDotCheckType' + i + '').find("option[value='" + option.data[i - 1].HDotCheckType + "']").attr("selected", true);
}
form.render('select');
break;
@@ -535,7 +546,9 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
for (var i = 1; i <= option.data.length; i++) {
$('#HCheckResult' + i + '').find("option[value='" + option.data[i - 1].HCheckResult + "']").attr("selected", true);
-
+ }
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HDotCheckType' + i + '').find("option[value='" + option.data[i - 1].HDotCheckType + "']").attr("selected", true);
}
form.render('select');
}
@@ -544,7 +557,7 @@
}
});
-
+
//#region 瀛愯〃锛氳鍐呬簨浠�
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
@@ -553,7 +566,7 @@
});
//#endregion
-
+
//#endregion
@@ -594,14 +607,17 @@
, totalRow: true
, cellMinWidth: 120
, height: 400
- ,limit:100
+ , limit: 100
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'HCheckNoteItemID', title: 'HCheckNoteItemID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HCheckNoteItemName', title: '妫�鏌ラ」鐩�', edit: 'text', event: "HCheckNoteItemID", style: 'background-color: #f9f9f9;' } //f7
- , { field: 'HCheckPostID', title: 'HCheckPostID', hide: true, style: 'background-color: #f9f9f9;'}
+ , { field: 'HCheckPostID', title: 'HCheckPostID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HCheckPostName', title: '纭鑰呰鑹�', edit: 'text', event: "HCheckPostID", style: 'background-color: #f9f9f9;' }
+ , { field: 'HDotCheckType', title: '鐐规绫诲瀷', templet: '#HDotCheckType' }
+ , { field: 'HRelationID', title: 'HRelationID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HRelationName', title: '缂栫爜', edit: 'text', event: "HRelationID" }
, { field: 'HCheckResult', title: '缁撴灉', templet: '#HCheckResult' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }
@@ -618,8 +634,11 @@
, "HCheckNoteItemName": ""
, "HCheckPostID": "0"
, "HCheckPostName": ""
+ , "HDotCheckType": "璁惧"
+ , "HRelationID": "0"
+ , "HRelationName": ""
, "HCheckResult": ""
- , "HRemark":""
+ , "HRemark": ""
, "HSourceInterID": "0"
, "HSourceEntryID": "0"
, "HSourceBillNo": ""
@@ -639,6 +658,17 @@
$.each(option.data, function (index, value) {
if (value.LAY_TABLE_INDEX == dataindex) {
value.HCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ form.on('select(HDotCheckType)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HDotCheckType = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
});
@@ -676,7 +706,7 @@
//#region 鐢熶骇璁㈠崟閫夋嫨椤甸潰
function get_checkSearchHICMO() {
-
+
//鎵撳紑鐢熶骇璁㈠崟灏忕獥浣�
layer.open({
type: 2
@@ -818,7 +848,7 @@
$("#HCheckEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HCheckEmpID").val(checkStatus.data[0].HItemID);
-
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -967,6 +997,71 @@
}
})
}
+ //绫诲瀷淇℃伅
+ if (obj.event == "HRelationID") {
+ if (obj.data.HDotCheckType == "璁惧") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁惧鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.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({
+ "HRelationID": checkStatus.data[0].hmainid,
+ "HRelationName": checkStatus.data[0].璁惧鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ }
+ })
+ } else if (obj.data.HDotCheckType == "妯″叿") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "妯″叿鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.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({
+ "HRelationID": checkStatus.data[0].hmainid,
+ "HRelationName": checkStatus.data[0].妯″叿鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ }
+ })
+ }
+
+ }
obj.event = "";
return false;
}
@@ -1091,14 +1186,23 @@
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < tableSub.length; i++) {
+ var relationName = "";
+ if (tableSub[i]["鐐规绫诲瀷"] == "璁惧") {
+ relationName = tableSub[i]["璁惧鍚嶇О"];
+ } else if (tableSub[i]["鐐规绫诲瀷"] == "妯″叿") {
+ relationName = tableSub[i]["妯″叿鍚嶇О"];
+ }
rowdata.push(
{
"HCheckNoteItemID": tableSub[i]["HCheckNoteItemID"],
"HCheckNoteItemName": tableSub[i]["妫�鏌ラ」鐩�"],
"HCheckPostID": tableSub[i]["HCheckPostID"],
"HCheckPostName": tableSub[i]["纭鑰呰鑹�"],
+ "HDotCheckType": tableSub[i]["鐐规绫诲瀷"],
+ "HRelationID": tableSub[i]["HRelationID"],
+ "HRelationName": relationName,
"HCheckResult": tableSub[i]["缁撴灉"],
- "HRemark": tableSub[i]["琛ㄤ綋澶囨敞"]
+ "HRemark": tableSub[i]["琛ㄤ綋澶囨敞"]
}
);
}
@@ -1107,8 +1211,10 @@
for (var i = 0; i < rowdata.length; i++) {
$('#HCheckResult' + (i + 1)).find("option[value='" + tableSub[i].缁撴灉 + "']").attr("selected", true);
}
+ for (var i = 0; i < rowdata.length; i++) {
+ $('#HDotCheckType' + (i + 1)).find("option[value='" + tableSub[i].鐐规绫诲瀷 + "']").attr("selected", true);
+ }
form.render('select');
- form.render('checkbox');
}
})
}
@@ -1133,10 +1239,29 @@
for (var i = 0; i < oldData.length; i++) {
$('#HCheckResult' + (i + 1)).find("option[value='" + oldData[i].HCheckResult + "']").attr("selected", true);
}
+ for (var i = 0; i < rowdata.length; i++) {
+ $('#HDotCheckType' + (i + 1)).find("option[value='" + oldData[i].鐐规绫诲瀷 + "']").attr("selected", true);
+ }
form.render('select');
layer.close(index);
}
});
+ }
+ if (obj.event === 'edit') {
+ var Type = obj.data.HDotCheckType;
+ var HInterId = obj.data.HRelationID
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏃ョ偣妫�娓呭崟'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Sc_WorkDotCheckBillList_Day.html?OperationType=' + Type + '&linterid=' + HInterId + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ }
+ })
}
}
//#endregion
@@ -1178,11 +1303,11 @@
}
//#region 瀛愯〃 鏁版嵁妫�楠�
-
+
for (var i = 0; i < option.data.length; i++) {
if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
- continue; // 璺宠繃闈炲璞￠」锛堝绌烘暟缁勶級
+ continue; // 璺宠繃闈炲璞￠」锛堝绌烘暟缁勶級
}
if (option.data[i]["HCheckNoteItemID"] == "0") {
@@ -1194,7 +1319,7 @@
layer.msg("绗�" + i + "琛岋細纭鑰呰鑹叉湭閫夋嫨锛�");
return false;
}
-
+
}
//#endregion
@@ -1211,14 +1336,14 @@
url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/锘縎c_WorkBeginDotCheckBillList",
type: "GET",
async: false,
- data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID, "SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
+ data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID, "SCOrder": SCOrder, "user": sessionStorage["HUserName"] },
success: function (result) {
var tableMain = result.data;
var tableSub = result.data;
//涓昏〃 璧嬪��
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-
+
"HICMOInterID": tableMain[0]["鐢熶骇涓诲唴鐮�"]
, "HICMOEntryID": tableMain[0]["鐢熶骇瀛愬唴鐮�"]
, "HICMOBillNo": tableMain[0]["鐢熶骇璁㈠崟鍙�"]
@@ -1238,20 +1363,32 @@
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < tableSub.length; i++) {
+ var relationName = "";
+ if (tableSub[i]["鐐规绫诲瀷"] == "璁惧") {
+ relationName = tableSub[i]["璁惧鍚嶇О"];
+ } else if (tableSub[i]["鐐规绫诲瀷"] == "妯″叿") {
+ relationName = tableSub[i]["妯″叿鍚嶇О"];
+ }
rowdata.push(
{
"HCheckNoteItemID": tableSub[i]["妫�鏌ラ」鐩甀D"],
"HCheckNoteItemName": tableSub[i]["妫�鏌ラ」鐩�"],
"HCheckPostID": tableSub[i]["纭鑰呰鑹睮D"],
"HCheckPostName": tableSub[i]["纭鑰呰鑹�"],
+ "HDotCheckType": tableSub[i]["鐐规绫诲瀷"],
+ "HRelationID": tableSub[i]["HRelationID"],
+ "HRelationName": relationName,
"HCheckResult": "",
- "HRemark":""
+ "HRemark": ""
}
);
}
option.data = rowdata;
table.render(option);
-
+ for (var i = 0; i < rowdata.length; i++) {
+ $('#HDotCheckType' + (i + 1)).find("option[value='" + tableSub[i].鐐规绫诲瀷 + "']").attr("selected", true);
+ }
+ form.render('select');
}
})
}
@@ -1286,8 +1423,7 @@
}
//鐝粍闀�
- function GetHManagerValue(obj)
- {
+ function GetHManagerValue(obj) {
$("#HGroupLeaderName").val(obj[0].鑱屽憳鍚嶇О);
$("#HGroupLeaderID").val(obj[0].HItemID);
}
@@ -1300,7 +1436,7 @@
function GetGyPostValue(obj) {
OptionData = obj[0];
}
-
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkDotCheckBillList_Day.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkDotCheckBillList_Day.html"
new file mode 100644
index 0000000..dc9bd5f
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkDotCheckBillList_Day.html"
@@ -0,0 +1,366 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鏃ョ偣妫�娓呭崟</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <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">
+ <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 src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], 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
+
+ var option = [];
+ var sWhere = "";
+ var HModName = "Sc_WorkDotCheckBillList_Day";
+
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HInterID", "HEntryID"];
+ //#endregion
+
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4 鎶ュ伐骞冲彴鎸夐挳璺宠浆
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var TypeName = decodeURI(OperationType);//寮傚父鍙嶉绫诲瀷
+ var HInterID = decodeURI(linterid);//鐢熶骇璧勬簮鍚嶇О
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ 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;
+ }
+ });
+ })
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鏌ヨ
+ get_FastQuery();
+
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , totalRow: true
+ //, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var Type = TypeName; //绫诲瀷
+ var HInterId = HInterID; //涓诲唴鐮�
+ sWhere={
+ Type: Type
+ , HInterId: HInterId
+ }
+
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/get锘縎c_WorkDotCheckList_Day',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HInterID", "HEntryID", "HBillStatus", "HICMOInterID", "HICMOEntryID", "HProcExchInterID", "HProcExchEntryID", "HMaterID", "HSourceID", "HCheckEmpID", "HGroupID", "HGroupLeaderID", "HCheckNoteItemID", "HCheckPostID"];
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#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 addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and HBillStatus=2 ";
+ $("#HOrgID").val(HOrgID);
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
+
+
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
index c8578f8..d10f51a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
@@ -328,7 +328,7 @@
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -355,7 +355,7 @@
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
--
Gitblit v1.9.1