From a27ef2edec1521789e6c4cea21733b5a57942edf Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 08 七月 2024 13:49:25 +0800
Subject: [PATCH] 生产订单和流转卡履历
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 22 ++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/生产管理/生产任务单/Sc_ICMOBillOrProcessExchangeResumeList.html | 521 ++++++++++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 23 ++
WebTM/WebTM.csproj | 1
5 files changed, 568 insertions(+), 3 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7413ac8..150fd0e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -383,6 +383,7 @@
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillResumeList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillDay.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 3ed324e..8069ad2 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,8 +8,8 @@
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost:8082/API/"; *//*//寮犵憺骞挎湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 17ea3da..a02478e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -263,6 +263,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="Exits"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_pl" id="ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Resume" id="set_Resume"><i class="layui-icon layui-icon-form"></i>灞ュ巻鏌ヨ</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></i>澶氳涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICMOChangeBill" id="btn-PushICMOChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璁㈠崟鍙樻洿鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductReportBill" id="btn-PushProductReportBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇姹囨姤鍗�)</button>
@@ -412,6 +413,9 @@
break;
//澶氳涓嬫帹
case 'set_ShowBill_dh': set_ShowBill_dh();
+ break;
+ //灞ュ巻鏌ヨ
+ case 'set_Resume': set_Resume();
break;
//涓嬫帹(鐢熶骇璁㈠崟鍙樻洿鍗�)
case 'btn-PushICMOChangeBill': set_PushICMOChangeBill();
@@ -1165,7 +1169,24 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
}
}
-
+ //灞ュ巻鏌ヨ
+ function set_Resume() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐢熶骇璁㈠崟-灞ュ巻'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇浠诲姟鍗�/Sc_ICMOBillOrProcessExchangeResumeList.html?OperationType=1&HInterID=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=3710'
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+ }
+ }
//澶氳鎵归噺涓嬫帹鍗曟嵁
function set_ShowBill_dh() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillOrProcessExchangeResumeList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillOrProcessExchangeResumeList.html"
new file mode 100644
index 0000000..8ab7e38
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillOrProcessExchangeResumeList.html"
@@ -0,0 +1,521 @@
+锘�<!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/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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+
+ .layui-body {
+ overflow-y: scroll;
+ }
+ </style>
+</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 class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSendMan" id="HSendMan" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鐘舵��</label>
+ <div class="layui-input-block">
+ <select id="HBillStatus" name="HBillStatus" class="ForFilteringSchemes" lay-filter="HBillStatus" style="width:190px;">
+ <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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div class="layui-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><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>
+ </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
+ , util = layui.util
+ , soulTable = layui.soulTable
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var titleData = ["HInterID", "HBillType"];
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var HInterID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HEntryID = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁瀛愬唴鐮�
+ var HSouceBillType = params[params[3]];//浠庡弬鏁颁腑鑾峰彇鏄敓浜ц鍗曡繕鏄祦杞崱
+ //#endregion
+ var HModName = "Sc_ICMOBillOrProcessExchangeResumeList";
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒锋柊
+ case 'get_Refresh': set_Refresh();
+ break;
+ //閫�鍑�
+ case 'get_Exit': Pub_Close(1);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , page: true
+ , cellMinWidth: 120
+ , height: 'full-50'
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/GetProcessBillOrICMOBillResumeList',
+ type: "GET",
+ async: false,
+ data: { "HInterID": HInterID, "HEntryID": HEntryID, "sWhere": sWhere, "type": HSouceBillType, "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', totalRowText: '鍚堣琛�' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ 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: 120 });
+ 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: 120 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ table.render(option);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ DisPlay_HideColumn();
+ }
+
+
+ //#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", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ 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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ 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 鐐瑰嚮琛岄�変腑楂樹寒
+ 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 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //鍒锋柊
+ function set_Refresh() {
+ $("#btnSearch").click();
+ }
+
+ function get_FastQuery() {
+ var HSendMan = $("#HSendMan").val();//鍒跺崟浜�
+ var HBillStatus = $("#HBillStatus").val();//鍗曟嵁鐘舵��
+ if (HSendMan) {
+ sWhere += " and 鍒跺崟浜� like '%" + HSendMan + "%'";
+ }
+ if (HBillStatus) {
+ switch (HBillStatus) {
+ case '鍏ㄩ儴': //鍏ㄩ儴
+ sWhere += "";
+ break;
+ case '鍒涘缓':
+ sWhere += " and 鍗曟嵁鐘舵�� ='鍒涘缓'";
+ break;
+ case '宸插鏍�':
+ sWhere += " and 鍗曟嵁鐘舵�� ='宸插鏍�'";
+ break;
+ case '鑷姩鍏抽棴':
+ sWhere += " and 鍗曟嵁鐘舵�� ='鑷姩鍏抽棴'";
+ break;
+ case '鎵嬪姩鍏抽棴':
+ sWhere += " and 鍗曟嵁鐘舵�� ='鎵嬪姩鍏抽棴'";
+ break;
+ case '宸蹭綔搴�':
+ sWhere += " and 鍗曟嵁鐘舵�� ='宸蹭綔搴�'";
+ break;
+ case '鍏跺畠鐘舵��':
+ sWhere += " and 鍗曟嵁鐘舵�� ='鍏跺畠鐘舵��'";
+ break;
+ default:
+ }
+ }
+ //浠绘剰瀛楁杩囨护
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HSendMan").val("");
+ $('#HBillStatus').val("鍏ㄩ儴");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //#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
+
+
+
+
+ });
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 78cbaa4..0503ded 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -239,6 +239,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_Copy" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_Copy_pl" lay-event="set_Copy_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_cf" lay-event="set_cf"><i class="layui-icon layui-icon-form"></i>鎷嗗垎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Resume" id="set_Resume"><i class="layui-icon layui-icon-form"></i>灞ュ巻鏌ヨ</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_LookDown_StationIn" lay-event="get_LookDown_StationIn"><i class="layui-icon layui-icon-form"></i>涓嬫煡(宸ュ簭杩涚珯鎺ユ敹鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_LookDown_StationOut" lay-event="get_LookDown_StationOut"><i class="layui-icon layui-icon-form"></i>涓嬫煡(宸ュ簭鍑虹珯姹囨姤鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_LookDown" lay-event="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡</button>
@@ -384,6 +385,9 @@
break;
//澶嶅埗
case 'set_Copy': set_Copy();
+ break;
+ //灞ュ巻鏌ヨ
+ case 'set_Resume': set_Resume();
break;
//鎵归噺澶嶅埗
case 'set_Copy_pl': set_Copy_pl();
@@ -1102,6 +1106,24 @@
}
//#endregion
+ //灞ュ巻鏌ヨ
+ function set_Resume() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '娴佽浆鍗�-灞ュ巻'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillOrProcessExchangeResumeList.html?OperationType=1&HInterID=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=3772'
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+ }
+ }
//鍒濆鍖栦富琛ㄥ垪琛�
function set_InitGrid() {
option = {
--
Gitblit v1.9.1