From c3a4b9f7e3087df4feb897042e563b8d402497fc Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 30 十二月 2024 09:25:45 +0800
Subject: [PATCH] 首巡末增加导出功能,修复出站单无法选着班次问题,报工台操作按钮动态化
---
WebTM/WebTM.csproj.user | 2
WebTM/views/生产管理/报工平台功能页/LineBind_Button.html | 191 +++++++++++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 28 +
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBillList.html | 18
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckOtherBillList.html | 14
WebTM/views/IpadIndex.html | 203 +++++++++++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList2.html | 15
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBillList.html | 17
/dev/null | 47 --
WebTM/views/生产管理/报工平台功能页/Gy_ButtonList.html | 365 ++++++++++++++++++++++
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList2.html | 11
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 14
WebTM/WebTM.csproj | 4
13 files changed, 849 insertions(+), 80 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d91cb25..cc2291b 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -104,8 +104,6 @@
<Content Include="layuiadmin\ext\tableFilter.js" />
<Content Include="layuiadmin\ext\tableMerge.js" />
<Content Include="layuiadmin\grwebapp.js" />
- <Content Include="layuiadmin\resize\ResizeUpDow.css" />
- <Content Include="layuiadmin\resize\ResizeUpDow.js" />
<Content Include="layuiadmin\resize\ResizeLeftRight.css" />
<Content Include="layuiadmin\resize\ResizeLeftRight.js" />
<Content Include="layuiadmin\QueryScheme.js" />
@@ -526,6 +524,8 @@
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillResumeList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬Gy_ButtonList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind_Button.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_ProductionInProgressReport.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8233a56..8f1260e 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/resize/ResizeUpDow.css b/WebTM/layuiadmin/resize/ResizeUpDow.css
deleted file mode 100644
index 7177309..0000000
--- a/WebTM/layuiadmin/resize/ResizeUpDow.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.box {
- width: 100%;
- height: 600px; /* 设置父容器的初始高度 */
- display: flex;
- flex-direction: column;
-}
-
-/* 上面部分 */
-.top {
- background-color: #36cfc9;
- overflow: auto;
- flex-grow: 1;
-}
-
-/* 分割条 */
-.resize {
- cursor: ns-resize;
- height: 5px;
- background-color: yellow;
- width: 100%;
-}
-
-/* 底部部分 */
-.bottom {
- background-color: #b7eb8f;
- overflow: auto;
- flex-grow: 1;
-}
-
-/* 标签内容部分 */
-.layui-tab-card {
- margin-top: 40px;
-}
diff --git a/WebTM/layuiadmin/resize/ResizeUpDow.js b/WebTM/layuiadmin/resize/ResizeUpDow.js
deleted file mode 100644
index 4ac262f..0000000
--- a/WebTM/layuiadmin/resize/ResizeUpDow.js
+++ /dev/null
@@ -1,47 +0,0 @@
-锘�(function () {
- // 鑾峰彇鐩稿叧DOM鍏冪礌
- let resize = document.getElementById('resize');
- let top = document.getElementById('top');
- let bottom = document.getElementById('bottom');
- let box = document.getElementById('box');
-
- // 榧犳爣鎸変笅浜嬩欢
- resize.onmousedown = function (e) {
- let startY = e.clientY;
-
- // 璁板綍璧峰楂樺害
- let startTopHeight = top.offsetHeight;
- let startBottomHeight = bottom.offsetHeight;
-
- document.onmousemove = function (e) {
- let endY = e.clientY;
- let moveLen = startTopHeight + (endY - startY); // 璁＄畻鏂扮殑椤堕儴楂樺害
-
- // 鑾峰彇瀹瑰櫒鐨勬渶澶ч珮搴︼紙鎺掗櫎鎷栨嫿鏉＄殑楂樺害锛�
- let maxHeight = box.clientHeight - resize.offsetHeight;
-
- // 闄愬埗涓婃柟鍖哄煙鏈�灏忛珮搴�
- if (moveLen < 30) moveLen = 30;
-
- // 闄愬埗涓婃柟鍖哄煙鏈�澶ч珮搴�
- if (moveLen > maxHeight - 100) moveLen = maxHeight - 100;
-
- // 璁剧疆涓婃柟鍖哄煙鐨勯珮搴�
- top.style.height = moveLen + 'px';
-
- // 璁剧疆涓嬫柟鍖哄煙鐨勯珮搴�
- bottom.style.height = (maxHeight - moveLen) + 'px';
- };
-
- document.onmouseup = function () {
- document.onmousemove = null;
- document.onmouseup = null;
- resize.releaseCapture && resize.releaseCapture(); // 閲婃斁榧犳爣鎹曡幏
- };
-
- // 璁剧疆榧犳爣鎹曡幏
- resize.setCapture && resize.setCapture();
-
- return false; // 闃绘榛樿浜嬩欢
- };
-})();
\ No newline at end of file
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 08080c2..bfb7897 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -72,6 +72,7 @@
})
TSLoad();
+ fetchButtonsData();
});
function TSLoad() {
$("#topleft").html("");
@@ -162,7 +163,7 @@
html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,1)"></span>';
html1 += '</div>';
html1 += '</div>';
- $("#topleft").append(html1);
+ $("#topleft").append(html1);
}
},
error: function (err) {
@@ -173,6 +174,187 @@
}
var HManagerID = 0;
var HGroupID = 0;
+
+ //鍔犺浇褰撳墠鐢ㄦ埛鎸夐挳
+ function fetchButtonsData() {
+ $.ajax({
+ url: GetWEBURL() + '/ReportPlatForm/getButtonlist',
+ type: "GET",
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data && data1.data.length > 0) {
+ // 娓呯┖鐜版湁鍐呭
+ $("#button-container").empty();
+ var colClass = ''; // 鍔ㄦ�佽缃垪鐨勬牱寮�
+ let largestColClass = 'layui-col-md4'; // 榛樿鏂板鎸夐挳澶у皬锛堝亣璁炬渶澶氭槸 3 涓寜閽竴鎺掞級
+
+ // 閬嶅巻姣忎釜鎸夐挳鏁版嵁骞剁敓鎴愬搴旂殑 HTML
+ data1.data.forEach(function (buttonData, index) {
+ // 鏍规嵁 defaultSize 瀛楁閫夋嫨鍚堥�傜殑鍒楀
+ switch (buttonData.鎸夐挳澶у皬) {
+ case '灏�':
+ colClass = 'layui-col-md3'; // 涓�鎺�4涓�
+ break;
+ case '涓�':
+ colClass = 'layui-col-md4'; // 涓�鎺�3涓�
+ break;
+ case '澶�':
+ colClass = 'layui-col-md6'; // 涓�鎺�2涓�
+ break;
+ default:
+ colClass = 'layui-col-md4'; // 榛樿璁剧疆涓轰腑绛夊ぇ灏忥紙3涓竴鎺掞級
+ }
+
+ // 鏇存柊鏈�澶у垪瀹斤細鍙栨渶澶у垪瀹�
+ if (colClass === 'layui-col-md6') {
+ largestColClass = colClass; // 濡傛灉褰撳墠鍒楀鏄� 'layui-col-md6'锛岃鏄庢槸鏈�瀹界殑
+ } else if (colClass === 'layui-col-md4' && largestColClass !== 'layui-col-md6') {
+ largestColClass = colClass; // 榛樿鍒楀涓� 'layui-col-md4'锛屽皬浜� 'layui-col-md6'
+ } else if (colClass === 'layui-col-md3' && largestColClass === 'layui-col-md4') {
+ largestColClass = colClass; // 濡傛灉褰撳墠鍒楀鏄� 'layui-col-md3'锛屽皬浜� 'layui-col-md4'
+ }
+
+ var html = '';
+ html += '<div class="' + colClass + '" id="btn' + index + '">';
+ html += ' <div class="cnt bottomright" id="button' + index + '" onclick="' + buttonData.浜嬩欢鍚嶇О + '(event, this)">';
+ html += ' <span class="layui-icon ' + buttonData.鍥炬爣 + ' imgicon"></span>';
+ html += ' <span class="imgtitle">' + buttonData.鍚嶇О + '</span>';
+ html += ' </div>';
+ html += ' <span class="layui-icon layui-icon-delete delete" onclick="deleteButton(event, \'' + buttonData.HItemID + '\')"></span>'; // 淇敼鍒犻櫎鎸夐挳浜嬩欢锛屼紶閫� id1 鍜� id2
+ html += '</div>';
+ // 灏嗙敓鎴愮殑 HTML 杩藉姞鍒� #button-container
+ $("#button-container").append(html);
+ });
+
+ // 娣诲姞涓�涓柊澧炴寜閽�
+ var html1 = '';
+ html1 += '<div class="layui-col-sm12 ' + largestColClass + '">';
+ html1 += ' <div class="cnt bottomright">';
+ html1 += ' <span class="layui-icon layui-icon-addition imgtitle" onclick="Add_Buttton(event,this,1)"></span>';
+ html1 += ' </div>';
+ html1 += '</div>';
+
+ $("#button-container").append(html1);
+ } else {
+ // 濡傛灉娌℃湁鎸夐挳鏁版嵁锛屽睍绀洪粯璁ょ殑绌虹櫧鏂板鎸夐挳
+ var html1 = '';
+ html1 += '<div class="layui-col-sm12 layui-col-md4">';
+ html1 += ' <div class="cnt bottomright">';
+ html1 += ' <span class="layui-icon layui-icon-addition imgtitle" onclick="Add_Buttton(event,this,1)"></span>';
+ html1 += ' </div>';
+ html1 += '</div>';
+ $("#button-container").append(html1);
+ }
+ },
+ error: function (error) {
+ console.log('鑾峰彇鎸夐挳鏁版嵁澶辫触', error);
+ }
+ });
+ }
+
+ // 鍒犻櫎鎸夐挳鐨勪簨浠跺鐞嗗嚱鏁�
+ function deleteButton(event, HItemID) {
+ event.stopPropagation(); // 闃叉浜嬩欢鍐掓场锛岄伩鍏嶈Е鍙戞寜閽殑鐐瑰嚮浜嬩欢
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ url: GetWEBURL() + "/ReportPlatForm/DeleteButtonlist",
+ type: "GET",
+ data: { "HItemID": HItemID },
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data) {
+ if (data.count > 0) {
+ fetchButtonsData(); //鎵ц鏌ヨ杩囩▼
+ layer.close(index);
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 });
+ return false;
+ }
+ else {
+ layer.alert(data.Message, { time: 1 * 2000, icon: 5 });
+ return false;
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
+ return false;
+ }
+ });
+ })
+ }
+
+ //娣诲姞鎸夐挳
+ function Add_Buttton(event, obj, i) {
+ event.stopPropagation(); //闃绘鍐掓场
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2 //姝ゅ浠frame涓句緥
+ , title: '鎸夐挳缁戝畾'
+ , area: ['90%', '90%']
+ , shadeClose: false //寮�鍚伄缃╁叧闂�
+ , shade: 0.5
+ , maxmin: true
+ , content: ['鐢熶骇绠＄悊/鎶ュ伐骞冲彴鍔熻兘椤�/LineBind_Button.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero, e) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var body = layer.getChildFrame('body', index); //寰楀埌iframe椤电殑body鍐呭
+
+ var HUserName = sessionStorage["HUserName"];
+ var HButtonID = body.find("#HButtonID").val();
+ var HButtonName = body.find("#HName").val();
+ var HButtonSize = body.find("#HButtonSize").val();
+ var HButtonOrder = body.find("#HButtonOrder").val();
+ $.ajax(
+ {
+ url: GetWEBURL() + "/ReportPlatForm/AddButtonlist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ dataType: "json",
+ type: "Get",
+ async: false,
+ data: {
+ "HUserName": HUserName,
+ "HButtonID": HButtonID,
+ "HButtonName": HButtonName,
+ "HButtonSize": HButtonSize,
+ "HButtonOrder": HButtonOrder
+
+ },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ fetchButtonsData(); //鎵ц鏌ヨ杩囩▼
+ layer.close(index);
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 });
+ return false;
+ }
+ else {
+ layer.close(index);
+ layer.alert(data.Message, { icon: 5 });
+ return false;
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
+ return false;
+ }
+ });
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+
+ , zIndex: layer.zIndex //閲嶇偣1
+ , success: function (layero, index) {
+
+ }
+ , end: function () {
+
+ }
+ });
+
+ }
+
//閫変腑璧勬簮
function Check(obj, i) {
wktag = 0;
@@ -428,9 +610,8 @@
}
});
-
- }
-
+ }
+
//鍒犻櫎璧勬簮
function Delete(event, obj, i) {
event.stopPropagation(); //闃绘鍐掓场
@@ -580,10 +761,6 @@
//闈炵┖楠岃瘉
function AllowLoadData(body) { //闈炵┖楠岃瘉
var Result = true;
- //if (body.find("#HUserName").val() == '' || body.find("#HUserName").val() == null) {
- // layer.msg("鐢ㄦ埛鍚嶄笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return Result = false;
- //}
if (body.find("#HSourceID").val() == '' || body.find("#HSourceID").val() == null) {
layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -1487,8 +1664,8 @@
<div class="layui-col-sm12 layui-col-md4">
<fieldset style="border: 1px solid #eee;box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%);">
<legend style="color: #5FB878">鎿嶄綔鍙�</legend>
- <div class="content4">
- <div class="layui-row layui-col-space10">
+ <div class="content4" >
+ <!--<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md4" onclick="OpenWork(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-play imgicon"></span>
@@ -1635,9 +1812,11 @@
<span class="layui-icon layui-icon-layer imgicon"></span>
<span class="imgtitle">寮傚父楠屾敹</span>
</div>
- </div>
- </div>
+ </div>
+ </div>-->
+ <div class="layui-row layui-col-space10" id="button-container">
+ </div>
</div>
</fieldset>
</div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260\345\212\237\350\203\275\351\241\265/Gy_ButtonList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260\345\212\237\350\203\275\351\241\265/Gy_ButtonList.html"
new file mode 100644
index 0000000..47cc7a8
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260\345\212\237\350\203\275\351\241\265/Gy_ButtonList.html"
@@ -0,0 +1,365 @@
+锘�<!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>
+
+</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">
+ <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>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ 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 sWhere = "";
+ var option = [];
+ var HModName = "Gy_ButtonList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ var Htype = "";
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ Htype = "";// 绫诲瀷
+ } else {
+ Htype = params[params[0]];//绫诲瀷
+ }
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ get_Display();
+ }
+ //#endregion
+
+
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 20000]
+ , limit: 50
+ , cellMinWidth: 90
+ };
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display() {
+ if (Htype == 1) {
+ sWhere += " and HStopflag = 0";
+ }
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/ReportPlatForm/GetGy_BGButtons',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ 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 ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, 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: false, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 20000]
+ , limit: 50
+ , cellMinWidth: 90
+ , totalRow: true
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ }
+ ins = table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ } 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]["field"] + ",";
+ }
+ 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_New.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) {
+ titleData = [];
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ 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;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ 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;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ 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
+
+
+ function get_UrlVars() {
+ 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;
+ }
+
+ //#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);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260\345\212\237\350\203\275\351\241\265/LineBind_Button.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260\345\212\237\350\203\275\351\241\265/LineBind_Button.html"
new file mode 100644
index 0000000..c5434bd
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260\345\212\237\350\203\275\351\241\265/LineBind_Button.html"
@@ -0,0 +1,191 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta 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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ .maintitle {
+ background-color: #1492ff;
+ color: #fff;
+ padding: 5px 10px;
+ border: none;
+ border-radius: 4px;
+ }
+
+ .title {
+ border-left: 4px solid #1492ff;
+ padding-left: 6px;
+ margin: 20px 10px 4px;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .buttom_box_little {
+ width: 60px;
+ height: 36px;
+ color: #fff;
+ background-color: #1492ff;
+ border-radius: 4px;
+ border: none;
+ margin: 10px;
+ }
+
+ .layui-input {
+ width: 93%;
+ }
+
+ .layui-inline, img {
+ display: block;
+ vertical-align: middle
+ }
+
+ .layui-input, .layui-textarea {
+ display: inline-block;
+ width: 100%;
+ padding-left: 10px;
+ }
+
+ .laydate-time-list ol {
+ overflow-x: hidden !important;
+ overflow-y: auto !important;
+ }
+
+ .layui-form-label {
+ padding: 9px 5px;
+ }
+
+ .layui-input-block {
+ margin-left: 85px;
+ min-height: 36px;
+ }
+ </style>
+</head>
+<body>
+
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <h1 style="text-align:center;"><b>鎸夐挳缁戝畾</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鐢ㄦ埛鍚�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HUserName" id="HUserName" class="layui-input" style="background-color:#efefef4d;width:83%;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎸夐挳:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HName" id="HName" class="layui-input" placeholder="鐢ㄦ埛缁戝畾鎸夐挳" style="width:80%;">
+ <input type="hidden" name="HButtonID" id="HButtonID" value="0" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HButton" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎸夐挳澶у皬:</label>
+ <div class="layui-input-block" style="width:78.5%;">
+ <select name="HButtonSize" id="HButtonSize" lay-filter="HButtonSize" >
+ <option value="灏�">灏�</option>
+ <option value="涓�" selected="selected">涓�</option>
+ <option value="澶�">澶�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎸夐挳鎺掑簭:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HButtonOrder" id="HButtonOrder" class="layui-input" value="0" style="width:83%;" placeholder="璇疯緭鍏ユ寜閽湪椤甸潰鏄鍑犱釜鏄剧ず">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ //鍒濆鍖栨暟鎹�
+ $("#HUserName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ //琛ㄥご淇℃伅鐢熶骇璧勬簮寮圭獥
+ form.on('submit(HButton)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎸夐挳鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鐢熶骇绠＄悊/鎶ュ伐骞冲彴鍔熻兘椤�/Gy_ButtonList.html?Htype=1', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HName").val(checkStatus.data[0].鎸夐挳鍚嶇О);
+ $("#HButtonID").val(checkStatus.data[0].鎸夐挳id);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
index f51352c..531a246 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
@@ -213,6 +213,7 @@
<div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
@@ -255,6 +256,7 @@
var option = [];
var sWhere = "";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var page = 1;//鍒嗛〉鏁版嵁
var size = 50;
var HModName = "QC_PatrolProcCheckOtherBillList";
@@ -298,6 +300,9 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
case 'btn-getCheckData':
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
@@ -624,6 +629,7 @@
}
};
table.render(option);
+ ins = table.render(option);
//鍒濆鍖栬〃鏍�
DisPlay_HideColumn();
layer.close(ajaxLoad);
@@ -701,6 +707,7 @@
option.data = data1.data;
option.totalRow = true;
laypage.render(optionPage);
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -876,6 +883,13 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+
//鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
index 9658b2e..e96d123 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
@@ -224,6 +224,7 @@
<div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -266,6 +267,7 @@
var option = [];
var sWhere = "";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var page = 1;//鍒嗛〉鏁版嵁
var size = 50;
var HModName = "QC_ProcessCheckBillList";
@@ -308,6 +310,9 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
//鏂板
case 'set_AddNew': set_AddNew();
break;
@@ -609,6 +614,7 @@
//鍒濆鍖栬〃鏍�
DisPlay_HideColumn();
table.render(option);
+ ins = table.render(option);
ColFilter();
@@ -681,6 +687,7 @@
option.data = data1.data;
option.totalRow = true;
laypage.render(optionPage);
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -858,6 +865,14 @@
}
//#endregion
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+
//#region 鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
index e428ef9..26522df 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
@@ -164,6 +164,7 @@
<div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
@@ -206,6 +207,7 @@
var option = [];
var sWhere = "";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var page = 1;//鍒嗛〉鏁版嵁
var size = 50;
var HModName = "QC_FirstPieceCheckBillList";
@@ -249,6 +251,9 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
case 'btn-getCheckData':
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
@@ -621,6 +626,7 @@
option.data = data1.data;
option.totalRow = true;
laypage.render(optionPage);
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -742,6 +748,11 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
//#region 鑾峰彇椤圭洰鍙�
function Get_HProject() {
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_WorkBeginDotCheckListBillList.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_WorkBeginDotCheckListBillList.html"
index 53c6bee..c0bd672 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_WorkBeginDotCheckListBillList.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_WorkBeginDotCheckListBillList.html"
@@ -168,6 +168,7 @@
<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_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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_Copy" id="set_Copy"><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>
@@ -210,7 +211,7 @@
var option = [];
var sWhere = "";
var HModName = "Sc_WorkBeginDotCheckBillList";
-
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HSourceID", "HProcID", "HCheckNoteItemID","HCheckPostID"];
//#endregion
@@ -250,6 +251,9 @@
break;
//瀵煎叆
case 'set_SouceExcel': set_SouceExcel();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
break;
//澶嶅埗
case 'set_Copy': set_Copy();
@@ -485,7 +489,7 @@
option.cols = [col];
option.data = data1.data;
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -634,6 +638,7 @@
sWhere = "";
}
//#endregion
+
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
@@ -651,6 +656,7 @@
$("#HInitTimeCycle").val("29"); //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29 锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
}
//#endregion
+
//#region 鏂板
function set_AddNew() {
layer.open({
@@ -874,7 +880,13 @@
}
//#endregion
-
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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_WorkBeginDotCheckBillList.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_WorkBeginDotCheckBillList.html"
index 94eff8f..715557e 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_WorkBeginDotCheckBillList.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_WorkBeginDotCheckBillList.html"
@@ -166,6 +166,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="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></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>
@@ -179,7 +180,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></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="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
</form>
@@ -208,7 +209,7 @@
var option = [];
var sWhere = "";
var HModName = "Sc_WorkBeginDotCheckBillList";
-
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HInterID", "HEntryID", "HBillStatus", "HICMOInterID", "HICMOEntryID", "HProcExchInterID", "HProcExchEntryID", "HMaterID", "HSourceID", "HCheckEmpID", "HGroupID", "HGroupLeaderID", "HCheckNoteItemID","HCheckPostID"];
//#endregion
@@ -240,6 +241,9 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
//鏂板
case 'set_AddNew': set_AddNew();
break;
@@ -479,7 +483,7 @@
option.cols = [col];
option.data = data1.data;
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -717,6 +721,13 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+
//#region 鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index a5713d6..81ee0fd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -686,6 +686,7 @@
var HModName = "Cj_StationOutBill";
var FirstEndHProcNo = 0; // 榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
var ref = /^[0-9]+\.?[0-9]*$/;
+ var HDeptID = "";
//杩涘叆椤甸潰鍏ュ簱鎸夐挳缃伆
//$('#btn-InStorage').addClass("layui-btn-disabled").attr("disabled", true);
@@ -812,7 +813,9 @@
$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
$('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//淇敼鎸夐挳绂佺敤
GetDefValByUser();
- get_HWorkShift();
+ HDeptID = sessionStorage["HDeptID"];
+ //鑾峰彇鐝
+ get_HWorkShift(HDeptID);
}
else if (OperationType == 3) {
$("#eventType").val("Modify");
@@ -1132,6 +1135,8 @@
"HProcPlanEntryID": data.hsubid,
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID,
"HPRDOrgID": data.缁勭粐
});
//$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
@@ -1140,10 +1145,12 @@
var HProcExchHinteID = $('#HProcExchHinteID').val();
var HInterID = data.hmainid;
+ HDeptID = data.HWorkShopID;
//鑷姩鍖归厤娴佹按鍙�
$.ajax({
url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
type: "GET",
+ async: false,
data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
success: function (data1) {
if (data1.count == 1) {
@@ -1197,8 +1204,10 @@
table.render(option)
getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
- //鑾峰彇鐝
- get_HWorkShift();
+ if (OperationType!=4) {
+ //鑾峰彇鐝
+ get_HWorkShift(HDeptID);
+ }
break;
}
//layer.close(index);
@@ -1297,6 +1306,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
type: "GET",
+ async: false,
data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
success: function (result) {
if (result.count == 1) {
@@ -1317,8 +1327,10 @@
}
$("#HProcNo").attr("readonly", "readonly");
$("#HProcNo").css("background-color", "#efefef4d");
- //鑾峰彇鐝
- get_HWorkShift();
+ if (OperationType != 4) {
+ //鑾峰彇鐝
+ get_HWorkShift(HDeptID);
+ }
layer.close(index);
}
@@ -1781,7 +1793,10 @@
}
$("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
$("#HCenterID").val(checkStatus.data[0].HItemID);
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //鑾峰彇褰撳墠鐝
+ get_HWorkShift(HDeptID);
}
, cancel: function (index, layero) {
}
@@ -2213,8 +2228,7 @@
}
//鑾峰彇鐝
- function get_HWorkShift() {
- var HDeptID = sessionStorage["HDeptID"];
+ function get_HWorkShift(HDeptID) {
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index 2ddcf2e..87b0338 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -311,7 +311,7 @@
<div class="layui-input-block" style="margin-left: 9px;">
<input type="text" class="layui-input" name="HShiftsName" value="" lay-verify="HShiftsName" id="HShiftsName" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
<input type="hidden" name="HShiftsID" id="HShiftsID" lay-verify="HShiftsID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkShiftLists" id="HWorkShiftLists" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkShiftList" id="HWorkShiftList" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -428,6 +428,7 @@
, soulTable = layui.soulTable
var sWhere = "";
var options = [];
+ var HDeptID = "";
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -785,6 +786,8 @@
$("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //鑾峰彇褰撳墠鐝
+ get_HWorkShift(HDeptID);
}
, btn2: function (index, layero) { }
})
@@ -906,6 +909,7 @@
function set_ClearBill() {
get_CriticalPartsList();
$("#HPRDOrgID").val(sessionStorage["OrganizationID"]);
+ HDeptID = sessionStorage["HDeptID"];
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$('#Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳绂佺敤
//get_Display();
@@ -916,7 +920,7 @@
//鏌ヨ
get_FastQuery();
//鑾峰彇褰撳墠鐝
- get_HWorkShift();
+ get_HWorkShift(HDeptID);
}
//鑾峰彇鏈�澶у崟鎹彿
@@ -1183,7 +1187,8 @@
$("#HBarCode").val(HBarCode);
getHModel(data1.data[0]["hmainid"], data1.data[0]["hsubid"], data1.data[0]["鍗曟嵁鍙�"]);
//鑾峰彇褰撳墠鐝
- get_HWorkShift();
+ HDeptID = data1.data[0]["HWorkShopID"];
+ get_HWorkShift(HDeptID);
}
else {
layer.close(indexs);
@@ -1407,8 +1412,7 @@
}
//鑾峰彇鐝
- function get_HWorkShift() {
- var HDeptID = sessionStorage["HDeptID"];
+ function get_HWorkShift(HDeptID) {
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
--
Gitblit v1.9.1