From 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 一月 2025 10:06:37 +0800
Subject: [PATCH] 增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序
---
WebTM/WebTM.csproj.user | 2
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 2
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMainList.html | 34 +-
WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html | 47 +-
WebTM/views/基础资料/公用基础资料/Gy_AreaSet.html | 4
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList_His.html | 46 +-
WebTM/views/生产管理/生产报表/SC_BOMReport.html | 554 ++++++++++++++++++++++++++++++++++++++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 59 ++--
WebTM/WebTM.csproj | 2
9 files changed, 653 insertions(+), 97 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e181f18..507f1c3 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -89,6 +89,7 @@
<Content Include="layuiadmin\ax\ax-response.css" />
<Content Include="layuiadmin\ax\ax.css" />
<Content Include="layuiadmin\ax\ax.min.js" />
+ <Content Include="layuiadmin\ax\images\iccard-bg.jpg" />
<Content Include="layuiadmin\ax\images\login-bg.jpg" />
<Content Include="layuiadmin\ax\images\login-left.jpg" />
<Content Include="layuiadmin\ax\images\yanzhengma.jpg" />
@@ -556,6 +557,7 @@
<Content Include="views\鐢熶骇绠＄悊\鎻愭枡璁″垝\JIT_PickUpCalculate.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList_PDA.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\SC_BOMReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_ProductionInProgressReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_NutInspectionCCDPassRate.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.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/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_AreaSet.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_AreaSet.html"
index b6deb81..bd712ca 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_AreaSet.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_AreaSet.html"
@@ -673,12 +673,12 @@
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
- <script src="https://cdn.staticfile.net/translate.js/3.12.0/translate.js"></script>
+ <!--<script src="https://cdn.staticfile.net/translate.js/3.12.0/translate.js"></script>
<script>
translate.language.setLocal('English'); //璁剧疆鏈湴璇锛堝綋鍓嶇綉椤电殑璇锛夈�傚鏋滀笉璁剧疆锛岄粯璁よ嚜鍔ㄨ瘑鍒綋鍓嶇綉椤垫樉绀烘枃瀛楃殑璇銆� 鍙～鍐欏 'english'銆�'chinese_simplified' 绛夛紝鍏蜂綋鍙傝鏂囨。涓嬫柟鍏充簬姝ょ殑璇存槑銆�
translate.service.use('client.edge'); //璁剧疆鏈哄櫒缈昏瘧鏈嶅姟閫氶亾锛岀洿鎺ュ鎴风鏈韩锛屼笉渚濊禆鏈嶅姟绔� 銆傜浉鍏宠鏄庡弬鑰� http://translate.zvo.cn/43086.html
translate.execute();//杩涜缈昏瘧
- </script>
+ </script>-->
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/SC_BOMReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/SC_BOMReport.html"
new file mode 100644
index 0000000..7d8a8b6
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/SC_BOMReport.html"
@@ -0,0 +1,554 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>BOM灞傜骇灞曞紑鎶ヨ〃</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">
+ <link href="../../../layuiadmin/resize/ResizeLeftRight.css" rel="stylesheet" />
+ <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>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/modules/treeTable.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-tab layui-tab-card" style="margin-top:20px;">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <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="hidden" class="layui-input ForFilteringSchemes" name="HMaterID" id="HMaterID" value="" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
+ </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="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMater" id="btnHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
+ <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>
+ </div>
+ <div class="box" style="padding:10px 0" id="box">
+ <div class="left" id="left" style="margin-top:20px;">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ <!-- 娣诲姞鐢ㄤ簬鎷栨嫿鐨勬墜鏌勫厓绱� -->
+ <div id="resize" class="resize" title="鏀剁缉渚ц竟鏍�"> </div>
+ <div class="mid" id="right" style="margin-top:20px;">
+ <div class="layui-tab layui-tab-card">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--宸ヨ壓璺嚎-->
+ <table class="layui-hide" id="mainTable_Routing" lay-filter="mainTable_Routing"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/resize/ResizeLeftRight.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ //treeTable: 'treeTable'
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','treeTable'], 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
+ , treeTable = layui.treeTable
+ var sWhere = "";
+ var option = ""; //涓昏〃鏍�
+ var option_Routing = ""; //宸ヨ壓璺嚎
+ var ins;
+ //#endregion
+
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "SC_BOMReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜汉锛�
+ var titleData = ["ParentID", "涓籭d", "涓荤墿鏂檌d", "瀛恑d", "瀛愮墿鏂檌d"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();//鏌ヨ
+ });
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ treeTable.on("toolbar(mainTable)", function (obj) {
+
+ });
+
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栧乏鍒楄〃
+ set_InitGrid();
+ //鍒濆鍖栦汉鍒楄〃
+ set_InitGrid_Routing();
+
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery( ) {
+
+ var HMaterID = $("#HMaterID").val(); //鐗╂枡缂栫爜
+ get_Display(HMaterID);
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HMaterID").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
+ var HMaterID = "";
+ get_Display(HMaterID);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栭〉闈�
+
+ //鍒濆鍖栧乏渚у垪琛�
+ function set_InitGrid() {
+ option= {
+ elem: '#mainTable',
+ toolbar: '#toolbarDemo',
+ totalRow: true,
+ cellMinWidth: 90,
+ limit: Number.MAX_VALUE, // 榛樿鏄剧ず鍏ㄩ儴
+ defaultToolbar: [], // 闅愯棌榛樿鐨勫鍑恒�佹墦鍗扮瓑鎸夐挳
+ cols: [],
+ data: []
+ };
+
+ treeTable.render(option);
+ }
+
+ //鍒濆鍖栧伐鑹哄垪琛�
+ function set_InitGrid_Routing() {
+ option_Routing = {
+ elem: '#mainTable_Routing'
+ , toolbar: '#toolbarDemo2'
+ , totalRow: true
+ , height: 600
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ , data: []
+ };
+ }
+ //#endregion
+
+ //#region BOM鏌ヨ
+ function get_Display(HMaterID) {
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProductReport/Get_BOMReportList',
+ type: "GET",
+ data: { "HMaterID": HMaterID, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var Listcol = [];
+ for (var i = 0; i < data1.list.length; i++) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list[i].Columns) {
+ data.push({ "id": data1.list[i].Columns[key].ColmCols, "name": data1.list[i].Columns[key].ColmCols, "Type": data1.list[i].Columns[key].ColmType });
+ }
+ var col = [];
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var j = 0; j < data.length; j++) {
+ if ($.inArray(data[j].name, titleData) > -1) {
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[j].name == '鎴愬搧鐗╂枡') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '鎴愬搧鐗╂枡', templet: function (d) {
+ return '<span style="color: blue;">' + d.鎴愬搧鐗╂枡 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '瀛愪欢鐗╂枡') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 150, event: '瀛愪欢鐗╂枡', templet: function (d) {
+ return '<span style="color: blue;">' + d.瀛愪欢鐗╂枡 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else {
+ switch (data[j].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 100});
+ }
+ }
+ }
+ Listcol.push(col);
+ }
+ var TreeDate = LoadTree(data1.data.h_p_Sc_BOMReportList);
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[0]]
+ , data: TreeDate
+ , height: 'full-50'
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , page: false
+ }
+ treeTable.render(option);
+
+ //宸ヨ壓
+ option_Routing = {
+ elem: '#mainTable_Routing'
+ , toolbar: '#toolbarDemo2'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_Sc_BOMReportList1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Routing);
+
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region BOM鐐瑰嚮鏌ヨ 宸ヨ壓璺嚎
+ function getTable_Right(HMaterID) {
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProductReport/Get_BOMReportList_Routing',
+ type: "GET",
+ data: { "HMaterID": HMaterID,"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 (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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ //宸ヨ壓璺嚎
+ option_Routing = {
+ elem: '#mainTable_Routing'
+ , toolbar: '#toolbarDemo2'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , page: false
+ }
+ table.render(option_Routing);
+
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 鐗╂枡寮圭獥
+ form.on('submit(btnHMater)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html' ,'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+
+ layer.closeAll();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () { }
+ });
+ });
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑 + 鏌ヨ鍙充晶琛ㄦ牸
+ treeTable.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鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+
+ var HMaterID = obj.data.瀛恑d == 0 ? obj.data.涓荤墿鏂檌d : obj.data.瀛恑d;
+
+ getTable_Right(HMaterID);
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ btndate = [];
+ }
+ })
+ //#endregion
+
+ /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+ function LoadTree(data) {
+ let map = {};
+ let treeData = [];
+ data.forEach(it => {
+ map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
+ })
+ //鐢熸垚缁撴灉闆�
+ data.forEach(it => {
+ const parent = map[it.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
+ if (parent) {
+ if (!Array.isArray(parent.children)) parent.children = [];
+ parent.children.push(it);
+ } else {
+ treeData.push(it)
+ }
+ })
+ return treeData;
+ }
+
+ //#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
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
index d42c186..b37915f 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
@@ -31,12 +31,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
@@ -55,18 +49,26 @@
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
+ <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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>
- <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>
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 6909d7e..0b0275e 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -55,21 +55,17 @@
<input type="text" class="layui-input ForFilteringSchemes" name="WorkCenter" id="WorkCenter">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="hidden" class="layui-input " lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <!--鏄剧ず褰撳墠杩囨护鏂规-->
- <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-row" style="margin-top:10px;margin-left:5%;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="hidden" class="layui-input " lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
<!--鍏朵粬鏉′欢-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
@@ -106,7 +102,10 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
</div>
-
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <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: 10px; margin-bottom: 10px ">
@@ -219,16 +218,16 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(瀹氶鐢宠鍗�)</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime"><i class="layui-icon layui-icon-set"></i>鎵规敼灏忔椂浜ц兘</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SourceWorkQty" id="btn_SourceWorkQty"><i class="layui-icon layui-icon-set"></i>浜х嚎浜ц兘</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime"><i class="layui-icon layui-icon-set"></i>鎵规敼灏忔椂浜ц兘</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SourceWorkQty" id="btn_SourceWorkQty"><i class="layui-icon layui-icon-set"></i>浜х嚎浜ц兘</button>
</div>
</script>
</form>
@@ -493,7 +492,7 @@
set_InitGrid();
Organ();
//鏌ヨ
- get_FastQuery(1);
+ //get_FastQuery(1);
//鑾峰彇椤圭洰鍙�
Get_HProject();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -1396,7 +1395,7 @@
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-
+
}
});
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
@@ -1482,7 +1481,7 @@
layer.close(index);
}
//layer.closeAll('dialog');
-
+
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
@@ -1699,7 +1698,7 @@
if (HProject != '0') {
sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
}
-
+
sWhere += " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType<>'SUB'"
//鏌ヨ璇彞
$.ajax({
@@ -1857,7 +1856,7 @@
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
$("#btnSearch").trigger('click');
-
+
});
} else {
@@ -2031,7 +2030,7 @@
// if (dataCol[i]) {
// var dataCols = dataCol[i].split('|');
// }
-
+
// //闅愯棌鍒�
// if (dataCols[1] == 1) {
// option.cols[0][i + 1]["hide"] = true;
@@ -2467,7 +2466,7 @@
//#endregion
//#region 浜х嚎浜ц兘
- function set_SourceWorkQty() {
+ function set_SourceWorkQty() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
@@ -2491,12 +2490,12 @@
})
} else {
layer.msg('鎵�閫夊伐搴忥細' + HProcName + '锛屼笉涓烘帓浜у伐搴忥紒');
- }
+ }
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
+ }
}
- //#endregion
+ //#endregion
//#endregion
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
index 9dcd1dd..e05f664 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillListQuery.html"
@@ -55,14 +55,28 @@
<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 50%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 50%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 107px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
+ </div>
</div>
</div>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
@@ -86,21 +100,6 @@
<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; display: none;">閲嶇疆</button>
- </div>
- <div class="layui-row" style="margin-top:10px;margin-left:5%;">
- <!--鍏朵粬鏉′欢-->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 107px;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HModel" id="HModel">
- </div>
- </div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
@@ -281,7 +280,7 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
//鍒濆鍖栬〃鏍�
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
//#endregion
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList_His.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList_His.html"
index 70414aa..68e3dde 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList_His.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList_His.html"
@@ -53,30 +53,18 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ </div>
+ <div class="layui-row" style="margin-top:10px;margin-left:5%;margin-bottom:20px">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </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-row" style="margin-top:10px;margin-left:5%;">
<!--鍏朵粬鏉′欢-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
@@ -90,6 +78,18 @@
<input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
index 55f9920..12f1d3f 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
@@ -819,7 +819,7 @@
//#region 瀵煎嚭Execel
function btn_Export() {
- table.exportFile(ins.config.id, option.data, "xls");
+ table.exportFile(ins.config.id, option_HB_SN.data, "xls");
}
//#endregion
--
Gitblit v1.9.1