From 837708c3fdea55bca84cbf0f6ca17b98d31d81a3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 03 三月 2023 14:29:26 +0800
Subject: [PATCH] 生产资源打印 工序工价完善 物料分类单据及列表
---
WebTM/views/基础资料/公用基础资料/Gy_MaterTypeEdit.html | 334 ++++++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_SourceList.aspx.designer.cs | 26
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 37 +
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 25
WebTM/views/基础资料/工资基础资料/Gy_ProcPriceList.html | 129 +--
WebTM/views/基础资料/公用基础资料/Gy_MaterType.html | 574 ++++++++++++++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_SourceList.aspx.cs | 17
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html | 56
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_SourceList.aspx | 26
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportOverList.html | 2
WebTM/views/grf/设备标签.grf | 327 ++++++++++
WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html | 259 ++++----
WebTM/views/index.html | 3
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 3
WebTM/WebTM.csproj | 11
15 files changed, 1,589 insertions(+), 240 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b44eaca..9796b3a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -173,6 +173,9 @@
<Content Include="views\video\1.wav" />
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗WindowPrint.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_CheckList_New.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Check_New.html" />
@@ -298,6 +301,7 @@
<Content Include="views\grf\鐟炰笌绁烘睙鑻忔墦鍗版ā鏉�.grf" />
<Content Include="views\grf\cabinet-SB.grf" />
<Content Include="views\grf\ces5.grf" />
+ <Content Include="views\grf\璁惧鏍囩.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1356,6 +1360,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
<DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx.cs">
+ <DependentUpon>xmlLBM_Gy_SourceList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Gy_SourceList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill.aspx.cs">
<DependentUpon>xmlLBM_HGy_BarCodeBill.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git "a/WebTM/views/grf/\350\256\276\345\244\207\346\240\207\347\255\276.grf" "b/WebTM/views/grf/\350\256\276\345\244\207\346\240\207\347\255\276.grf"
new file mode 100644
index 0000000..0fdadb3
--- /dev/null
+++ "b/WebTM/views/grf/\350\256\276\345\244\207\346\240\207\347\255\276.grf"
@@ -0,0 +1,327 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Title='鐢熶骇浠诲姟鍗�'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=135000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=10
+ Height=5
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Styles=[]
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='鏂欏彿'
+ End
+ Item
+ Name='鐗╂枡鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鏁伴噺'
+ Type=Integer
+ End
+ Item
+ Name='鏉＄爜缂栧彿'
+ End
+ Item
+ Name='鏈哄彴缂栧彿'
+ End
+ Item
+ Name='鐢熶骇鎵瑰彿'
+ End
+ Item
+ Name='鍒剁▼'
+ End
+ Item
+ Name='鍑�閲�'
+ Type=Currency
+ Format='0.#########;;#'
+ End
+ Item
+ Name='姣涢噸'
+ Type=Currency
+ Format='0.#########;;#'
+ End
+ Item
+ Name='閿�鍞鍗曞彿'
+ End
+ Item
+ Name='鎵瑰彿'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy-MM'
+ End
+ Item
+ Name='璐熻矗浜�'
+ End
+ Item
+ Name='瀹㈡埛鍨嬪彿'
+ End
+ Item
+ Name='鍘嬫満鍨嬪彿'
+ End
+ Item
+ Name='鐗╂枡缂栫爜'
+ End
+ Item
+ Name='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Name='Field1'
+ End
+ Item
+ Name='鐢熶骇鏃ユ湡'
+ Type=DateTime
+ Format='yy/MM/dd'
+ End
+ Item
+ Name='渚涘簲鍟�'
+ End
+ Item
+ Name='鐢熸垚鏃ユ湡'
+ Type=DateTime
+ Format='yy/MM/dd'
+ End
+ Item
+ Name='杞﹂棿'
+ End
+ Item
+ Name='鐢熶骇璧勬簮浠ｇ爜'
+ End
+ Item
+ Name='鐢熶骇璧勬簮'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column3'
+ Width=10.0013
+ End
+ End
+ Object ColumnContent
+ Height=5.00063
+ RowsPerPage=1
+ Items ColumnContentCell
+ Item
+ Column='Column3'
+ FreeCell=T
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox25'
+ Left=0.211667
+ Top=0.396875
+ Width=3.20146
+ Height=1.13771
+ Object Font
+ Name='榛戜綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ TextAlign=MiddleCenter
+ CharSpacing=4
+ Text='璁惧鏍囩'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode6'
+ Left=5.3975
+ Top=0.211667
+ Width=4.31271
+ Height=1.37583
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[ZYM]+[#鐢熶骇璧勬簮浠ｇ爜#]'
+ End
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.238125
+ Top=1.71979
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=4
+ Items FreeGridColumn
+ Item[1]
+ Width=1.69333
+ End
+ Item[2]
+ Width=2.93688
+ End
+ Item[3]
+ Width=1.93146
+ End
+ Item[4]
+ Width=3.01625
+ End
+ End
+ Items FreeGridRow
+ Item[2]
+ Height=0.7
+ End
+ Item[3]
+ Height=0.7
+ End
+ Item[4]
+ Height=0.608542
+ End
+ Item[5]
+ Height=0.7
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='璁惧缂栧彿'
+ End
+ Item[1,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ Text='[#鐢熶骇璧勬簮浠ｇ爜#]'
+ End
+ Item[1,4]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ End
+ Item[2,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='璁惧鍚嶇О'
+ End
+ Item[2,2]
+ ShrinkFontToFit=T
+ Text='[#鐢熶骇璧勬簮#]'
+ ColSpan=3
+ End
+ Item[3,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='鎵�灞炶溅闂�'
+ End
+ Item[3,2]
+ ShrinkFontToFit=T
+ Text='[#杞﹂棿#]'
+ ColSpan=3
+ End
+ Item[4,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='璐ｄ换浜�'
+ End
+ Item[4,2]
+ ShrinkFontToFit=T
+ End
+ Item[5,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='鏉＄爜鍐呭'
+ End
+ Item[5,2]
+ Text='[ZYM]+[#鐢熶骇璧勬簮浠ｇ爜#]'
+ ColSpan=3
+ End
+ End
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox26'
+ Left=3.81
+ Top=0.343958
+ Width=1.40229
+ Height=1.19063
+ Object Font
+ Name='榛戜綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ TextAlign=MiddleCenter
+ CharSpacing=4
+ Text='涔斾竴'
+ End
+ End
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Text='Column1'
+ End
+ End
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0
+ RepeatOnPage=T
+ End
+ End
+ Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+ End
+End
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 50fee6a..6326fda 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -448,7 +448,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娴佽浆鍗＄淮鎶�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">宸ュ簭杩斿伐鐢宠鍒楄〃</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>
+ <!--<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>-->
<dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>
<dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
@@ -925,6 +925,7 @@
<a>鍏敤璧勬枡</a>
<dl class="layui-nav-child">
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">鐗╂枡鍒楄〃</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html">鐗╂枡鍒嗙被鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">浠撳簱鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.html">宸ヤ綅鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html">浠撲綅鍒楄〃</a></dd>
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_MaterType.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_MaterType.html"
new file mode 100644
index 0000000..17149d6
--- /dev/null
+++ "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_MaterType.html"
@@ -0,0 +1,574 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐗╂枡鍒嗙被鍒楄〃</title>
+ <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>
+</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" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </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-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;margin-bottom:10px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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" 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="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+ var sWhere = "";
+
+ var option = [];
+ var Organization = sessionStorage["Organization"];
+ var HModName = "Gy_MaterType";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID","HUnitID","HParentID", "HUSEORGID","HMinPickQty","HEndFlag","HStopFlag"];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鏂板鎸夐挳
+ case 'btn-Add':
+ set_AddNew();
+ break;
+ case 'btn-Edit':
+ set_ShowBill();
+ break;
+ case 'btn-Delete':
+ set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Close':
+ parent.layui.admin.events.closeThisTabs();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 800
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: '浠ｇ爜', title: '浠ｇ爜' }
+ , { field: '鍚嶇О', title: '鍚嶇О' }
+ , { field: '鐭唬鐮�', title: '鐭唬鐮�' }
+ , { field: '绛夌骇', title: '绛夌骇' }
+ , { field: '鏈骇鏍囧織', title: '鏈骇鏍囧織' }
+ , { field: '绂佺敤鏍囧織', title: '绂佺敤鏍囧織' }
+ , { field: '澶囨敞', title: '澶囨敞' }
+ , { field: '浣跨敤鐘舵��', title: '浣跨敤鐘舵��' }
+ , { field: '鍒涘缓浜�', title: '鍒涘缓浜�' }
+ , { field: '寤虹珛鏃堕棿', title: '寤虹珛鏃堕棿' }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃堕棿', title: '瀹℃牳鏃堕棿' }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃堕棿', title: '淇敼鏃堕棿' }
+ , { field: '绂佺敤浜�', title: '绂佺敤浜�' }
+ , { field: '绂佺敤鏃堕棿', title: '绂佺敤鏃堕棿' }
+ , { field: '浣跨敤缁勭粐', title: '浣跨敤缁勭粐' }
+ ]]
+ };
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ //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 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ 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;
+ }
+ if (HNumber) {
+ sWhere += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and HName like '%" + HName + "%'";
+ }
+
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ItemID = data[0].HItemID.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaterType/DeleteMaterType',
+ type: "GET",
+ data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000,icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鐗╂枡鍒嗙被',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ //#endregion
+
+ //#region 缂栬緫鍗曟嵁
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐗╂枡鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?hID=' + hID
+ , resize: false
+ , cancel: function () {
+
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_MaterType/AuditGy_MaterType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; 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 - 2; i++) {
+ if (dataCol[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 鍒楁槑鏄剧ず涓嬫媺妗�
+ 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
+ });
+ //#endregion
+</script>
\ No newline at end of file
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_MaterTypeEdit.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_MaterTypeEdit.html"
new file mode 100644
index 0000000..cd2cae4
--- /dev/null
+++ "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_MaterTypeEdit.html"
@@ -0,0 +1,334 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐗╂枡鍒嗙被缂栬緫</title>
+ <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>
+ <style type="text/css">
+ .layui-form-label {
+ width: 85px;
+ }
+
+ .layui-form-item .layui-input-inline {
+ width: 50%;
+ }
+
+ .layui-inline {
+ width: 290px;
+ }
+
+ .layui-form-item .layui-inline {
+ margin-right: 0px;
+ }
+ </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-header">
+ <div class="layui-btn-group">
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ </ul>
+ <h1 style="text-align:center;"><b>鐗╂枡鍒嗙被</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">浠ｇ爜锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input id="HItemID" name="HItemID" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HName" id="HName" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍔╄鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐖剁骇锛�</label>
+ <div class="layui-input-inline">
+ <select name="HParentID" id="HParentID" lay-verify="HParentID">
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">浣跨敤鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+ <option value="鏈娴�" selected>鏈娴�</option>
+ <option value="鏈娇鐢�">鏈娇鐢�</option>
+ <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浣跨敤缁勭粐锛�</label>
+ <div class="layui-input-inline">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 澶囨敞锛�</label>
+ <div class="layui-input-inline ">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織锛�</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
+ <input type="hidden" name="UnitType" id="UnitType">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鑾峰彇 閫掑叆鍙傛暟
+ var params = getUrlVars();
+ var hID = params[params[0]];//缂栬緫鏌ョ湅
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ if (hID == null || hID == 0) {
+ //id new
+ $("#HItemID").val(0);
+ }
+ else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
+ $("#HItemID").val(hID);
+ //淇敼鏃朵富琛↖D
+ RoadBillMain(hID);
+ }
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(Saver)', function (data) {
+ Saver(data);
+
+ });
+
+ form.on('submit(Exit)', function (data) {//閫�鍑�
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ function set_ClearBill() {
+ Parent();
+ Organ();
+ }
+
+ //鏌ヨ鐖剁骇
+ function Parent() {
+ var sWhere = " and HParentID=0 ";
+ if (hID != "" && hID != null) {
+ sWhere += " and HItemID!=" + hID;
+ }
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+ success: function (data1) {
+ var Parent = '<option style="color:blue;" value="0">鏃�</option>';
+ if (data1.count == 1) {
+ var data = data1.data;
+ for (var i = 0; i < data.length; i++) {
+ Parent += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ }
+ $("#HParentID").append(Parent);
+ form.render('select');
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //鏌ヨ缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //淇濆瓨
+ function Saver(data) {
+ if ($("#HNumber").val() == 0) {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒");
+ return;
+ }
+ if ($("#HName").val() == 0) {
+ layer.msg("璇疯緭鍏ュ悕绉帮紒");
+ return;
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "Gy_MaterType/SaveGy_MaterType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+ layer.msg(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err);
+ }
+ });
+ }
+
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ function RoadBillMain(hID)//鍔犺浇琛ㄥご
+ {
+ var sWhere = " and HItemID=" + hID;
+ $.ajax({
+ url: GetWEBURL() + "Gy_MaterType/Gy_MaterTypeList",
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HItemID": data.HItemID
+ , "HNumber": data.浠ｇ爜
+ , "HName": data.鍚嶇О
+ , "HHelpCode": data.HHelpCode
+ , "HParentID": data.HParentID
+ , "HUseFlag": data.浣跨敤鐘舵��
+ , "HUSEORGID": data.HUSEORGID
+ , "HRemark": data.澶囨敞
+ , "HStopflag": data.绂佺敤鏍囧織
+ });
+
+ $("#HParentID").val(data.HParentID);
+ $("#HUSEORGID").val(data.HUSEORGID);
+ $("#HUseFlag").val(data.浣跨敤鐘舵��);
+ //绂佺敤鏍囪
+ if (data.绂佺敤鏍囧織 == "true") {
+ $("input[name='HStopflag'][value='" + data.绂佺敤鏍囧織 + "']").attr("checked", true);
+ }
+ form.render("select");
+ form.render("checkbox");
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+ 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
+ });
+
+</script>
\ No newline at end of file
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/HBarPlanPrint.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/HBarPlanPrint.html"
index e58c562..e143eb7 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/HBarPlanPrint.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/HBarPlanPrint.html"
@@ -189,6 +189,9 @@
case "HEquipResume"://璁惧灞ュ巻
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_HEquipResumeBillList.aspx?linterid=" + value, true, "");
break;
+ case "HSource"://鐢熶骇璧勬簮
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_SourceList.aspx?linterid=" + value, true, "");
+ break;
}
</script>
</body>
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/xmlLBM_Gy_SourceList.aspx" "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/xmlLBM_Gy_SourceList.aspx"
new file mode 100644
index 0000000..f4aa9ba
--- /dev/null
+++ "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/xmlLBM_Gy_SourceList.aspx"
@@ -0,0 +1,26 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_SourceList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_SourceList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ SqlXMLReportData.GenOneRecordset(this, "select a.HNumber 璁惧缂栧彿,a.HName 璁惧鍚嶇О,g.HName 鎵�灞炶溅闂�,e.HName 璐ｄ换浜� from Gy_Source a left join Gy_Department g on a.HDeptID=g.HItemID left join Gy_Employee e on g.HEmpID=e.HItemID where a.HItemID=" + Request.Params["linterid"]);
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
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/xmlLBM_Gy_SourceList.aspx.cs" "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/xmlLBM_Gy_SourceList.aspx.cs"
new file mode 100644
index 0000000..a4e66fb
--- /dev/null
+++ "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/xmlLBM_Gy_SourceList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Gy_SourceList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
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/xmlLBM_Gy_SourceList.aspx.designer.cs" "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/xmlLBM_Gy_SourceList.aspx.designer.cs"
new file mode 100644
index 0000000..a5c73e9
--- /dev/null
+++ "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/xmlLBM_Gy_SourceList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Gy_SourceList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
index 4f5206a..b0a1f37 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
@@ -68,6 +68,7 @@
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProcNumber" id="HProcNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HProcID" id="HProcID" value="0">
+ <input type="hidden" name="HItemID" id="HItemID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="width: 40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -113,12 +114,6 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDept" id="btnSearchDept" style="width: 40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ュ簭宸ヤ环<br/>璧勬枡浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="宸ュ簭宸ヤ环浠ｇ爜" id="宸ュ簭宸ヤ环浠ｇ爜" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -292,8 +287,6 @@
if (linterid == undefined) {
linterid = 0;
}
- //鏌ヨ
- GetProcPriceValue(linterid);
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -403,6 +396,36 @@
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.reload(option);
layer.close(index);
+ }
+ });
+ }
+
+ if (obj.event == 'HBeginDateCol') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ checkRefresh();
+ }
+ });
+ }
+
+ if (obj.event == 'HEndDateCol') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ checkRefresh();
}
});
}
@@ -532,28 +555,38 @@
set_SaveBill(data);
});
+
//淇濆瓨
function set_SaveBill(data) {
- var sSubTable = table.cache['mainTable'];
+ //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ var sSubTable = num;
for (var i = 0; i < sSubTable.length; i++) {
if (!sSubTable[i].HMaterIDCol) {
var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝鐗╂枡涓嶈兘涓虹┖锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("绗�" + indexRow + "琛岋紝鐗╂枡涓嶈兘涓虹┖锛�");
return;
}
if (!sSubTable[i].HProcIDCol) {
var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�");
return;
}
if (!sSubTable[i].HSourceNumberCol) {
var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝璧勬簮涓嶈兘涓虹┖锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("绗�" + indexRow + "琛岋紝璧勬簮涓嶈兘涓虹┖锛�");
return;
}
}
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr = JSON.stringify(num);
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
@@ -564,14 +597,6 @@
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
@@ -721,65 +746,50 @@
, limit: 500
, height: 'full-250'
, cellMinWidth: 90
- //, cols: [[
- // { type: 'checkbox' }
- // , { field: 'HMaterIDCol', title: '鐗╂枡ID', edit: 'text', hide: true }
- // , { field: 'HMaterNumberCol', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HMaterCheck", width: 200 }
- // , { field: 'HMaterNameCol', title: '鐗╂枡鍚嶇О', width:200 }
- // , { field: 'HMaterModelCol', title: '瑙勬牸鍨嬪彿', width: 200 }
- // , { field: 'HProcIDCol', title: '宸ュ簭ID', edit: 'text', hide: true }
- // , { field: 'HProcNumberCol', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
- // , { field: 'HProcNameCol', title: '宸ュ簭鍚嶇О' }
- // , { field: 'HSourceIDCol', title: '璧勬簮ID', edit: 'text', hide: true }
- // , { field: 'HSourceNumberCol', title: '璧勬簮浠ｇ爜', edit: 'text', event: "HSourceCheck" }
- // , { field: 'HSourceNameCol', title: '璧勬簮鍚嶇О' }
- // , { field: 'HPriceCol', title: '鍗曚环', edit: 'text' }
- // , { field: 'HBeginDateCol', title: '寮�濮嬫棩鏈�', edit: 'text', width: 110
- // , templet: function (d) {
- // if (d.HBeginDateCol == null) {
- // return "";
- // }
- // return util.toDateString(d.HBeginDateCol, "yyyy-MM-dd");
- // }
- // }
- // , {
- // field: 'HEndDateCol', title: '缁撴潫鏃ユ湡', edit: 'text', width: 110
- // , templet: function (d) {
- // if (d.HEndDateCol == null) {
- // return "";
- // }
- // return util.toDateString(d.HEndDateCol, "yyyy-MM-dd");
- // }
- // }
- // , { field: 'HCostFlagCol', title: '鎴愭湰蹇呴��', templet: '#HCostFlagCol' }
- // , { field: 'HFlowFlagCol', title: '娴佽浆榛樿', templet: '#HFlowFlagCol' }
- // , { field: 'HPayFlagCol', title: '宸ヨ祫榛樿', templet: '#HPayFlagCol' }
- // , { field: 'HRemarkCol', title: '澶囨敞', edit: 'text' }
- // , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
- //]]
- //, done: function (res, curr, count) {
- // option.data = res.data;
- // $('.layui-form-select').find('input').unbind("blur");
- // $('tr').each(function (e) {
- // var $cr = $(this);
- // var dataIndex = $cr.attr("data-index");
- // $.each(option.data, function (index, value) {
- // if (value.LAY_TNDEX == dataIndex) {
- // $cr.find('input').val(value.HCostFlagCol);
- // $cr.find('input').val(value.HFlowFlagCol);
- // $cr.find('input').val(value.HPayFlagCol);
- // }
- // });
- // });
- //}
- //, text: {
- // none: '鏃犳暟鎹紒'
- //}
+ , cols: [[
+ { type: 'checkbox' }
+ , { field: 'HMaterIDCol', title: '鐗╂枡ID', edit: 'text', hide: true }
+ , { field: 'HMaterNumberCol', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HMaterCheck", width: 200 }
+ , { field: 'HMaterNameCol', title: '鐗╂枡鍚嶇О', width:200 }
+ , { field: 'HMaterModelCol', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HProcIDCol', title: '宸ュ簭ID', edit: 'text', hide: true }
+ , { field: 'HProcNumberCol', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcCheck" }
+ , { field: 'HProcNameCol', title: '宸ュ簭鍚嶇О' }
+ , { field: 'HSourceIDCol', title: '璧勬簮ID', edit: 'text', hide: true }
+ , { field: 'HSourceNumberCol', title: '璧勬簮浠ｇ爜', edit: 'text', event: "HSourceCheck" }
+ , { field: 'HSourceNameCol', title: '璧勬簮鍚嶇О' }
+ , { field: 'HPriceCol', title: '鍗曚环', edit: 'text' }
+ , { field: 'HBeginDateCol', title: '寮�濮嬫棩鏈�', event: "HBeginDateCol" }
+ , { field: 'HEndDateCol', title: '缁撴潫鏃ユ湡', event: "HEndDateCol" }
+ , { field: 'HCostFlagCol', title: '鎴愭湰蹇呴��', templet: '#HCostFlagCol' }
+ , { field: 'HFlowFlagCol', title: '娴佽浆榛樿', templet: '#HFlowFlagCol' }
+ , { field: 'HPayFlagCol', title: '宸ヨ祫榛樿', templet: '#HPayFlagCol' }
+ , { field: 'HRemarkCol', title: '澶囨敞', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ , done: function (res, curr, count) {
+ option.data = res.data;
+ $('.layui-form-select').find('input').unbind("blur");
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ $cr.find('input').val(value.HCostFlagCol);
+ $cr.find('input').val(value.HFlowFlagCol);
+ $cr.find('input').val(value.HPayFlagCol);
+ }
+ });
+ });
+ }
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
};
- //rowdata[0].HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
- //rowdata[0].HEndDateCol = "2100-01-01";
- //option.data = rowdata;
- //table.render(option);
+ rowdata[0].HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
+ rowdata[0].HEndDateCol = "2100-01-01";
+ option.data = rowdata;
+ table.render(option);
}
form.on('select(HCostFlagCol)', function (data) {
@@ -812,6 +822,17 @@
});
});
+ //澶氶�� 鍒锋柊琛ㄦ牸
+ function checkRefresh() {
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HCostFlagCol' + i + '').find("option[value='" + option.data[i - 1].HCostFlagCol + "']").attr("selected", true);
+ $('#HFlowFlagCol' + i + '').find("option[value='" + option.data[i - 1].HFlowFlagCol + "']").attr("selected", true);
+ $('#HPayFlagCol' + i + '').find("option[value='" + option.data[i - 1].HPayFlagCol + "']").attr("selected", true);
+ }
+ form.render('select');
+ }
+
+ //缂栬緫
function GetProcPriceValue(HItemID) {
if (HItemID == '' || HItemID == null) {
HItemID = 0;
@@ -821,58 +842,44 @@
url: GetWEBURL() + "/Gy_ProcPrice/GetProcPriceValue",
type: "GET",
data: { "HItemID": HItemID },
- 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:
- if (data[i].name == '鐗╂枡浠ｇ爜' || data[i].name == '宸ュ簭浠ｇ爜' || data[i].name == '璧勬簮浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', width: 200 });
- } else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
- }
+ success: function (d) {
+ layer.close(ajaxLoad);
+ if (d.count == 1) {//涓昏〃
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HItemID": d.data[0].HItemID
+ , "HProcNumber": d.data[0].宸ュ簭浠ｇ爜
+ , "HProcID": d.data[0].HProcIDCol
+ , "HProcName": d.data[0].宸ュ簭鍚嶇О
+ , "HMaterNumber": d.data[0].鐗╂枡浠ｇ爜
+ , "HMaterID": d.data[0].HMaterID
+ , "HMaterName": d.data[0].鐗╂枡鍚嶇О
+ , "HMaterModel": d.data[0].瑙勬牸鍨嬪彿
+ , "HDeptName": d.data[0].閮ㄩ棬鍚嶇О
+ , "HDeptID": d.data[0].Hdeptid
+ , "HMakeDate": Format(new Date(d.data[0].鍒跺崟鏃ユ湡), 'yyyy-MM-dd')
+ , "HMaker": d.data[0].鍒跺崟浜�
+ });
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 'full-80'
- , page: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HMaterIDCol": d.data[i].HMaterID, "HMaterNumberCol": d.data[i].鐗╂枡浠ｇ爜, "HMaterNameCol": d.data[i].鐗╂枡鍚嶇О, "HMaterModelCol": d.data[i].瑙勬牸鍨嬪彿, "HProcIDCol": d.data[i].HProcID,
+ "HProcNumberCol": d.data[i].宸ュ簭浠ｇ爜, "HProcNameCol": d.data[i].宸ュ簭鍚嶇О, "HSourceIDCol": d.data[i].HSourceID, "HSourceNumberCol": d.data[i].璧勬簮浠ｇ爜, "HSourceNameCol": d.data[i].璧勬簮鍚嶇О, "HPriceCol": d.data[i].鍗曚环,
+ "HBeginDateCol": Format(new Date(d.data[i].寮�濮嬫棩鏈�), 'yyyy-MM-dd'), "HEndDateCol": Format(new Date(d.data[i].缁撴潫鏃ユ湡), 'yyyy-MM-dd'), "HCostFlagCol": (d.data[i].HCostFlag == 0 ? false : true), "HFlowFlagCol": (d.data[i].HFlowFlag == 0 ? false : true), "HPayFlagCol": (d.data[i].HPayFlag == 0 ? false : true),
+ "HRemarkCol": d.data[i].澶囨敞
+ });
}
+ option.data = rowdata;
table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
- layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ for (var i = 0; i < d.data.length; i++) {
+ $('#HCostFlagCol' + (i + 1)).find("option[value='" + d.data[i].HCostFlag + "']").attr("selected", true);
+ $('#HFlowFlagCol' + (i + 1)).find("option[value='" + d.data[i].HFlowFlag + "']").attr("selected", true);
+ $('#HPayFlagCol' + (i + 1)).find("option[value='" + d.data[i].HPayFlag + "']").attr("selected", true);
+ }
+ form.render('select');
} else {
- layer.close(ajaxLoad);
layer.alert(data1.Message, { icon: 5 });
}
}, error: function () {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
index 0ddb539..b015e36 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
@@ -78,56 +78,6 @@
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-colla-content">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </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="鐗╂枡浠ｇ爜" id="鐗╂枡浠ｇ爜">
- </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="璧勬簮浠ｇ爜" id="璧勬簮浠ｇ爜">
- </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="閮ㄩ棬浠ｇ爜" id="閮ㄩ棬浠ｇ爜">
- </div>
- </div>
- </div>
- <div class="layui-colla-content">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </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="鐗╂枡鍚嶇О" id="鐗╂枡鍚嶇О">
- </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="璧勬簮鍚嶇О" id="璧勬簮鍚嶇О">
- </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="閮ㄩ棬鍚嶇О" id="閮ㄩ棬鍚嶇О">
- </div>
- </div>
- </div>
</div>
</div>
</div>
@@ -136,7 +86,9 @@
<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_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<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="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>
@@ -195,6 +147,12 @@
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit': set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit': set_CheckBill(1);
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -346,12 +304,6 @@
var 宸ュ簭宸ヤ环浠ｇ爜 = $("#宸ュ簭宸ヤ环浠ｇ爜").val();
var 宸ュ簭浠ｇ爜 = $("#宸ュ簭浠ｇ爜").val();
var 宸ュ簭鍚嶇О = $("#宸ュ簭鍚嶇О").val();
- var 鐗╂枡浠ｇ爜 = $("#鐗╂枡浠ｇ爜").val();
- var 璧勬簮浠ｇ爜 = $("#璧勬簮浠ｇ爜").val();
- var 閮ㄩ棬浠ｇ爜 = $("#閮ㄩ棬浠ｇ爜").val();
- var 鐗╂枡鍚嶇О = $("#鐗╂枡鍚嶇О").val();
- var 璧勬簮鍚嶇О = $("#璧勬簮鍚嶇О").val();
- var 閮ㄩ棬鍚嶇О = $("#閮ㄩ棬鍚嶇О").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -386,24 +338,6 @@
if (宸ュ簭鍚嶇О) {
sWhere += " and 宸ュ簭鍚嶇О like '%" + 宸ュ簭鍚嶇О + "%'";
}
- if (鐗╂枡浠ｇ爜) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + 鐗╂枡浠ｇ爜 + "%'";
- }
- if (璧勬簮浠ｇ爜) {
- sWhere += " and 璧勬簮浠ｇ爜 like '%" + 璧勬簮浠ｇ爜 + "%'";
- }
- if (閮ㄩ棬浠ｇ爜) {
- sWhere += " and 閮ㄩ棬浠ｇ爜 like '%" + 閮ㄩ棬浠ｇ爜 + "%'";
- }
- if (鐗╂枡鍚嶇О) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + 鐗╂枡鍚嶇О + "%'";
- }
- if (璧勬簮鍚嶇О) {
- sWhere += " and 璧勬簮鍚嶇О like '%" + 璧勬簮鍚嶇О + "%'";
- }
- if (閮ㄩ棬鍚嶇О) {
- sWhere += " and 閮ㄩ棬鍚嶇О like '%" + 閮ㄩ棬鍚嶇О + "%'";
- }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -414,12 +348,6 @@
$("#宸ュ簭宸ヤ环浠ｇ爜").val("");
$("#宸ュ簭浠ｇ爜").val("");
$("#宸ュ簭鍚嶇О").val("");
- $("#鐗╂枡浠ｇ爜").val("");
- $("#璧勬簮浠ｇ爜").val("");
- $("#閮ㄩ棬浠ｇ爜").val("");
- $("#鐗╂枡鍚嶇О").val("");
- $("#璧勬簮鍚嶇О").val("");
- $("#閮ㄩ棬鍚嶇О").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -476,12 +404,12 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'Gy_Group/EditBill',
+ url: GetWEBURL() + '/Gy_ProcPrice/DelProcPrice',
type: "GET",
- data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+ data: { "HInterID": ItemID, "User": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
+ layer.msg(result.Message, { time: 1 * 1000,icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
@@ -507,6 +435,39 @@
}
//#endregion
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_ProcPrice/AuditGy_ProcPrice", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
//#region 鍒锋柊
function get_Refresh() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 3fb2d32..938cbdd 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -89,6 +89,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<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="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>
@@ -146,6 +147,9 @@
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鎵撳嵃
+ case 'set_Print': set_Print();
break;
//娴忚
case 'get_PrintReport': get_PrintReport();
@@ -384,6 +388,27 @@
}
//#endregion
+ //鎵撳嵃
+ function set_Print() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].HItemID.toString() + '&MyMsg=' + data[0].HItemID.toString() + '&Type=HSource', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HOrgID = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportOverList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportOverList.html"
index b8c85bc..7e9bac8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportOverList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportOverList.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>宸ュ簭姹囨姤鍏ュ簱鍒楄〃</title>
+ <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">
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 92b4b31..501ced8 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"
@@ -1230,7 +1230,7 @@
if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
- if (sessionStorage["OrganizationID"] == 100038) {
+ if (sessionStorage["OrganizationID"] == 100038) {
if (FirstEndHProcNo == 1) {
//姹囨姤
GetInStorage();
@@ -1239,6 +1239,10 @@
BtnRK();
//鎶ュ簾
BtnBF();
+ if ($("#eventType").val() == "Add") {
+ //鍒ゆ柇鍒犻櫎
+ BtnDel();
+ }
}
}
if (result.Verify == "Y") {
@@ -1711,6 +1715,8 @@
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
});
+ } else if (data.count == 2) {
+
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -1737,6 +1743,8 @@
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
});
+ } else if (data.count == 2) {
+
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -1748,6 +1756,33 @@
});
}
+ //鍒犻櫎鏈悓姝ュ埌閲戣澏鐨勫崟鎹�
+ function BtnDel() {
+ var HInterID = $("#HInterID").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationOutBill/DelStationOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "HInterID": HInterID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ // parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ //});
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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_ProcessExchangeBill_Mul.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_ProcessExchangeBill_Mul.html"
index d9d8723..1fbb3fa 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_ProcessExchangeBill_Mul.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_ProcessExchangeBill_Mul.html"
@@ -775,33 +775,35 @@
var num = [];
for (var i = 0; i < option2.data.length; i++) {
- //娴佹按鍙�
- if ($.inArray(option2.data[i]["HProcNo"], num) == -1) {
- num.push(option2.data[i]["HProcNo"]);
- }
- else {
- layer.msg("绗�" + (i + 1) + "琛�,娴佹按鍙�:" + option2.data[i]["HProcNo"] + "閲嶅!");
- return false;
- }
- if (!option2.data[i].HProcNo) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (option2.data[i].HProcNo == 0) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!option2.data[i].HProcID) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (!option2.data[i].HCenterID) {
- var indexRow = i + 1;
- layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
+ if (option2.data[i]!="") {
+ //娴佹按鍙�
+ if ($.inArray(option2.data[i]["HProcNo"], num) == -1) {
+ num.push(option2.data[i]["HProcNo"]);
+ }
+ else {
+ layer.msg("绗�" + (i + 1) + "琛�,娴佹按鍙�:" + option2.data[i]["HProcNo"] + "閲嶅!");
+ return false;
+ }
+ if (!option2.data[i].HProcNo) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (option2.data[i].HProcNo == 0) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝娴佹按鍙蜂笉鑳戒负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!option2.data[i].HProcID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝宸ュ簭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!option2.data[i].HCenterID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝宸ヤ綔涓績涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
}
}
return true;
--
Gitblit v1.9.1