From ecb191aadfef8c12781a9b4615db9b26288247ff Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 24 九月 2024 22:45:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/excel/Gy_Customer_Excel.html | 253 ++++
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 246 ++-
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html | 10
WebTM/views/系统管理/模块管理/Xt_XtgnbList.html | 4
WebTM/views/基础资料/基础资料/Gy_ConkReasonList_Excel.html | 230 ++++
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 56
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 10
WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould.html | 15
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 2
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 34
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 34
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html | 20
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 16
WebTM/views/车间管理/防错验证/Gy_MaterPreventErrMouldBillList.html | 2
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 8
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html | 14
WebTM/views/系统管理/单据类型/Xt_BillTypeList.html | 4
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 21
WebTM/views/index.html | 1
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 21
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 284 ++--
WebTM/WebTM.csproj.user | 2
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 36
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 15
WebTM/views/indexMenu.html | 20
WebTM/views/模治具管理/器具报表/Sc_MoldMainoverdueWarnReport.html | 295 +++++
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 12
WebTM/views/系统管理/用户管理/Xt_UserSuplies.html | 56
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit.html | 2
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 232 ++-
WebTM/views/系统管理/系统参数管理/Xt_SystemParameterList.html | 4
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMainList.html | 30
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 274 +++-
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 71
WebTM/views/基础资料/公用基础资料/excel/Gy_Warehouse_Excel.html | 230 ++++
WebTM/views/基础资料/基础资料/Gy_ConkReasonList.html | 15
WebTM/views/基础资料/公用基础资料/excel/Gy_Department_excel.html | 230 ++++
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 163 +-
WebTM/views/系统管理/日志管理/Xt_SystemLogList.html | 4
WebTM/layuiadmin/Scripts/webConfig.js | 11
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 3
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBill.html | 2
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 126 +-
WebTM/WebTM.csproj | 16
WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould_Excel.html | 230 ++++
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 10
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html | 2
47 files changed, 2,718 insertions(+), 658 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7a4d258..6e940fe 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -347,10 +347,16 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TechnologyParameterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType_Excel.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType_Excel.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material_Excel.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MouldType_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Customer_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Department_excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectBasis_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectInstruMent_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QualityStd_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectMethod_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_CheckItem_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectValue_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QCCheckClass_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Warehouse_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\SumAdd_Gy_RestDay.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_RestDay.html" />
@@ -379,6 +385,7 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheck_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Repair_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Maintain_Excel.html" />
@@ -390,6 +397,7 @@
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MoldMainoverdueWarnReport.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldLifeUsePicReport.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldDotCheckTaskReport.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldMaintainTaskReport.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 50873e6..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 680227c..94e7b45 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,18 +5,13 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- /* var WEBURL = "http://localhost:8082/API/"; */ //鏉滆春鏈湴閰嶇疆
- //var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃� */
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
- /*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- /* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
- //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
index d522e42..f3e2438 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
@@ -70,6 +70,7 @@
<option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
<option value="3721">鐢熶骇澶囨枡鍗�</option>
<option value="1214">鐢熶骇鍙戞枡閫氱煡鍗�</option>
+ <option value="3710">鐢熶骇璁㈠崟</option>
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -655,6 +656,14 @@
$("#HMainSourceBillType").empty();
var optionHtml = '';
optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (d.data[0].HSourceBillType == "3710") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇璁㈠崟' + "</option>";
$("#HMainSourceBillType").append(optionHtml);
layui.form.render('select');
$("#HMainSourceBillType").attr("disabled", "disabled");
@@ -1347,6 +1356,9 @@
else if (HSourceBillType == '1214') {
HSourceTitle = "鐢熶骇鍙戞枡閫氱煡鍗�";
}
+ else if (HSourceBillType == '3710') {
+ HSourceTitle = "鐢熶骇璁㈠崟";
+ }
layer.open({
type: 2
@@ -1622,6 +1634,14 @@
layui.form.render('select');
$("#HMainSourceBillType").attr("disabled", "disabled");
}
+ else if (result.data.hSourceBillTypeField == "3710") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇璁㈠崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
else {
$("#HMainSourceBillType").empty();
var optionHtml = '';
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 1cddf4a..06edaa3 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -824,6 +824,7 @@
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_StockCheckItemList.html">鐩樼偣鏂规鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Sc_MouldStockBillMain_Temp.html">鐩樼偣璁板綍琛�</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/InventoryAnalysis.html">鐩樼偣鍒嗘瀽鍒楄〃</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Sc_MoldMainoverdueWarnReport.html">妯″叿淇濆吇閫炬湡棰勮鎶ヨ〃</a></dd>
</dl>
</dd>
</dl>
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index 4fa5b0e..81b80c7 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -156,7 +156,7 @@
<!-- 涓讳綋鍐呭 -->
<div class="layui-body" id="LAY_app_body">
<div class="layadmin-tabsbody-item layui-show">
- <iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>
+ <iframe src="home/console.html" frameborder="0" class="layadmin-iframe" name="mainIFrame"></iframe>
</div>
</div>
@@ -232,7 +232,6 @@
}
//閬嶅巻鐢熸垚涓昏彍鍗�
function MenuMain(data) {
-
var liStr = '';
//閬嶅巻鐢熸垚涓昏彍鍗�
for (var i = 0; i < data.length; i++) {
@@ -253,7 +252,7 @@
}
liStr += '</dl></li>';
} else {
- liStr += '<li class="layui-nav-item"><a class="" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
+ liStr += '<li class="layui-nav-item"><a class="" id = "' + data[i].Hurl + '" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
}
};
$(".layui-nav-tree").html(liStr);
@@ -274,12 +273,10 @@
subStr += '</dl>';
subStr += '</dd>';
} else {
- subStr += '<dd><a lay-href="' + subMenu.Hurl + '">'+ subMenu.HName + '</a></dd>';
+ subStr += '<dd><a lay-href="' + subMenu.Hurl + '" id = "' + subMenu.Hurl + '">'+ subMenu.HName + '</a></dd>';
}
return subStr;
}
-
-
//鑿滃崟鑷畾涔夛細寮瑰嚭鑿滃崟鑷畾涔夊瓙椤甸潰
Ul = document.getElementById("MenuDefineID");
@@ -313,6 +310,17 @@
document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
+
+ function openChildPage(id) {
+ //鑾峰彇椤甸潰
+ var num = document.getElementById(id);
+ num.href = id;
+ num.target = "mainIFrame";
+ num.click();
+
+ console.log(num);
+
+ }
</script>
<!--<script>
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_DepartmentList.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_DepartmentList.html"
index 0e498d7..8125adc 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_DepartmentList.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_DepartmentList.html"
@@ -93,6 +93,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_ref"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -173,6 +174,9 @@
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//娴忚
case 'get_PrintReport': get_PrintReport();
@@ -297,6 +301,17 @@
}
//#endregion
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閮ㄩ棬瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_Department_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
option = {
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_Material.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_Material.html"
index ab0e607..a7d8ff9 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_Material.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_Material.html"
@@ -172,11 +172,11 @@
</div>
</div>
</div>
- <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
- <div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
+ <div >
+ <table class="" id="mainTable" lay-filter="mainTable" ></table>
</div>
- <div id="page"></div>
+ <div id="page" style="position:relative;bottom:0;"></div>
</div>
</div>
</div>
@@ -457,7 +457,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-80'
+ , height: 'full-150'
, page: false
, limit: 50
, done: function (res, curr, count) {
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_PreventErrMould.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_PreventErrMould.html"
index 5b07fb1..ab3441e 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_PreventErrMould.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_PreventErrMould.html"
@@ -85,6 +85,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -167,6 +168,9 @@
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -431,7 +435,16 @@
});
}
//#endregion
-
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '闃查敊瑁呯疆瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_PreventErrMould_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
//#region 鏂板
function set_AddNew() {
layer.open({
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_PreventErrMould_Excel.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_PreventErrMould_Excel.html"
new file mode 100644
index 0000000..a437a95
--- /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_PreventErrMould_Excel.html"
@@ -0,0 +1,230 @@
+锘�<!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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;" >
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], 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
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_PreventErrMould/Gy_PreventErrMould_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: '闃查敊瑁呯疆鍚嶇О', title: '闃查敊瑁呯疆鍚嶇О', width: 120 }
+ , { field: '闃查敊瑁呯疆浠ｇ爜', title: '闃查敊瑁呯疆浠ｇ爜', width: 120 }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_PreventErrMould/Gy_PreventErrMould_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#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_Warehouse.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_Warehouse.html"
index 90e2830..4543708 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_Warehouse.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_Warehouse.html"
@@ -140,15 +140,11 @@
<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-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-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="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
@@ -224,9 +220,11 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
-
//缂栬緫
case 'set_ShowBill': set_ShowBill();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
@@ -408,7 +406,16 @@
}
//#endregion
-
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_Warehouse_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
//#region 鏌ヨ
function get_Display(sWhere) {
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/excel/Gy_Customer_Excel.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/excel/Gy_Customer_Excel.html"
new file mode 100644
index 0000000..d6569f5
--- /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/excel/Gy_Customer_Excel.html"
@@ -0,0 +1,253 @@
+锘�<!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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], 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
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_Customer/Gy_Process_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , 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: '鍦板潃' }
+ , { field: '閭紪', title: '閭紪' }
+ , { field: '閭', title: '閭' }
+ , { field: '娉曚汉浠ｈ〃', title: '娉曚汉浠ｈ〃' }
+ , { field: '閾惰璐﹀彿', title: '閾惰璐﹀彿' }
+ , { field: '绋庡姟鐧昏鍙�', title: '绋庡姟鐧昏鍙�' }
+ , { field: '绋庣巼', title: '绋庣巼' }
+ , { field: '鑻辨枃鍚嶇О', title: '鑻辨枃鍚嶇О' }
+ , { field: '鑻辨枃鍦板潃', title: '鑻辨枃鍦板潃' }
+ , { field: '鍥藉', title: '鍥藉' }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�' }
+ , { field: '瀹㈡埛鐘舵��', title: '瀹㈡埛鐘舵��' }
+ , { field: '澶囨敞', title: '澶囨敞' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"] + '&鍜�' + sessionStorage["OrganizationID"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_Customer/Gy_Process_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#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/excel/Gy_Department_excel.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/excel/Gy_Department_excel.html"
new file mode 100644
index 0000000..f0b83f8
--- /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/excel/Gy_Department_excel.html"
@@ -0,0 +1,230 @@
+锘�<!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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], 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
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_Department/Gy_Process_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , 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: '澶囨敞' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"] + '&鍜�' + sessionStorage["OrganizationID"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_Department/Gy_Process_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#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/excel/Gy_Warehouse_Excel.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/excel/Gy_Warehouse_Excel.html"
new file mode 100644
index 0000000..a542319
--- /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/excel/Gy_Warehouse_Excel.html"
@@ -0,0 +1,230 @@
+锘�<!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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], 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
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + 'Gy_Warehouse/Gy_Process_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , 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: '澶囨敞' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"] + '&鍜�' + sessionStorage["OrganizationID"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_Warehouse/Gy_Process_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#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\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
index ebd0ec0..549237a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
@@ -83,6 +83,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-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="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
@@ -155,6 +156,9 @@
break;
//鍒犻櫎
case 'btn-Delete': set_DeleteBill();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//瀹℃牳鎸夐挳
case 'btn-Audit':
@@ -404,7 +408,16 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
-
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏁呴殰鍘熷洜瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_ConkReasonList_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList_Excel.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList_Excel.html"
new file mode 100644
index 0000000..86d03fa
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList_Excel.html"
@@ -0,0 +1,230 @@
+锘�<!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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;" >
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], 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
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_ConkReason/Gy_ConkReason_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: '鏁呴殰鍘熷洜', title: '鏁呴殰鍘熷洜', width: 120 }
+ , { field: '鏁呴殰鍘熷洜浠ｇ爜', title: '鏁呴殰鍘熷洜浠ｇ爜', width: 120 }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_ConkReason/Gy_ConkReason_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#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/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 1885000..98ec95d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -130,6 +130,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btnAdd" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-NumAdd" id="btn-NumAdd"><i class="layu i-iconlayuiiconfileb"></i>娴佹按鍙锋柊澧�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -238,6 +239,9 @@
break;
//缂栬緫
case 'btnModify': set_ShowBill();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//鍒犻櫎
case 'btndelete': set_DeleteBill();
@@ -472,6 +476,17 @@
}
//#endregion
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '瀹㈡埛瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_Customer_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
//#region 鏌ヨ (鍏宠仈鐢ㄦ埛)
function get_Display1(HCusID) {
var ajaxLoad = layer.load();
@@ -547,6 +562,7 @@
get_Display1(HCusID); //甯﹀嚭瀛愯〃[鍏宠仈鐢ㄦ埛]鏁版嵁
});
//#endregion
+
//#region 閫変腑琛屾敼鍙橀鑹�
function check_row(obj) {
var flag = !obj.tr.find(':checkbox:first').prop('checked');
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
index 8bca499..cd1b5f0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
@@ -646,7 +646,7 @@
, "HMangerName": d.data[0].璐熻矗浜�
, "HRemark": d.data[0].琛ㄥご澶囨敞
//鍏朵粬淇℃伅
- , "hmakers": d.data[0].鍒跺崟浜�
+ , "hmaker": d.data[0].鍒跺崟浜�
, "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
, "hchecker": d.data[0].瀹℃牳浜�
, "hcheckdate": d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MoldMainoverdueWarnReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MoldMainoverdueWarnReport.html"
new file mode 100644
index 0000000..4fd6902
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MoldMainoverdueWarnReport.html"
@@ -0,0 +1,295 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>妯″叿淇濆吇閫炬湡棰勮鎶ヨ〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">妯″叿鍒嗙被锛�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HMouldType" name="HMouldType" id="HMouldType" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <input type="hidden" name="HMouldTypeID" id="HMouldTypeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouldType" id="btnHMouldType" style="">
+ <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="margin-left:40px;">
+ 鏌ヨ
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExit" id="btnExit" style="padding:0 5px">閫�鍑�</button>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ , tree = layui.tree
+ var sWhere = "";
+ var option = [];
+ var HModName = "Sb_EquipMaintainWarningReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "Hprocid", "HUSEORGID","璁惧绫诲瀷"];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //閫�鍑烘寜閽�
+ form.on('submit(btnExit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //妯″叿鍒嗙被
+ form.on('submit(btnHMouldType)', function (data) {//閫夋嫨璁惧鍒嗙被
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '璁惧鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMouldTypeID").val(checkStatus.data[0].HItemID);
+ $("#HMouldType").val(checkStatus.data[0].HName);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ var HMouldTypeID = $("#HMouldTypeID").val();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldRepairCheckTaskReport/Sc_MoldMainoverdueWarnReport',
+ type: "GET",
+ data: { "HMouldTypeID": HMouldTypeID,"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //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;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , totalRow: true
+ , done: function (res, curr, count) {
+ ////淇敼鍗曞厓鏍奸鑹�
+ ////宸茬偣妫� Y
+ ////鏈偣妫� E
+ ////棰勮 P
+ //var that = this.elem.next();
+ //res.data.forEach(function (item, index) {
+ // var tr = that.find("[data-index=" + index + "]").children();
+ // tr.each(function () {
+ // var tableText = $(this).text(); //鍗曞厓鏍间腑鐨勫唴瀹�
+ // if (tableText == "Y") {
+ // $(this).css("background-color", "#D6F7D1");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#ff241c");//鍗曞厓鏍煎瓧浣撻鑹�
+ // }
+ // else if (tableText == "E") {
+ // $(this).css("background-color", "#F5C6C6");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#45ff2a");//鍗曞厓鏍煎瓧浣撻鑹�
+ // } else if (tableText == "P") {
+ // $(this).css("background-color", "#F5F5C1");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#45ff2a");//鍗曞厓鏍煎瓧浣撻鑹�
+ // } else {
+ // //$(this).css("background-color", "#fffefd");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#45ff2a");//鍗曞厓鏍煎瓧浣撻鑹�
+ // }
+ // })
+ //})
+
+ soulTable.render(this);
+ }
+ }
+
+ ins = table.render(option);
+
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ } else {
+ option.data = data1.data
+ ins = table.render(option);
+ 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(sql) {
+ var HMouldType = $("#HMouldType").val();
+
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HMouldType").val("");
+ $("#HMouldTypeID").val("0");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , height: 'full-50'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 20000]
+ , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , cellMinWidth: 200
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 4de8122..9bc42e3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -228,6 +228,12 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁翠慨鍙楃悊鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HRepairAccepDate" id="HRepairAccepDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -913,6 +919,9 @@
laydate.render({
elem: '#HRepairEndDate'
});
+ laydate.render({
+ elem: '#HRepairAccepDate'
+ });
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -1006,6 +1015,7 @@
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HRepairBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HRepairEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HRepairAccepDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
}
});
}
@@ -1065,7 +1075,7 @@
, "HMainSourceBillNo": data.HMainSourceBillNo
, "HMainSourceInterID": data.HMainSourceInterID
, "HMainSourceEntryID": data.HMainSourceEntryID
-
+ , "HRepairAccepDate": formatDate(data.缁翠慨鍙楃悊鏃ユ湡)
});
} else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
index c4c02ab..b9208c0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
@@ -129,6 +129,32 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">瑕佹眰瀹屾垚鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" id="HRequestComDate" name="HRequestComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈�杩戜繚鍏绘ā鏁�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HRecentMainModule" lay-verify="HRecentMainModule" id="HRecentMainModule" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绱妯℃暟</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCumulativeModule" lay-verify="HCumulativeModule" id="HCumulativeModule" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈鐢熶骇妯℃暟</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProductionModule" lay-verify="HProductionModule" id="HProductionModule" value="0" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
@@ -1016,6 +1042,9 @@
laydate.render({
elem: '#HEndDate'
});
+ laydate.render({
+ elem: '#HRequestComDate'
+ });
}
//鍒濆鍖栬〃鏍�
@@ -1127,6 +1156,7 @@
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HRequestComDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
}
});
@@ -1162,6 +1192,10 @@
, "HMouldMaintainRuleInterNo": data.鍣ㄥ叿淇濆吇瑙勭▼
, "HMaintainLevID": data.HMaintainLevID
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
+ , "HRequestComDate": formatDate(data.瑕佹眰瀹屾垚鏃ユ湡)
+ , "HRecentMainModule": data.鏈�杩戜繚鍏绘ā鏁�
+ , "HCumulativeModule": data.绱妯℃暟
+ , "HProductionModule": data.鏈鐢熶骇妯℃暟
});
if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
index 3758c31..ad76b61 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
@@ -81,6 +81,7 @@
<label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
<div class="layui-input-inline">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
+ <option value="娆�">娆�</option>
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
<option value="骞�">骞�</option>
@@ -94,6 +95,24 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">淇濆吇棰勮娆℃暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
<label class="layui-form-label">璁″垝寮�濮嬫棩鏈�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
@@ -105,35 +124,9 @@
<input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:530px;"></textarea>
- </div>
- </div>
- <div class="layui-inline" style="margin-left:340px;">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:530px;"></textarea>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
- <div class="layui-input-inline" >
+ <div class="layui-input-inline">
<input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;float:left;width:150px;" readonly>
<input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="width: 40px;">
@@ -148,6 +141,20 @@
<select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:530px;"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:340px;">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:530px;"></textarea>
</div>
</div>
</div>
@@ -358,6 +365,7 @@
$("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
$("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
$("#HCheckCycle").val(checkStatus.data[0].淇濆吇鍛ㄦ湡);
+ $("#HErrWarQtys").val(checkStatus.data[0].淇濆吇棰勮娆℃暟);
form.render('select');
get_DocCheckItem2(checkStatus.data[0].hmainid);
@@ -637,6 +645,10 @@
, { field: 'HErrBeginTime', title: '棰勮寮�濮嬫椂闂寸偣' }
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
+ , { field: 'HSendFlag', title: '鍙戦�佹爣璁�' }
+ , { field: 'HErrBeginQty', title: '棰勮寮�濮嬫鏁�' }
+ , { field: 'HUseNowQty', title: '褰撳墠浣跨敤娆℃暟' }
+ , { field: 'HUseEndQty', title: '缁撴潫浣跨敤娆℃暟' }
];
option_plan = {
id: 'mainTable_plan'
@@ -675,7 +687,7 @@
table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0, "HSendFlag": "0", "HErrBeginQty": "", "HUseNowQty": "", "HUseEndQty": "" }];
table.render(option_plan);
}
@@ -754,6 +766,7 @@
, "HUSEORGID": data.HUSEORGID
, "HDeptID": data.HDeptID
, "HDeptName": data.閮ㄩ棬鍚嶇О
+ , "HErrWarQtys": data.淇濆吇棰勮娆℃暟
});
if ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) {
$("#HUSEORGID").val(sessionStorage["OrganizationID"])
@@ -821,7 +834,7 @@
rowdata.push(
{
"HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].瀹夊叏缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
- ,"HErrBeginTime": Pub_Format(data[i].棰勮寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
+ , "HErrBeginTime": Pub_Format(data[i].棰勮寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧, "HSendFlag": data[i].淇℃伅鏍囪, "HErrBeginQty": data[i].棰勮寮�濮嬫鏁�, "HUseNowQty": data[i].褰撳墠浣跨敤娆℃暟, "HUseEndQty": data[i].缁撴潫浣跨敤娆℃暟
}
)
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
index 6583de5..0941ea2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
@@ -78,6 +78,7 @@
<label class="layui-form-label">鍛ㄦ湡鍗曚綅<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
+ <option value="娆�">娆�</option>
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
<option value="骞�">骞�</option>
@@ -108,6 +109,12 @@
<label class="layui-form-label">淇濆吇棰勮澶╂暟</label>
<div class="layui-input-inline">
<input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇棰勮娆℃暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0">
</div>
</div>
</div>
@@ -546,6 +553,7 @@
, "HUseQtys": data.淇濆吇鍐插埡鏁�
, "HSafeDays": data.淇濆吇瀹夊叏澶╂暟
, "HErrWarDays": data.淇濆吇棰勮澶╂暟
+ , "HErrWarQtys": data.淇濆吇棰勮娆℃暟
});
} else {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 6f0f72b..99e3cd5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -344,6 +344,16 @@
<input class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杞﹂棿:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCenterName" id="HCenterName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HCenterID" id="HCenterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCenterList" id="HCenterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
</div>
<!--鍏朵粬淇℃伅-->
@@ -559,8 +569,7 @@
set_EditFromGrid();
}
else if (OperationType == 4) {
- set_AddFNew();
- $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ set_AddFNew();
var EquipNumber = "";//璁惧浠ｇ爜
var HSourceName1 = "";//鐢熶骇璧勬簮鍚嶇О
var HTypes = "";//寮傚父绫诲瀷
@@ -760,6 +769,9 @@
$("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
+ $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ $("#HCenterName").val(sessionStorage["HWorkCenter"]); //宸ヤ綔涓績
+ $("#HCenterID").val(sessionStorage["HWorkCenterID"]); //宸ヤ綔涓績
}
//鏈夋簮鍗曟柊澧�
@@ -833,6 +845,8 @@
, "HSendMan": data.HSendMan
, "HDeptID": data.HDeptID
, "HDeptName": data.HDeptName
+ , "HCenterID": data.HCenterID
+ , "HCenterName": data.HCenterName
, "HReceiveMan": data.HReceiveMan
, "HCopyMan": data.HCopyMan
, "HMainSourceInterID": data.HSourceInterID //婧愬崟ID
@@ -1109,6 +1123,44 @@
});
});
+ //杞﹂棿(宸ヤ綔涓績)
+ form.on('submit(HCenterList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ヤ綔涓績鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
+ $("#HCenterID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鎺ユ敹浜�(浣滃簾)
form.on('submit(HReceiveManList0)', function () {
//椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
index 73df689..069272f 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
@@ -353,7 +353,7 @@
, limits: [50, 500, 5000, 20000]
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -814,7 +814,7 @@
//#region 瀵煎嚭Execel
function get_Export() {
- var ModRightNameCheck = "Xt_SystemLogListExcel";
+ var ModRightNameCheck = "Gy_Warehouse_ExportExcel";
//閫昏緫瀹℃牳鏂规硶
$.ajax({
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
index b964f66..3bf0ede 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
@@ -579,7 +579,7 @@
, limits: [50, 500, 5000, 20000]
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -898,7 +898,7 @@
//#region 瀵煎嚭Execel
function get_Export() {
- var ModRightNameCheck = "Xt_SystemLogListExcel";
+ var ModRightNameCheck = "Gy_Warehouse_ExportExcel";
//閫昏緫瀹℃牳鏂规硶
$.ajax({
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
index defaab1..f25567e 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
@@ -395,7 +395,7 @@
, limits: [50, 500, 5000, 20000]
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -847,7 +847,7 @@
//#region 瀵煎嚭Execel
function get_Export() {
- var ModRightNameCheck = "Xt_SystemLogListExcel";
+ var ModRightNameCheck = "Gy_Warehouse_ExportExcel";
//閫昏緫瀹℃牳鏂规硶
$.ajax({
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
index 53c2c5c..941d38a 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
@@ -43,7 +43,8 @@
<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>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" >閫�鍑�</button>-->
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" onclick='window.frames["绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserSupliesList.html"] '>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Excel">Excel瀵煎叆</button>
</div>
</div>
@@ -145,7 +146,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = TabRow;
+ var NewRow = { "HSupID": 0, "HSupperNumber": "", "HSupperName": "" };//涓嶈兘鐢╰abrow浠ｆ浛锛宭ayui浼氳嚜鍔ㄥ姞涓奿ndex灞炴��
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -263,13 +264,33 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+ var OptionData = checkStatus.data;
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;//鑾峰彇閫夋嫨鍒楃殑绱㈠紩
+ for (var i = 0; i < OptionData.length; i++) { //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害 鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+ if (rowIndex + i >= option.data.length) { //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+ var NewRow = { "HSupID": 0, "HSupperNumber": "", "HSupperName": "" }; // 鍒涘缓涓�涓柊鐨勫寘鍚暟缁�
+
+ table.cache["mainTable"].push(NewRow); //鍒涘缓鏂扮殑鍖呭惈鏁扮粍 浼犲叆table.cache["mainTable"]鏁扮粍
+ option.data = table.cache["mainTable"]; //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+
+ table.render(option);//娓叉煋鐣岄潰
+ }
+ option.data[rowIndex + i].HSupID = OptionData[i].HItemID;
+ option.data[rowIndex + i].HSupperNumber = OptionData[i].HNumber;
+ option.data[rowIndex + i].HSupperName = OptionData[i].HName;
+ }
+ table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+ } else {
+ obj.update({
+ HSupID: checkStatus.data[0].HItemID,
+ HSupperNumber: checkStatus.data[0].HNumber,
+ HSupperName: checkStatus.data[0].HName
+ });
+ }
//console.log(obj.data);
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HSupID: checkStatus.data[0].HItemID,
- HSupperNumber: checkStatus.data[0].HNumber,
- HSupperName: checkStatus.data[0].HName
- });
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -345,9 +366,12 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
if (params[1] != null) {
- Pub_Close(1);
- } else if (params[1] == null) {
Pub_Close(2);
+ } else if (params[1] == null) {
+ var parentWindow = window.parent;
+ Pub_Close(2);
+ parentWindow.openChildPage("绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserSupliesList.html");
+
}
});
@@ -384,7 +408,7 @@
}
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
- option.data = [TabRow];
+ option.data = [{ "HSupID": 0, "HSupperNumber": "", "HSupperName": "" }];
table.render(option);
}
@@ -444,16 +468,10 @@
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
- var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ table.cache["mainTable"].push(NewRow);//灏哊ewRow瀵硅薄娣诲姞鍒皌able.cache["mainTable"]鏁扮粍涓�, 鏁扮粍瀛樺偍浜嗚〃鏍肩殑鎵�鏈夎鏁版嵁
+ option.data = table.cache["mainTable"];//鏇存柊option.data涓烘柊鐨勬暟鎹暟缁勬樉绀哄埌琛ㄦ牸涓� //灏嗘暟鎹粦瀹氬埌data涓�
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < tableBak.length; i++) {
- buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
- }
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ table.render(option); //娓叉煋琛ㄦ牸
}
//澶嶅埗涓�琛�
function btnCopyLine(data) {
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
index 81fd545..721fe9a 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
@@ -402,7 +402,7 @@
, limits: [50, 500, 5000, 20000]
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -876,7 +876,7 @@
//#region 瀵煎嚭Execel
function get_Export() {
- var ModRightNameCheck = "Xt_SystemLogListExcel";
+ var ModRightNameCheck = "Gy_EmployeeList_ExportExcel";
//閫昏緫瀹℃牳鏂规硶
$.ajax({
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_MaterialTechParamBillMain.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_MaterialTechParamBillMain.html"
index 129360f..4bd3d76 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_MaterialTechParamBillMain.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_MaterialTechParamBillMain.html"
@@ -413,27 +413,27 @@
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
}
- //else if (OperationType == 2) {
-
- // RoadBillMain(linterid);
- // $.ajax({
- // url: GetWEBURL() + "/Web/GetMAXNum",
- // type: "GET",
- // async: false,
- // data: { "HBillType": '3301' },
- // success: function (d) {
- // $("#HInterID").val(d.data[0].HInterID);
- // $("#HBillNo").val(d.data[0].HBillNo);
- // $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- // }
- // });
- //}
+ else if (OperationType == 2) {
+ //鍒濆鍖栬〃鏍�
+ get_InitGrid();
+ RoadBillMain(linterid);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3334' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ });
+ }
else if (OperationType == 3) {
//绂佺敤鎸夐挳
var num = 1;
HfBtn(num);
- debugger;
//鍒濆鍖栬〃鏍�
get_InitGrid();
@@ -1313,8 +1313,8 @@
var tableSub = result.data[1];
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HInterID": tableMain[0]["HInterID"]
- , "HBillNo": tableMain[0]["鍗曟嵁鍙�"]
+ "HInterID": OperationType == 2 ? "" : tableMain[0]["HInterID"]
+ , "HBillNo": OperationType == 2 ? "" : tableMain[0]["鍗曟嵁鍙�"]
, "HDate": Format(new Date(tableMain[0]["鏃ユ湡"]), "yyyy-MM-dd")
, "HMaterID": tableMain[0]["HMaterID"]
, "HMaterNumber": tableMain[0]["鐗╂枡浠ｇ爜"]
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 047d900..710c58d 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"
@@ -162,7 +162,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<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="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -238,6 +238,9 @@
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
@@ -602,7 +605,7 @@
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
}
if (number==2) {
- if (HProject) {
+ if (HProject!='0') {
sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
}
}
@@ -719,6 +722,29 @@
}
//#endregion
+ //澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HInterID.toString();
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浜у搧宸ヨ壓鍙傛暟娓呭崟-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_MaterialTechParamBillMain.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//#region 鍒犻櫎
function set_DeleteBill() {
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 9289b2e..f38dee9 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"
@@ -830,7 +830,7 @@
sWhere += " and HOrgID = '" + HOrgID + "'";
}
if (number==2) {
- if (HProject) {
+ if (HProject!='0') {
sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
}
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index ba77c7e..eec789e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -173,6 +173,36 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绱ф�ョ▼搴�</label>
+ <div class="layui-input-inline">
+ <select name="HUrgenLevel" lay-filter="HUrgenLevel" id="HUrgenLevel">
+ <option value="浣�" selected="selected">浣�</option>
+ <option value="涓�">涓�</option>
+ <option value="楂�">楂�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶ヤ慨绫诲埆</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HRepairCategory" id="HRepairCategory" class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶ヤ慨浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HRepairer" id="HRepairer" class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄惁鏈変骇鑳藉奖鍝�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HIsCapacityImpact" id="HIsCapacityImpact" class="layui-input" value="">
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -916,6 +946,10 @@
, "HMainSourceBillNo": data.HMainSourceBillNo
, "HMainSourceInterID": data.HMainSourceInterID
, "HMainSourceEntryID": data.HMainSourceEntryID
+ , "HRepairCategory": data.鎶ヤ慨绫诲埆
+ , "HUrgenLevel": data.绱ф�ョ▼搴�
+ , "HRepairer": data.鎶ヤ慨浜�
+ , "HIsCapacityImpact": data.鏄惁鏈変骇鑳藉奖鍝�
});
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index 7a7f77f..a6177a4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -1295,9 +1295,10 @@
layui.table.reload('mainTable', {
data: updatedData
});
-
// 鍙栨秷缂栬緫鐘舵��
cell.removeAttr('contenteditable');
+ //鍙栨秷鍐掓场
+ event.stopPropagation();
});
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index 2809d20..1807470 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -176,7 +176,7 @@
<label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HSellSupName" id="HSellSupName" style="float:left;width:150px;">
- <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -1448,13 +1448,7 @@
success: function (data) {
if (data.count == 1) {
layer.msg(data.Message, { time: 1 * 10000, icon: 1 }, function () {
- if (linterid == undefined) {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- location.reload();
- }
- else {
- location.reload();
- }
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
});
}
else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
index 029286f..15c1aad 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
@@ -333,7 +333,19 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
+ if (data[i].name == "鐓х墖璺緞") {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150, templet: function (e) {
+ var html = "";
+ if (e.宸ュ簭鍚嶇О == "鎷嶇収" ) {
+ html = '<a style="color:#1E9FFF" href="' + e.鐓х墖璺緞 + '" target="main_self_frame">' + e.鐓х墖璺緞+'</a>';
+ }
+ return html
+ }
+ });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
+ }
}
}
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
index 8dd1a92..41a03d4 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
@@ -931,7 +931,7 @@
"HCheckNoteItemName": tableSub[i]["妫�鏌ラ」鐩�"],
"HCheckPostID": tableSub[i]["HCheckPostID"],
"HCheckPostName": tableSub[i]["纭鑰呰鑹�"],
- "HDotCheckType": tableSub[i]["鐐规绫诲瀷"],
+ "HDotCheckType": tableSub[i]["鐐规绫诲瀷"] == null ? "璁惧" : tableSub[i]["鐐规绫诲瀷"],
"HRelationID": tableSub[i]["HRelationID"],
"HRelationName": relationName,
"HRemark": tableSub[i]["琛ㄤ綋澶囨敞"]
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
index 8be3475..3559bc0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
@@ -1376,7 +1376,7 @@
"HCheckPostID": tableSub[i]["纭鑰呰鑹睮D"],
"HCheckPostName": tableSub[i]["纭鑰呰鑹�"],
"HDotCheckType": tableSub[i]["鐐规绫诲瀷"],
- "HRelationID": tableSub[i]["HRelationID"],
+ "HRelationID": tableSub[i]["HRelationID"] == null ? "0" : tableSub[i]["HRelationID"],
"HRelationName": relationName,
"HCheckResult": "",
"HRemark": ""
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_ProcessExchangeArrangement_PG.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_ProcessExchangeArrangement_PG.html"
index f60e65f..418eecd 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_ProcessExchangeArrangement_PG.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_ProcessExchangeArrangement_PG.html"
@@ -400,6 +400,8 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鏍规嵁鐢ㄦ埛甯﹀嚭閮ㄩ棬 宸ヤ綔涓績
+ get_UserList();
//鏌ヨ
get_Display(sWhere);
get_Display2(sWhere);
@@ -594,6 +596,14 @@
});
}
+ //鏍规嵁鐢ㄦ埛甯﹀嚭閮ㄩ棬 宸ヤ綔涓績
+ function get_UserList() {
+ $("#HDeptID").val(sessionStorage["HDeptID"] );
+ $("#HDeptName").val(sessionStorage["HDept"]);
+ $("#HCenterID").val(sessionStorage["HWorkCenterID"]);
+ $("#HCenterName").val(sessionStorage["HWorkCenter"]);
+ }
+
//杞﹂棿閫夋嫨椤甸潰
function btnHDeptID() {
layer.open({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
index 0eb26c6..dc73eca 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
@@ -430,7 +430,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_MaterPreventErrMouldBill/get锘縂y_MaterPreventErrMouldBillMainList',
+ url: GetWEBURL() + '/Gy_MaterPreventErrMouldBill/get锘縂y_MaterPreventErrMouldBillMainList_Main',
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 16ecad9..14bc4e7 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -54,7 +54,9 @@
<h1 style="text-align: center; padding: 10px 0;"><b>搴斾粯鍗�</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
+
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -81,9 +83,9 @@
<!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
</select>
<!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
- <option style="color:blue;" selected="selected" value="1102">閲囪喘璁㈠崟</option>
- <option style="color:blue;" value="1201">閲囪喘鍏ュ簱鍗�</option>
- </select>-->
+ <option style="color:blue;" selected="selected" value="1102">閲囪喘璁㈠崟</option>
+ <option style="color:blue;" value="1201">閲囪喘鍏ュ簱鍗�</option>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -100,14 +102,14 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="width:625px">
+ <div class="layui-inline" >
<label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 505px" readonly>
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 505px;">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 150px" readonly>
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 150px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-inline">
@@ -130,24 +132,6 @@
</button>
</div>
</div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
- <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">閲囪喘鏂瑰紡</label>
<div class="layui-input-inline">
@@ -158,17 +142,8 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撶畻鏂瑰紡</label>
- <div class="layui-input-inline">
- <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
- <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
</div>
+
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">涓荤</label>
@@ -180,10 +155,24 @@
</button>
</div>
</div>
+ <div class="layui-inline" style="">
+ <label class="layui-form-label">鍙戠エ缂栧彿</label>
+ <div class="layui-input-inline" style="background-color: #efefef4d; float: left; width: 150px;">
+ <input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline">
- <label class="layui-form-label">浠樻鏃ユ湡<label style="color:red"> * </label></label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
+ <label class="layui-form-label">椤圭洰鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+
</div>
</div>
</div>
@@ -192,16 +181,6 @@
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 1135px;">
- </div>
- </div>
- </div>
- <div class="layui-row" style="margin-top:10px;">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
</div>
</div>
</div>
@@ -227,6 +206,59 @@
</div>
</div>
</div>
+ </div>
+ </div>
+
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
+ <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠樻鏃ユ湡<label style="color:red"> * </label></label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
+ <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+
</div>
</div>
<!--鍒跺崟淇℃伅-->
@@ -621,6 +653,9 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HPSStyleID": dataArray[0].HPSStyleID
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃Entry 璧嬪��
@@ -719,6 +754,10 @@
, "HSSName": ""
, "HPSStyleID": dataArray[0].HPSStyleID
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
+ , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
});
//瀛愯〃Entry 璧嬪��
var rowdataEntry = [];
@@ -1767,6 +1806,11 @@
, "HExplanation": data.鎽樿
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HProjectID": data.HProjectID == null ? 0 : data.HProjectID
+ , "HProjectName": data.椤圭洰鍚嶇О
+ , "HProjectNumber": data.椤圭洰浠ｇ爜
+ , "HInvoiceBillNo": data.鍙戠エ缂栧彿
+
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd HH:mm:ss")
, "HUpDater": data.淇敼浜�
@@ -1902,6 +1946,9 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HPSStyleID": dataArray[0].HPSStyleID
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃 璧嬪��
@@ -1981,6 +2028,10 @@
, "HExRate": dataArray[0].姹囩巼
, "HPSStyleID": dataArray[0].HPSStyleID
, "HPSStyleSName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
+ , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
});
//瀛愯〃 璧嬪��
@@ -2127,22 +2178,22 @@
layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
return false;
}
- if ($("#HCurID").val() == 0) {
- layer.msg("璇烽�夋嫨甯佸埆锛�");
- return;
- }
- if ($("#HExRate").val() == 0) {
- layer.msg("璇疯緭鍏ユ眹鐜囷紒");
- return;
- }
+ //if ($("#HCurID").val() == 0) {
+ // layer.msg("璇烽�夋嫨甯佸埆锛�");
+ // return;
+ //}
+ //if ($("#HExRate").val() == 0) {
+ // layer.msg("璇疯緭鍏ユ眹鐜囷紒");
+ // return;
+ //}
//if ($("#HEmpID").val() == 0) {
// layer.msg("璇烽�夋嫨涓氬姟鍛樺憳锛�");
// return;
//}
- if ($("#HDeptID").val() == 0) {
- layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�");
- return;
- }
+ //if ($("#HDeptID").val() == 0) {
+ // layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�");
+ // return;
+ //}
if ($("#HSupID").val() == 0) {
layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒");
return;
@@ -2156,14 +2207,14 @@
// return;
//}
- temp = $("#HExRate").val() + "";
- if (temp == 0) {
- layer.msg("姹囩巼涓嶈兘涓�0!");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("姹囩巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
- return false;
- }
+ //temp = $("#HExRate").val() + "";
+ //if (temp == 0) {
+ // layer.msg("姹囩巼涓嶈兘涓�0!");
+ // return false;
+ //} else if (!ref.test(temp)) {
+ // layer.msg("姹囩巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ // return false;
+ //}
//#endregion
//#region 瀛愯〃 鏁版嵁妫�楠�
@@ -2841,6 +2892,9 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HPSStyleID": dataArray[0].HPSStyleID
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃Entry 璧嬪��
@@ -2943,6 +2997,12 @@
return;
}
}
+ if (dataArray[0].婧愬崟绫诲瀷 == "1102") {
+ getPushSource_POOrderBillCur(dataArray[0].婧愬崟涓诲唴鐮�, dataArray[0].婧愬崟瀛愬唴鐮�);
+ } else {
+ getPushSource_POInStockBillCur(dataArray[0].婧愬崟涓诲唴鐮�, dataArray[0].婧愬崟瀛愬唴鐮�);
+ }
+
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HMainSourceInterID": "0"
@@ -2958,13 +3018,17 @@
, "HEmpName": dataArray[0].涓氬姟鍛�
, "HSupID": dataArray[0].HSupID
, "HSupName": dataArray[0].渚涘簲鍟�
- , "HCurID": dataArray[0].HCurID
- , "HCurName": dataArray[0].甯佸埆
- , "HExRate": dataArray[0].姹囩巼
+ //, "HCurID": dataArray[0].HCurID
+ //, "HCurName": dataArray[0].甯佸埆
+ //, "HExRate": dataArray[0].姹囩巼
, "HSSID": "0"
, "HSSName": ""
, "HPSStyleID": dataArray[0].HPSStyleID
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
+ , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
});
//瀛愯〃Entry 璧嬪��
@@ -3152,7 +3216,69 @@
}
//#endregion
-
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐鍗曞竵鍒眹鐜�
+ function getPushSource_POOrderBillCur(HSourceInterID, HSourceEntryID) {
+ var res = "none";
+ $.ajax({
+ url: GetWEBURL() + "/Cg_POOrderBill/loadCg_POOrderBill_Push",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ res = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HCurID": res.HCurID
+ , "HCurName": res.甯佸埆
+ , "HExRate": res.姹囩巼
+ });
+ } else {
+ res = result.data;
+ //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ res = "none";
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曟敹鏂欓�氱煡鍗曞竵鍒眹鐜�
+ function getPushSource_POInStockBillCur(HSourceInterID, HSourceEntryID) {
+ var res = "none";
+ $.ajax({
+ url: GetWEBURL() + "/Cg_POInStockBill/loadCg_POInStockBill_Push",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ res = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HCurID": res.HCurID
+ , "HCurName": res.甯佸埆
+ , "HExRate": res.姹囩巼
+ });
+ } else {
+ res = result.data;
+ //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ res = "none";
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
//#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 98e7a56..0d2f742 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -54,7 +54,8 @@
<h1 style="text-align: center; padding: 10px 0;"><b>閲囪喘璁㈠崟</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -76,39 +77,16 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">杈呭姪瀛楁</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline" style="width:440px">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:400px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:400px;">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width:50px">甯佸埆<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="margin-left: 238px">姹囩巼<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color:#efefef4d;" readonlys>
- </div>
- </div>
+
</div>
<div class="layui-row">
@@ -156,44 +134,21 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浜よ揣鍦扮偣</label>
+ <label class="layui-form-label">鑱旂郴浜�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
+ <input class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off">
</div>
</div>
+
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+ <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
<div class="layui-input-inline">
- <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off">
</div>
</div>
</div>
- <!--<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鑱旂郴浜�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off">
- </div>
- </div>
-
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off">
- </div>
- </div>
- </div>-->
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">缁撶畻鏃ユ湡</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSSDate" id="HSSDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
- </div>
+
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">椤圭洰缂栫爜</label>
<div class="layui-input-inline">
@@ -231,6 +186,64 @@
</div>
</div>
</div>
+ </div>
+ </div>
+
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杈呭姪瀛楁</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width:50px">甯佸埆<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="margin-left: 238px">姹囩巼<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color:#efefef4d;" readonlys>
+ </div>
+ </div>
+
+ </div>
+
+ <div class="layui-row">
+
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浜よ揣鍦扮偣</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" 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">缁撶畻鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSSDate" id="HSSDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" style="float:left;width:150px;">
+ </div>
+ </div>
+ </div>
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
@@ -243,8 +256,6 @@
</div>
</div>
</div>
-
-
<!--鍒跺崟淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item">
@@ -1048,7 +1059,7 @@
, "HSSID": data[0].HSSID
, "HSSName": data[0].缁撶畻鏂瑰紡 // 璁剧疆鈥滅粨绠楁柟寮忊�濆悕绉板瓧娈电殑鍊笺��
, "HLinkMan": data[0].鑱旂郴浜� // 璁剧疆鈥滆仈绯讳汉鈥濆悕绉板瓧娈电殑鍊笺��
- , "HLinkPhone": data[0].鑱旂郴鐢佃瘽 // 璁剧疆鈥滆仈绯荤數璇濃�濆悕绉板瓧娈电殑鍊笺��
+ , "HLinkPhone": data[0].鑱旂郴浜虹數璇� // 璁剧疆鈥滆仈绯荤數璇濃�濆悕绉板瓧娈电殑鍊笺��
, "HInnerBillNo": data[0].杈呭姪瀛楁 // 璁剧疆鈥滆緟鍔╁瓧娈碘�濆悕绉板瓧娈电殑鍊笺��
, "HProjectID": data[0].HProjectID
, "HProjectNumber": data[0].椤圭洰浠ｇ爜 // 璁剧疆鈥滈」鐩唬鐮佲�濆悕绉板瓧娈电殑鍊笺��
@@ -1120,18 +1131,22 @@
// layer.msg("璇烽�夋嫨閲囪喘鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
//}
- if ($("#HDeptID").val() == 0) {
- //鎻愮ず璇烽�夋嫨閲囪喘閮ㄩ棬锛岃绀烘爣蹇椾负5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉� 锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮� 鏍囬涓衡�欐俯棣ㄦ彁绀衡��
- layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HDeptID").val() == 0) {
+ // //鎻愮ず璇烽�夋嫨閲囪喘閮ㄩ棬锛岃绀烘爣蹇椾负5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉� 锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮� 鏍囬涓衡�欐俯棣ㄦ彁绀衡��
+ // layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HSupID").val() == 0) {
//鎻愮ず璇烽�夋嫨渚涘簲鍟嗭紝璀︾ず鏍囧織涓�5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉� 锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮� 鏍囬涓衡�欐俯棣ㄦ彁绀衡��
layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ //澶勭悊閲囪喘鏂瑰紡鍜岀粨绠楁柟寮忓�奸槻姝㈠悗绔痠nt杞瑂ting鎶ラ敊
if ($("#HPSStyleID").val() == "" || $("#HPSStyleID").val() == null) {
$("#HPSStyleID").val(0)
+ }
+ if ($("#HSSID").val() == "" || $("#HSSID").val() == null) {
+ $("#HSSID").val(0)
}
//if ($("#HPSStyleID").val() == 0) {
// //鎻愮ず璇烽�夋嫨閲囪喘鏂瑰紡锛岃绀烘爣蹇椾负5锛岄�夋嫨鎸夐挳鍙婃寜閽悕绉� 锛屾椂闂翠负100绉� 锛宱ffset: 't'鍜宻kin: 'layui-layer-lan'鍒嗗埆鐢ㄤ簬璋冩暣娑堟伅妗嗙殑浣嶇疆鍜屾牱寮� 鏍囬涓衡�欐俯棣ㄦ彁绀衡��
@@ -1152,7 +1167,7 @@
}
var rowData = option.data[i]; //option.data[i]鍏冪礌鏄竴涓湁鏁堢殑瀵硅薄灏嗗叾璧嬪�肩粰rowData鍙橀噺
for (var col of Object.keys(rowData)) { //閬嶅巻rowData瀵硅薄鐨勬墍鏈夐敭 Object.keys(rowData)杩斿洖涓�涓寘鍚玶owData鎵�鏈夎嚜韬睘鎬ч敭鐨勬暟缁�
- if (rowData[col] == "0" && (col == "HQty" || col =="HMaterID")) { //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
+ if (rowData[col] == "0" && (col == "HQty" || col == "HMaterID" || col=="HUnitID")) { //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
layer.msg("绗�" + (i + 1) + "琛岋細" + col + "涓嶈兘涓�0锛�"); //鎻愮ず绗嚑琛屼笉鑳戒负0 濡傛灉鎵惧埌鍊间负"0"鐨勫睘鎬э紝骞朵笖璇ュ睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"锛屽垯閫氳繃layer.msg鏄剧ず涓�涓鍛婃秷鎭紝鎸囧嚭鍝釜琛屽拰鍝釜鍒楃殑鍊间笉鑳戒负0
return;
}
@@ -1675,17 +1690,23 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+
$("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
$("#HSupID").val(checkStatus.data[0].HItemID);
- $("#HCurID").val(checkStatus.data[0].HCurID);
+ $("#HCurID").val(checkStatus.data[0].HCurID == null ? 0 : checkStatus.data[0].HCurID);
$("#HCurName").val(checkStatus.data[0].璐у竵);
$("#HExRate").val(checkStatus.data[0].姹囩巼);
- $("#HSSID").val(checkStatus.data[0].HSSID);
+ $("#HSSID").val(checkStatus.data[0].HSSID == null ? 0 : checkStatus.data[0].HSSID);
$("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡);
$("#HAddress").val(checkStatus.data[0].鍦板尯);
$("#HPSStyleName").val(checkStatus.data[0].閲囪喘鏂瑰紡);
$("#HPSStyleID").val((checkStatus.data[0].HPSStyleID == null) ? 0 : checkStatus.data[0].HPSStyleID);
-
+ //璁剧疆榛樿璐у竵
+ if (checkStatus.data[0].HCurID==0) {
+ $("#HCurID").val(1);
+ $("#HCurName").val("浜烘皯甯�");
+ $("#HExRate").val(1);
+ }
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1734,7 +1755,7 @@
}
$("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
- $("#HManagerID").val(checkStatus.data[0].HEmpID);
+ $("#HManagerID").val(checkStatus.data[0].HEmpID == null ? 0 : checkStatus.data[0].HEmpID);
$("#HManagerName").val(checkStatus.data[0].璐熻矗浜�);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1833,6 +1854,8 @@
$("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
$("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);
$("#HProjectID").val(checkStatus.data[0].HInterID);
+ $("#HLinkMan").val(checkStatus.data[0].鑱旂郴浜�);
+ $("#HLinkPhone").val(checkStatus.data[0].鑱旂郴浜虹數璇�);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -2156,6 +2179,8 @@
$("#HProjectName").val(data[0].椤圭洰鍚嶇О);
$("#HProjectNumber").val(data[0].椤圭洰浠ｇ爜);
$("#HProjectID").val(data[0].HInterID);
+ $("#HLinkMan").val(data[0].鑱旂郴浜�);
+ $("#HLinkPhone").val(data[0].鑱旂郴浜虹數璇�);
}
//鍙屽嚮杩斿洖浠撳簱
function GetHWHValue(data) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index 421daad..33528ee 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -54,7 +54,9 @@
<h1 style="text-align: center; padding: 10px 0;"><b>鍙戣揣閫氱煡鍗�</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
+
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -109,14 +111,6 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浜よ揣鍦扮偣</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
@@ -126,32 +120,8 @@
</button>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" 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">姹囩巼<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0">
- </div>
- </div>
-
</div>
-
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閿�鍞鍗曞彿</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSeOrderBillNo_M" id="HSeOrderBillNo_M" autocomplete="off">
- </div>
- </div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">涓荤<label style="color:red"> * </label></label>
<div class="layui-input-inline">
@@ -162,58 +132,6 @@
</button>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">婧愬崟绫诲瀷</label>
- <div class="layui-input-inline">
- <select name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType">
- <!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
- </select>
- </div>
- </div>
- <!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">杩愯垂</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HConveyMoney" id="HConveyMoney" autocomplete="off" value="0">
- </div>
- </div>-->
- <!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">婧愬崟绫诲瀷</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSourceBillType" id="HSourceBillType" value="0">
- </div>
- </div>-->
-
- </div>
- <!--<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">杩愯緭鍏徃</label>
- <div class="layui-input-inline">
- <input type="text" name="HConveyCompName" id="HConveyCompName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HConveyCompID" id="HConveyCompID" class="layui-input" value="0" style="float:left;width:150px;">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">杩愯緭鏂瑰紡</label>
- <div class="layui-input-inline">
- <input type="text" name="HConveyTypeName" id="HConveyTypeName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HConveyTypeID" id="HConveyTypeID" class="layui-input" value="0" style="float:left;width:150px;">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏄惁鍨粯</label>
- <div class="layui-input-inline">
- <input type="checkbox" name="checkboxHDFflag" id="checkboxHDFflag" lay-skin="primary" lay-filter="checkboxHDFflag" value="true" title="鏄惁鍨粯">
- <input type="hidden" value="false" name="HDFflag" id="HDFflag">
- </div>
- </div>
- </div>-->
- <div class="layui-row">
- <!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
- </div>
- </div>-->
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鑱旂郴浜�</label>
<div class="layui-input-inline">
@@ -226,17 +144,7 @@
<input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off">
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float: left; width: 150px;">
-
- <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
+ </div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">澶囨敞</label>
@@ -261,6 +169,67 @@
</div>
</div>
+ </div>
+ </div>
+ </div>
+
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浜よ揣鍦扮偣</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" 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">姹囩巼<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="1">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閿�鍞鍗曞彿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSeOrderBillNo_M" id="HSeOrderBillNo_M" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType">
+ <!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float: left; width: 150px;">
+
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
@@ -274,7 +243,6 @@
</div>
</div>
</div>
-
<!--鍒跺崟淇℃伅-->
<div class="layui-tab-item">
@@ -349,6 +317,8 @@
</div>
</div>
</div>
+
+
</div>
</div>
@@ -1078,23 +1048,23 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- if ($("#HWHID").val() == 0) {
- layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HWHID").val() == 0) {
+ // layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
- if ($("#HManagerID").val() == 0) {
- layer.msg("璇烽�夋嫨涓荤锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HManagerID").val() == 0) {
+ // layer.msg("璇烽�夋嫨涓荤锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HCusID").val() == 0) {
layer.msg("璇烽�夋嫨瀹㈡埛锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HEmpID").val() == 0) {
- layer.msg("璇烽�夋嫨涓氬姟鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HEmpID").val() == 0) {
+ // layer.msg("璇烽�夋嫨涓氬姟鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HCurID ").val() == 0) {
layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -1103,11 +1073,25 @@
layer.msg("姹囩巼涓嶈兘涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HDeptID").val() == 0) {
- layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
+ //if ($("#HDeptID").val() == 0) {
+ // layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //瀛愯〃鏁版嵁妫�楠岀畝鍗曡〃鍗曢獙璇�
+ //鍚庣画鍙敤澶氫釜鏁扮粍瀛樺偍鍒楀悕鎵╁睍
+ for (var i = 0; i < option.data.length; i++) {//閬嶅巻option.data鏁扮粍
+ //妫�鏌ュ綋鍓嶅厓绱狅紙option.data[i]锛夋槸鍚︿笉鏄璞°�佹槸鍚︿负null鎴栨槸鍚︿负鏁扮粍銆� 杩欐槸鍥犱负浠ｇ爜鍚庣画閮ㄥ垎鍋囪姣忎釜鍏冪礌閮芥槸涓�涓璞★紝鐢ㄤ簬妫�鏌ュ叾灞炴��
+ if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+ continue; // 璺宠繃闈炲璞￠」锛堝绌烘暟缁勶級
+ }
+ var rowData = option.data[i]; //option.data[i]鍏冪礌鏄竴涓湁鏁堢殑瀵硅薄灏嗗叾璧嬪�肩粰rowData鍙橀噺
+ for (var col of Object.keys(rowData)) { //閬嶅巻rowData瀵硅薄鐨勬墍鏈夐敭 Object.keys(rowData)杩斿洖涓�涓寘鍚玶owData鎵�鏈夎嚜韬睘鎬ч敭鐨勬暟缁�
+ if (rowData[col] == "0" && (col == "HQty" || col == "HMaterID" || col == "HUnitID")) { //妫�鏌ュ綋鍓嶅睘鎬х殑鍊兼槸鍚︾瓑浜�"0"锛屽苟涓斿睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"
+ layer.msg("绗�" + (i + 1) + "琛岋細" + col + "涓嶈兘涓�0锛�"); //鎻愮ず绗嚑琛屼笉鑳戒负0 濡傛灉鎵惧埌鍊间负"0"鐨勫睘鎬э紝骞朵笖璇ュ睘鎬у悕涓嶆槸"LAY_TABLE_INDEX"锛屽垯閫氳繃layer.msg鏄剧ず涓�涓鍛婃秷鎭紝鎸囧嚭鍝釜琛屽拰鍝釜鍒楃殑鍊间笉鑳戒负0
+ return;
+ }
+ }
}
-
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
@@ -1210,33 +1194,7 @@
});
}
}
- //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋��
- function getCustomerByCusID(HCusID) {
- $.ajax({
- url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
- async: false,
- type: "GET",
- data: {
- "HCusID": HCusID
- },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
-
- $("#HCurID").val(data.HCurID);
- $("#HCurName").val(data.HCurName);
- $("#HExRate").val(data.HExRate);
- $("#HSSID").val(data.HSSID);
- $("#HSSName").val(data.HSSName);
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
- }
- });
- }
- //#endregion
+
//琛屽唴蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -1298,6 +1256,7 @@
, "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
, "HUnitID": OptionData.HUnitID
, "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HQty": 1
})
OptionData = [];
}
@@ -1443,6 +1402,7 @@
, "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
, "HUnitID": OptionData.HUnitID
, "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HQty": 1
})
OptionData = [];
}
@@ -1844,6 +1804,11 @@
$("#HProjectID").val(checkStatus.data[0].HInterID);
$("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
$("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HCusID").val(checkStatus.data[0].HCusID == null ? 0 : checkStatus.data[0].HCusID)
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛)
+ $("#HLinkMan").val(checkStatus.data[0].鑱旂郴浜�);
+ $("#HLinkPhone").val(checkStatus.data[0].鑱旂郴浜虹數璇�);
+ getCustomerByCusID($("#HCusID").val());
} else {
layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
}
@@ -1914,6 +1879,39 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋��
+ function getCustomerByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ $("#HCurID").val(data.HCurID);
+ $("#HCurName").val(data.HCurName);
+ $("#HExRate").val(data.HExRate);
+ $("#HSSID").val(data.HSSID);
+ $("#HSSName").val(data.HSSName);
+ //璁剧疆榛樿璐у竵淇℃伅
+ if (data.HCurID == 0) {
+ $("#HCurID").val(1);
+ $("#HCurName").val("浜烘皯甯�");
+ $("#HExRate").val(1);
+ }
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!" + 鏈煡璇㈠埌瀹㈡埛淇℃伅, { icon: 5 });
+ }
+ });
+ }
+ //#endregion
// 鍩虹璧勬枡杩斿洖鏁版嵁
function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
{
@@ -1945,7 +1943,11 @@
$("#HProjectID").val(obj[0].HInterID);
$("#HProjectNumber").val(obj[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
$("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
-
+ $("#HCusID").val(obj[0].HCusID == null ? 0 : obj[0].HCusID)
+ $("#HCusName").val(obj[0].瀹㈡埛)
+ $("#HLinkMan").val(obj[0].鑱旂郴浜�);
+ $("#HLinkPhone").val(obj[0].鑱旂郴浜虹數璇�);
+ getCustomerByCusID($("#HCusID").val());
} else {
layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 2e3b4c8..96a1a0c 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -54,7 +54,8 @@
<h1 style="text-align: center; padding: 10px 0;"><b>搴旀敹鍗�</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -81,9 +82,9 @@
<!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
</select>
<!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
- <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
- <option style="color:blue;" value="1205">閿�鍞嚭搴撳崟</option>
- </select>-->
+ <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
+ <option style="color:blue;" value="1205">閿�鍞嚭搴撳崟</option>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -100,34 +101,25 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">閿�鍞憳</label>
- <div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label">閿�鍞儴闂�</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hdeptlist" style="width:40px;">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float: left; width: 110px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ </button>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">涓荤</label>
<div class="layui-input-inline">
- <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
<input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -136,54 +128,8 @@
<input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">甯佸埆</label>
- <div class="layui-input-inline">
- <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閿�鍞柟寮�</label>
- <div class="layui-input-inline">
- <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hsellslist" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撶畻鏂瑰紡</label>
- <div class="layui-input-inline">
- <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">鏀舵鏃ユ湡<label style="color:red"> * </label></label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-inline">
@@ -204,16 +150,7 @@
</div>
</div>
</div>
- <div class="layui-row" style="margin-top:10px;">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
- </div>
+
<!--闅愯棌瀛楁-->
<div class="layui-row" style="display:none;">
@@ -233,6 +170,81 @@
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" value="" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞憳</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">甯佸埆</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏀舵鏃ユ湡<label style="color:red"> * </label></label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞柟寮�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="0" style="float:left;width:150px;">
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hsellslist" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
</div>
@@ -524,9 +536,9 @@
}
//#endregion
- //if (AllowLoadData(data)) {
+ if (AllowLoadData(data)) {
set_SaveBill(data);
- //}
+ }
});
//#endregion
//#endregion
@@ -1400,19 +1412,19 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞儴闂ㄥ垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
- //, btn: ['纭畾', '鍙栨秷']
- //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- // var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- // if (checkStatus.data.length === 0) {
- // return layer.msg('璇烽�夋嫨鏁版嵁');
- // }
- // $("#HDeptName").val(checkStatus.data[0].HName);
- // $("#HDeptID").val(checkStatus.data[0].HItemID);
- // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- //}
- //, btn2: function (index, layero) { }
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
})
}
//#endregion
@@ -1425,19 +1437,19 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞富绠″垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
- //, btn: ['纭畾', '鍙栨秷']
- //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- // var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- // if (checkStatus.data.length === 0) {
- // return layer.msg('璇烽�夋嫨鏁版嵁');
- // }
- // $("#HManagerName").val(checkStatus.data[0].HName);
- // $("#HManagerID").val(checkStatus.data[0].HItemID);
- // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- //}
- //, btn2: function (index, layero) { }
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HMangerID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
})
}
//#endregion
@@ -3353,18 +3365,18 @@
$("#HCusID").val(obj[0].HItemID);
}
+
function GetHManagerValue(obj) //杩斿洖涓荤
{
- $("#HMangerName").val(obj[0].HName);
+ $("#HMangerName").val(obj[0].鑱屽憳鍚嶇О);
$("#HMangerID").val(obj[0].HItemID);
}
function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
{
- $("#HDeptName").val(obj[0].HName);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
-
function GetSellStyleValue(obj) //杩斿洖閿�鍞柟寮�
{
$("#HSellSName").val(obj[0].HName);
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index 480e2ee..cf07313 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -307,13 +307,28 @@
<div class="layui-input-block" style="margin-left: 120px; width:180px;">
<input type="date" class="layui-input" lay-verify="HReDate" name="HReDate" id="HReDate" style="padding-left: 80px;">
</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" lay-verify="HPicNo" name="HPicNo" id="HPicNo">
</div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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" lay-verify="HContacts" name="HContacts" id="HContacts">
+ </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:180px;">
+ <input type="text" class="layui-input" lay-verify="HContactNumber" name="HContactNumber" id="HContactNumber" >
+ </div>
+
</div>
</div>
<div class="layui-row">
@@ -1557,7 +1572,7 @@
, "HProType": tableMain[0]["HProType"]
, "HRemark": tableMain[0]["HRemark"]
, "HOrgID": tableMain[0]["HOrgID"]
- , "HProjectClassID": tableMain[0]["HProjectClassID"]
+ , "HProjectClassID": tableMain[0]["HProjectClassID"] == null ? 0 : tableMain[0]["HProjectClassID"]
, "HProjectClassName": tableMain[0]["HProjectClassName"]
, "HBuildComp": tableMain[0]["HBuildComp"]
, "HBuildAddress": tableMain[0]["HBuildAddress"]
@@ -1586,6 +1601,8 @@
, "HConWorkDays": tableMain[0]["HConWorkDays"]
, "HDepDays": tableMain[0]["HDepDays"]
, "HLastMoney": tableMain[0]["HLastMoney"]
+ , "HContacts": tableMain[0]["HContacts"]
+ , "HContactNumber": tableMain[0]["HContactNumber"]
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
HOrgIDBar = tableMain[0]["HOrgID"];
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index f8ce23d..42dfea8 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -55,7 +55,8 @@
<h1 style="text-align: center; padding: 10px 0;"><b>閿�鍞嚭搴撳崟</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -82,8 +83,8 @@
<!--鍔ㄦ�佽幏鍙栨簮鍗�-->
</select>
<!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
- <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
- </select>-->
+ <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -92,7 +93,7 @@
<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
- <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px;" >
+ <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -106,8 +107,8 @@
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-inline">
@@ -116,8 +117,8 @@
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-inline">
@@ -126,8 +127,8 @@
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-inline">
@@ -136,28 +137,12 @@
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">甯佸埆</label>
- <div class="layui-input-inline">
- <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">鑱旂郴浜�</label>
<div class="layui-input-inline">
@@ -168,18 +153,6 @@
<label class="layui-form-label">鑱旂郴鐢佃瘽</label>
<div class="layui-input-inline">
<input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">閿�鍞柟寮�</label>
- <div class="layui-input-inline">
- <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSellSList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
</div>
</div>
<div class="layui-inline">
@@ -202,42 +175,12 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍑哄簱浠撳簱</label>
- <div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 1135px;">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">瀹㈡埛浣欓</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HCusBalance" id="HCusBalance" autocomplete="off" style="background-color: #efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">淇＄敤棰濆害</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HCreditRating_Now" id="HCreditRating_Now" autocomplete="off" style="background-color: #efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍙敤棰濆害</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HAvailableBalance" id="HAvailableBalance" autocomplete="off" style="background-color: #efefef4d;" readonly>
</div>
</div>
</div>
@@ -269,11 +212,144 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鍑哄簱浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+
+
+ <!--闅愯棌瀛楁-->
+ <div class="layui-row" style="display:none;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩愯緭鍏徃</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HConveyCompName" id="HConveyCompName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HConveyCompID" id="HConveyCompID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HConveyCompList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杩愯緭鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HConveyTypeName" id="HConveyTypeName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HConveyTypeID" id="HConveyTypeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HConveyTypeList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HConveyMoney" id="HConveyMoney" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杩愯垂</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCarriage" id="HCarriage" autocomplete="off" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="display:none;">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
+ <input type="hidden" name="HOWNERID" id="HOWNERID" lay-verify="HOWNERID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璋冨嚭浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSCWHList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏍搁攢浜�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCheckStatusMan" id="HCheckStatusMan" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">甯佸埆</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞柟寮�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="0" style="float:left;width:150px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹㈡埛浣欓</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCusBalance" id="HCusBalance" autocomplete="off" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇＄敤棰濆害</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCreditRating_Now" id="HCreditRating_Now" autocomplete="off" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍙敤棰濆害</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HAvailableBalance" id="HAvailableBalance" autocomplete="off" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
<label class="layui-form-label">鍗曚环绫诲瀷</label>
<div class="layui-input-inline">
<select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 180px; ">
- <option value="鎴愭湰浠�" selected="selected">鎴愭湰浠�</option>
- <option value="缁撶畻浠�">缁撶畻浠�</option>
+ <option value="鎴愭湰浠�" selected="selected">鎴愭湰浠�</option>
+ <option value="缁撶畻浠�">缁撶畻浠�</option>
</select>
</div>
</div>
@@ -502,10 +578,10 @@
//#endregion
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
- //var HModuleType = "1205";
- ////閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- //var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
- //$("h1").html('<b>' + HPageTitle + '</b>');
+ var HModuleType = "1205";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
//#endregion
//#region 鑾峰彇椤甸潰璺宠浆鍙傛暟
@@ -791,6 +867,8 @@
, "HProjectID": dataArray[0].HProjectID
, "HProjectNumber": dataArray[0].椤圭洰缂栫爜
, "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴浜虹數璇�
});
//瀛愯〃 璧嬪��
@@ -891,6 +969,8 @@
, "HProjectID": dataArray[0].HProjectID
, "HProjectNumber": dataArray[0].椤圭洰缂栫爜
, "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴浜虹數璇�
});
//瀛愯〃 璧嬪��
@@ -1782,6 +1862,8 @@
$("#HProjectID").val(checkStatus.data[0].HInterID);
$("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
$("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HLinkMan").val(checkStatus.data[0].鑱旂郴浜�);
+ $("#HLinkPhone").val(checkStatus.data[0].鑱旂郴鐢佃瘽);
} else {
layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
}
@@ -1874,7 +1956,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+ var HCusID = $("#HSupID").val();//鍒ゆ柇瀹㈡埛
if (HCusID == 0 || HCusID == '') {
HCusID = checkStatus.data[0]["HCusID"];
}
@@ -3193,6 +3275,8 @@
, "HProjectID": dataArray[0].HProjectID
, "HProjectNumber": dataArray[0].椤圭洰缂栫爜
, "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴浜虹數璇�
});
//瀛愯〃 璧嬪��
@@ -3322,6 +3406,8 @@
, "HProjectID": dataArray[0].HProjectID
, "HProjectNumber": dataArray[0].椤圭洰缂栫爜
, "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴浜虹數璇�
});
//瀛愯〃 璧嬪��
@@ -3763,6 +3849,12 @@
$("#HCreditRating_Now").val(data.HCreditRating_Now);
$("#HLinkMan").val(data.HLinkMan);
$("#HLinkPhone").val(data.HLinkPhone);
+ //璁剧疆榛樿璐у竵淇℃伅
+ if (data.HCurID == 0) {
+ $("#HCurID").val(1);
+ $("#HCurName").val("浜烘皯甯�");
+ $("#HExRate").val(1);
+ }
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 7d3373e..4885901 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -59,7 +59,8 @@
<h1 style="text-align: center; padding: 10px 0;"><b>閲囪喘鍏ュ簱鍗�</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -81,25 +82,17 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
- </div>
- </div>
-
-
- </div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
<label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
- <div class="layui-input-inline" style="width:750px">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:700px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:700px;">
+ <div class="layui-input-inline">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
@@ -110,8 +103,6 @@
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
@@ -132,6 +123,9 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
+
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-inline">
@@ -142,8 +136,6 @@
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -162,30 +154,19 @@
</button>
</div>
<!--<label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
+ </div>-->
</div>
+ </div>
+ <div class="layui-row">
+
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
-
-
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -206,6 +187,20 @@
<input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
</div>
</div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+
</div>
<!--<div class="layui-row">
@@ -221,6 +216,21 @@
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
</div>
</div>
<div class="layui-col-xs4 layui-inline" style="margin-left: 135px;">
@@ -240,7 +250,6 @@
</div>
</div>
</div>
-
<!--鍒跺崟淇℃伅-->
<div class="layui-tab-item">
@@ -2370,14 +2379,15 @@
//琛屽唴鍒犻櫎
function set_GridDelete(obj) {
var data = obj.data;
- var rowIndex = $(obj.tr).attr("data-index");
+ var rowIndex = $(obj.tr).attr("data-index");//鑾峰彇琛岀储寮�
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
- obj.del();
+ obj.del();//鍋囧垹闄�
+ table.cache["mainTable"].splice(rowIndex, 1); //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.reload(option);
layer.close(index);
@@ -2461,9 +2471,9 @@
res = result.data;
//layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
- }, error: function () {
+ }, error: function (err) {
res = "none";
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ layer.alert("鍙戠敓閿欒!"+err, { icon: 5 });
}
});
return res;
@@ -2512,9 +2522,9 @@
res = result.data;
//layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
- }, error: function () {
+ }, error: function (err) {
res = "none";
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ layer.alert("鍙戠敓閿欒!" + err, { icon: 5 });
}
});
return res;
@@ -2637,10 +2647,10 @@
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
var temp = "";
- if ($("#HWHID").val() == 0) {
- layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HWHID").val() == 0) {
+ // layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
//if ($("#HManagerID").val() == 0) {
// layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
@@ -2657,22 +2667,22 @@
// layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
//}
- if ($("#HDeptID").val() == 0) {
- layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HDeptID").val() == 0) {
+ // layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HSupID").val() == 0) {
layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HPSStyleID").val() == 0) {
- layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HSSID").val() == 0) {
- layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HPSStyleID").val() == 0) {
+ // layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HSSID").val() == 0) {
+ // layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
//#region 瀛愯〃 鏁版嵁妫�楠�
for (var i = 0; i < option.data.length; i++) {
--
Gitblit v1.9.1