From a3832f9cb0c9887346b9b2f3c6ba051f9653bc70 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 19 八月 2024 16:13:13 +0800
Subject: [PATCH] 1
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 30 +
WebTM/WebTM.csproj.user | 2
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 4
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 4
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 10
WebTM/views/index_Mobile.html | 36
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 59 ++
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 3
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 2
WebTM/views/设备管理/Sb_EquipRepairSignBill_PDA.html | 767 ++++++++++++++++++++++++++++++
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 30
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 43
WebTM/views/质量管理/质量报表/QC_TechnologyParameterClass.html | 2
WebTM/views/设备管理/Sb_EquipRepairSignBillList_PDA.html | 449 +++++++++++++++++
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 12
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 40
WebTM/WebTM.csproj | 2
17 files changed, 1,406 insertions(+), 89 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ff25393..9537646 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -431,6 +431,8 @@
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserRightQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
<Content Include="views\璁惧绠＄悊\Sb_Add_EquipRepairSignBillList.html" />
+ <Content Include="views\璁惧绠＄悊\Sb_EquipRepairSignBillList_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\Sb_EquipRepairSignBill_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairSignBillMain.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill_PDA.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 98df84b..65037ad 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>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-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/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 9018ab1..e276d48 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -708,18 +708,6 @@
</a>
</dd>
<dd>
- <a href="璁惧绠＄悊/Sb_EqpMaintenanceBill_PDA.html" target="main_self_frame" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 璁惧缁翠慨璁板綍鍗�
- </a>
- </dd>
- <dd>
- <a href="璁惧绠＄悊/Sb_EqpMaintenanceBillList_PDA.html" target="main_self_frame" style="color: aqua;">
- <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 璁惧缁翠慨璁板綍鍗曞垪琛�
- </a>
- </dd>
- <dd>
<a href="璁惧绠＄悊/Sb_EquipConkBookBill_PDA.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
璁惧鏁呴殰鐧昏鍗�
@@ -732,6 +720,30 @@
</a>
</dd>
<dd>
+ <a href="璁惧绠＄悊/Sb_EquipRepairSignBill_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 璁惧绛惧埌鍗�
+ </a>
+ </dd>
+ <dd>
+ <a href="璁惧绠＄悊/Sb_EquipRepairSignBillList_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 璁惧绛惧埌鍗曞垪琛�
+ </a>
+ </dd>
+ <dd>
+ <a href="璁惧绠＄悊/Sb_EqpMaintenanceBill_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 璁惧缁翠慨璁板綍鍗�
+ </a>
+ </dd>
+ <dd>
+ <a href="璁惧绠＄悊/Sb_EqpMaintenanceBillList_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 璁惧缁翠慨璁板綍鍗曞垪琛�
+ </a>
+ </dd>
+ <dd>
<a href="璁惧绠＄悊/Sb_EquipRepairCheckBill_PDA.html" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
璁惧缁翠慨楠屾敹鍗�
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/Add_Edit_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/Add_Edit_Gy_Material.html"
index aa46c20..142b3ce 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/Add_Edit_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/Add_Edit_Gy_Material.html"
@@ -605,13 +605,24 @@
<input type="checkbox" name="HCommonUseFlag" id="HCommonUseFlag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁甯哥敤鏉愭枡">
</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="HAvgStockPrice" lay-verify="HAvgStockPrice" id="HAvgStockPrice" autocomplete="off" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">榛樿绋庣巼</label>
+ <div class="layui-input-inline" style="margin-top:10px">
+ <input class="layui-input" name="HTaxRate" lay-verify="HTaxRate" id="HTaxRate" autocomplete="off" value="13">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">榛樿鍒╂鼎鐜�</label>
+ <div class="layui-input-inline" style="margin-top:10px">
+ <input class="layui-input" name="HProfitRate" lay-verify="HProfitRate" id="HProfitRate" autocomplete="off" value="0">
</div>
</div>
<div class="layui-inline">
@@ -620,7 +631,6 @@
<input class="layui-input" name="HFootPrice" lay-verify="HFootPrice" id="HFootPrice" autocomplete="off" value="0">
</div>
</div>
-
<div class="layui-inline">
<label class="layui-form-label"> 鍚◣鎴愭湰浠�</label>
<div class="layui-input-inline" style="margin-top:10px">
@@ -876,6 +886,39 @@
}
});
+ //鐩戝惉涓嶅惈绋庢垚鏈环
+ $("#HNoTaxCost").blur(function (data) {
+ // 鑾峰彇杈撳叆妗嗙殑鍊�
+ var value = $("#HNoTaxCost").val();
+ if (!ref.test(value)) {
+ layer.msg("涓嶅惈绋庢垚鏈环姝ｇ‘鏁板��", { time: 3000, });
+ $("#HNoTaxCost").val("0");
+ } else {
+ var TaxRate = $("#HTaxRate").val();
+ var HProfitRate = $("#HProfitRate").val();
+ var HTaxCost = Number((value * (100 + TaxRate*1) / 100).toFixed(4)) //鍚◣鎴愭湰浠� = 涓嶅惈绋庢垚鏈� * 锛�100 + 绋庣巼锛�/100
+ var HFootPrice = Number((HTaxCost * (100 + HProfitRate*1) / 100).toFixed(4))// 缁撶畻浠� = 鍚◣鎴愭湰浠� * 锛�100+ 鍒╂鼎鐜囷級/100
+ $("#HTaxCost").val(HTaxCost);
+ $("#HFootPrice").val(HFootPrice);
+ }
+ });
+ //鐩戝惉鍚◣鎴愭湰浠�
+ $("#HTaxCost").blur(function (data) {
+ // 鑾峰彇杈撳叆妗嗙殑鍊�
+ var value = $("#HTaxCost").val();
+ if (!ref.test(value)) {
+ layer.msg("涓嶅惈绋庢垚鏈环姝ｇ‘鏁板��", { time: 3000, });
+ $("#HTaxCost").val("0");
+ } else {
+ var TaxRate = $("#HTaxRate").val();
+ var HProfitRate = $("#HProfitRate").val();
+ var HNoTaxCost = Number((value / (100 + TaxRate*1) * 100).toFixed(4))//涓嶅惈绋庢垚鏈环 = 鍚◣鎴愭湰/ 锛�100 + 绋庣巼锛�/100 缁撶畻浠�
+ var HFootPrice = Number((value * (100 + HProfitRate*1) / 100).toFixed(4))
+ $("#HNoTaxCost").val(HNoTaxCost);
+ $("#HFootPrice").val(HFootPrice);
+ }
+ });
+
//閫夋嫨棰滆壊
colorpicker.render({
elem: '#HColorNoName'
@@ -1008,9 +1051,11 @@
, "HTaxCost": data.鍚◣鎴愭湰浠�
, "HNoTaxCost": data.涓嶅惈绋庢垚鏈环
, "HOnceRightRate": data.涓�娆″悎鏍肩巼鏍囧噯鍊�
- , "HQtyDec": data.鏁伴噺绮惧害 == null ? "0" : data.鏁伴噺绮惧害
- , "HPriceDec": data.鍗曚环绮惧害 == null ? "0" : data.鍗曚环绮惧害
- , "HMoneyDec": data.閲戦绮惧害 == null ? "0" : data.閲戦绮惧害
+ , "HQtyDec": data.鏁伴噺绮惧害 == null ? "4" : data.鏁伴噺绮惧害
+ , "HPriceDec": data.鍗曚环绮惧害 == null ? "4" : data.鍗曚环绮惧害
+ , "HMoneyDec": data.閲戦绮惧害 == null ? "2" : data.閲戦绮惧害
+ , "HTaxRate": data.榛樿绋庣巼 == null ? "13" : data.榛樿绋庣巼
+ , "HProfitRate": data.榛樿鍒╂鼎鐜� == null ? "0" : data.榛樿鍒╂鼎鐜�
, "HHeight_M": data.姣涢珮
, "HInches_M": data.瀵告暟缁勭粐
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 7fb8c32..ef8942e 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"
@@ -422,6 +422,7 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
+
//鏌ヨ
//鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠秙Where鏄惁闇�瑕佽繘琛岄澶栫殑娣诲姞
//鑾峰彇鍙傛暟
@@ -948,7 +949,7 @@
//#region 鑾峰彇椤圭洰鍙�
function Get_HProject() {
//鑾峰彇椤圭洰鍙�
- var HProjectList = '<option value="0" style="color:red;" selected></option>';
+ var HProjectList = '<option value="" style="color:red;" selected></option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Gy_Material/Get_HProject",
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 6a7025e..2e3bb01 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -556,7 +556,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=1&HSupTypeID=' + HSupTypeID,
+ content: '../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=1&linterid=0',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index 5223ac6..e5cbee1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -403,12 +403,15 @@
$("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
+ setInitHCurName()
set_AddFNew();
//鍒濆鍖栬〃
get_InitGrid();
+
}
- if (OperationType == 2) {//鏂板娴佹按鍙�
+ else if (OperationType == 2) {//鏂板娴佹按鍙�
+ setInitHCurName()
var HSupTypeID = params[params[1]];//绫诲瀷id
setHNumber(HSupTypeID);
$("#HNumber").attr("readonly", true);
@@ -793,7 +796,30 @@
}
});
}
-
+ //鏂板璁剧疆榛樿绋庣巼鍜岃揣甯�
+ function setInitHCurName() {
+ var ajaxLoad = layer.load();
+ $("#HTaxRate").val(13);
+ $.ajax({
+ url: GetWEBURL() + 'Gy_Currency/list1',
+ type: "GET",
+ async:false,
+ data: { "sWhere": " and 璐у竵鍚嶇О = '浜烘皯甯�'", "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data != null) {
+ layer.close(ajaxLoad);
+ $("#HCurName").val(data1.data[0]["璐у竵鍚嶇О"])
+ $("#HCurID").val(data1.data[0]["HItemID"])
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#region 璁″垝琛�
function set_GridDelete(obj) {
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 9ca3c5b..967f337 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"
@@ -1387,8 +1387,12 @@
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ table.cache["mainTable"][i].HTechParamIDStd == null ? 0 : table.cache["mainTable"][i].HTechParamIDStd
num.push(table.cache["mainTable"][i])
}
+
+
+
}
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairSignBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairSignBillList_PDA.html"
new file mode 100644
index 0000000..70a511f
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairSignBillList_PDA.html"
@@ -0,0 +1,449 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>璁惧绛惧埌鍗曞垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/PubCustom.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </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>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 30px;">鏃ユ湡</label>
+ <input type="date" class="layui-input" id="HBeginDate" style="width:110px;" placeholder="yyyy-MM-dd">
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width:5px">-</label>
+ </div>
+ <div class="layui-inline">
+ <input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
+ </div>
+
+ <div class="layui-inline" style="margin-top:2px;">
+ <label class="layui-form-label" style="width: 60px;">璁惧缂栫爜</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEqNumber" lay-verify="HEqNumber" id="HEqNumber">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-top:2px;">
+ <label class="layui-form-label" style="width: 60px;">璁惧鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEqName" lay-verify="HEqName" id="HEqName">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-top:2px;">
+ <label class="layui-form-label" style="width: 60px;">鍗� 鎹� 鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
+ </div>
+ </div>
+
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <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="btnDel"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Sb_EqpMaintenanceBillList_PDA";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HEquipID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HRepairCheckID1", "HManagerID1", "HBillType", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btnCheck': btnCheck(1);
+ break;
+ //鍙嶅鏍�
+ case 'btnAdutCheck': btnCheck(2);
+ break;
+ //鍒犻櫎
+ case 'btnDel': btnDel();
+ break;
+ //閫�鍑�
+ case 'btn-exit':
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html";
+ });
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ table.on('row(mainTable)', function (obj) {
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ DisPlay_HideColumn();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetEquipmentBillsList",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "Type": "QD", "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.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 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , height: 'full-70'
+ , totalRow: false //寮�鍚悎璁�
+ , cols: [col]
+ , data: data1.data == null ? [] : data1.data
+ };
+ table.render(option);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ })
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HEqNumber = $("#HEqNumber").val(); //璁惧浠ｇ爜
+ var HEqName = $("#HEqName").val(); //璁惧鍚嶇О
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+
+ if (HBeginDate != "" && HEndDate != "") {
+ sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
+ }
+ if (HEqNumber != "") {
+ sWhere += " and 璁惧浠ｇ爜 like '%" + HEqNumber + "%'"
+ }
+ if (HEqName != "") {
+ sWhere += " and 璁惧鍚嶇О like '%" + HEqName + "%'"
+ }
+ if (HBillNo != "") {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+ }
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaterNumber").val("");
+ $("#HBillNo").val("");
+ $("#HEqNumber").val(""); //璁惧浠ｇ爜
+ $("#HEqName").val(""); //璁惧鍚嶇О
+ sWhere = "";
+ }
+
+ //鍒犻櫎
+ function btnDel() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Sb_EqpRepairWorkBill/DeltetEqpRepairWorkBill',
+ type: "GET",
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["hmainid","HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairSignBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairSignBill_PDA.html"
new file mode 100644
index 0000000..92550ec
--- /dev/null
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipRepairSignBill_PDA.html"
@@ -0,0 +1,767 @@
+锘�<!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">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../layuiadmin/PubCustom.js"></script>
+ <!--鑷畾涔夋牱寮�-->
+ <style>
+ .layui-form-label {
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
+ }
+ /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+ .layui-input {
+ height: 30px;
+ }
+ /*璁剧疆琛ㄥご杈撳叆妗�*/
+ .t1_input {
+ padding: 1%;
+ }
+ /*鏈珯淇℃伅td*/
+ .bz_td {
+ display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+ padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+ }
+ /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+ .bz_btu {
+ height: 30px;
+ width: 60px;
+ line-height: 30px;
+ }
+
+ th {
+ width: 70px;
+ text-align: center;
+ }
+ </style>
+</head>
+
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>璁惧缁翠慨绛惧埌鍗�</span>
+ </div>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
+ <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>璁惧鏉＄爜</th>
+ <td class="bz_td">
+ <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ヨ澶囨潯鐮佸悗鍥炶溅" style="border-radius: 50px;">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+ </td>
+ </tr>
+ <tr>
+ <th>绛惧埌浜�<span style=" color:red">*</span></th>
+ <td class="bz_td">
+ <input type="text" name="HSignEmpName" class="layui-input" id="HSignEmpName" placeholder="閫夋嫨绛惧埌浜�" style="background-color:#efefef4d;">
+ <input type="hidden" name="HSignEmpID" id="HSignEmpID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HManager" id="HManager" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>绛惧埌鏃堕棿</th>
+ <td class="t1_input">
+ <input type="datetime" name="HSignDate" class="layui-input" id="HSignDate" placeholder="璇烽�夋嫨鏃ユ湡">
+ </td>
+ </tr>
+ <tr>
+ <th>绛惧埌纭</th>
+ <td class="bz_td">
+ <textarea name="HSignNote" id="HSignNote" placeholder="璇疯緭鍏ュ唴瀹�" value="" class="layui-textarea"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;">
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鏃ユ湡</th>
+ <td class="t1_input">
+ <input type="datetime" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+ </td>
+ </tr>
+ <tr>
+ <th>閮ㄩ棬<span style=" color:red">*</span></th>
+ <td class="bz_td">
+ <input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="閫夋嫨閮ㄩ棬" style="background-color:#efefef4d;">
+ <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Department" id="Department" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>婧愬崟绫诲瀷</th>
+ <td class="bz_td">
+ <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
+ <option value="璁惧缁翠慨鐧昏鍗�" selected="selected">璁惧缁翠慨鐧昏鍗�</option>
+ <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <th>鏁呴殰鐧昏鍗�<span style=" color:red">*</span></th>
+ <td class="bz_td">
+ <input type="text" name="HMainSourceBillNo" class="layui-input" id="HMainSourceBillNo" placeholder="閫夋嫨鏁呴殰鐧昏鍗�" style="background-color:#efefef4d;">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HEquipConkBookBillNo" id="HEquipConkBookBillNo" value="0" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HEquipConkBookInterID" id="HEquipConkBookInterID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="XDHList" id="XDHList" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>璁惧鍚嶇О</th>
+ <td class="bz_td">
+ <input type="text" name="HEquipName" class="layui-input LineHeight" id="HEquipName" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HNumber" id="HNumber" value="" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="layui-tab-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鍒涘缓浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鍒涘缓鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="layui-tab-item" style="display:none;">
+ <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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ </div>
+ </div>
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
+ <!--<li>鏄庣粏淇℃伅</li>-->
+ </ul>
+ </div>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="lngBillKey" id="lngBillKey">
+ <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ var IsSet = "";
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ //#region 鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HSignDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HMakeDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HUpDateDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCheckDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDeleteDate'
+ , type: 'datetime'
+ });
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3920' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val("0");
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ //#endregion
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HSignEmpID": 0, "HManagerCode": "", "HSignEmpName": "", "HRepairExplanation": "", "HRemark": "", "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
+ switch (obj.event) {
+ //鏂板涓�琛�
+ case 'btn-AddLine': btnAddLine(NewRow);
+ break;
+ case 'btn-Edit': btnEditLine(obj);
+ break;
+ }
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+
+
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HSignDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //绛惧埌鏃堕棿
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
+ $("#HSignEmpID").val(sessionStorage["HEmpID"]); //绛惧埌浜篒D
+ $("#HSignEmpName").val(sessionStorage["HUserName"]); //绛惧埌浜�
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ //妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
+
+
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ }
+ });
+ //纭畾
+ form.on('submit(QueDin)', function (data) {
+ GetMeesageByBarCode();
+ });
+
+ //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+ $('#Cancel').on('click', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../views/index_Mobile.html";
+ });
+ })
+
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ option.data = [{ "HRepairID": $("#HRepairID").val(), "HRepairCode": "", "HRepairName": "", "HSignEmpID": $("#HSignEmpID").val(), "HManagerCode": "", "HSignEmpName": "", "HRepairExplanation": $("#HExplanation").val(), "HRemark": "", "HEmpID": $("#HEmpID").val(), "HSourceInterID": $("#HMainSourceInterID").val(), "HSourceEntryID": $("#HMainSourceEntryID").val(), "HSourceBillNo": $("#HMainSourceBillNo").val() }];
+ table.render(option);
+ data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+ var oMain = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = oMain + ';' + sSubStr;
+
+ if (AllowLoadData(sSubStr)) {
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sb_CheckEqpRepairWorkBill/SaveSb_EquipRepairSignBill_PDA",
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#Saver').removeClass("buttom_box_little");
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ });
+
+
+ //鏂板
+ form.on('submit(Add)', function (data) {
+ layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ $('#Saver').addClass("buttom_box_little");
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
+ $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
+ $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
+
+ // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
+ $("#formData")[0].reset();
+ layui.form.render();
+ option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HSignEmpID": $("#HSignEmpID").val(), "HManagerCode": "", "HSignEmpName": "", "HRepairExplanation": "", "HRemark": $("#HRemark").val(), "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+ table.render(option);
+
+ $("#HBarCode").focus();
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3910' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val("0");
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ $("#HSignDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //绛惧埌鏃堕棿
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ layer.close(index);
+ });
+ })
+
+ //#region 閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../views/index_Mobile.html";
+ });
+ })
+ //#endregion
+
+ //閮ㄩ棬寮圭獥
+ form.on('submit(Department)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '90%'],
+ maxmin: true,
+ content: ['../../views/PublicPage/DeptInformation_PDA.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(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //绛惧埌浜哄脊绐�
+ form.on('submit(HManager)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜哄憳鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../PublicPage/UserInformation_PDA.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSignEmpName").val(checkStatus.data[0].HName);
+ $("#HSignEmpID").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(XDHList)', function () {
+ var hnumber = $("HNumber").val()
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧缁翠慨鐧昏鍗�',
+ shift: 2,
+ area: ['90%', '90%'],
+ content: ['../璁惧绠＄悊/Sb_EqpConkBookBillList.html?type=2&HNumber=' + hnumber, '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('璇烽�夋嫨鍗曟嵁鏁版嵁');
+ }
+ $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+ $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
+ $("#HMainSourceBillType").val(checkStatus.data[0].HBillType);
+
+ $("#HEquipConkBookBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HEquipConkBookInterID").val(checkStatus.data[0].hmainid);
+
+ $("#HEquipID").val(checkStatus.data[0].hmainid);
+ $("#HNumber").val(checkStatus.data[0].璁惧浠ｇ爜);
+ $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+ //layer.full(index);
+ }
+ });
+ });
+
+
+ //浠ヤ笅涓烘椤甸潰鎵�鏈夋柟娉�
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HRepairID', title: 'HRepairID', edit: 'text', event: "", hide: true }
+ , { field: 'HRepairCode', title: '缁翠慨椤圭洰浠ｇ爜', edit: 'text', event: "", event: "HRepairCode" }
+ , { field: 'HRepairName', title: '缁翠慨椤圭洰', edit: 'text', event: "" }
+ , { field: 'HSignEmpID', title: 'HSignEmpID', edit: 'text', hide: true }
+ , { field: 'HManagerCode', title: '绛惧埌浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
+ , { field: 'HSignEmpName', title: '绛惧埌浜�', edit: 'text' }
+ , { field: 'HRepairExplanation', title: '缁翠慨瑕佹眰', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
+ , { field: 'HEmpID', title: 'HEmpID', edit: 'text', hide: true }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
+ ];
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , cellMinWidth: 120
+ , totalRow: true
+ , limit: 10
+ , height: 'full-50'
+ , cols: [columns]
+ , limits: [50, 500, 1000, 5000]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HSignEmpID": 0, "HManagerCode": "", "HSignEmpName": "", "HRepairExplanation": "", "HRemark": "", "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+ table.render(option);
+ }
+ //澧炲姞涓�琛�
+ function btnAddLine(NewRow) {
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+ //缂栬緫涓�琛�
+ function btnEditLine() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '缂栬緫PDA璁惧缁翠慨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../璁惧绠＄悊/Sb_EqpMaintenanceBillList_PDAEdit.html?OperationType=3&linterid=&HSouceBillType='
+ , resize: false
+ , btn: ['纭畾', '鍙栨秷']
+ , yes: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var HRepairID = parent.layer.getChildFrame('#HRepairID').val();
+ var HRepairCode = parent.layer.getChildFrame('#HRepairCode').val();
+ var HRepairName = parent.layer.getChildFrame('#HRepairName').val();
+ var HSignEmpID = parent.layer.getChildFrame('#HSignEmpID').val();
+ var HManagerCode = parent.layer.getChildFrame('#HManagerCode').val();
+ var HSignEmpName = parent.layer.getChildFrame('#HSignEmpName').val();
+ var HExplanation = parent.layer.getChildFrame('#HExplanation').val();
+ if (HRepairID == "") {
+ return layer.msg('璇烽�夋嫨缁翠慨椤圭洰');
+ }
+ if (HSignEmpID == "") {
+ return layer.msg('璇烽�夋嫨绛惧埌浜�');
+ }
+ buttonArr = [];//娓呯┖鏁扮粍
+ var checkrow = {
+ "HRepairID": HRepairID, "HRepairCode": HRepairCode, "HRepairName": HRepairName,
+ "HSignEmpID": HSignEmpID, "HManagerCode": HManagerCode, "HSignEmpName": HSignEmpName,
+ "HExplanation": HExplanation
+ };
+ buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , end: function () {
+
+ }
+ , cancel: function () {
+
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ 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 {
+ //obj.del();
+ //layer.close(index);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) {
+ if ($("#HDeptID").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 ($("#HRepairID").val() == 0) {
+ layer.msg("缁翠慨椤圭洰娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HMainSourceInterID").val() == 0) {
+ layer.msg("鏁呴殰鐧昏鍗曟病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSignEmpID").val() == 0) {
+ layer.msg("绛惧埌浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
+ if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+ layer.msg("娌℃湁璁惧鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ //if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ // sSubStr = JSON.parse(sSubStr);
+ // for (var i = 0; i < sSubStr.length; i++) {
+ // if (sSubStr[i].HManagerCode == "") {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,绛惧埌浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (sSubStr[i].HRepairCode == "") {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁翠慨椤圭洰浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // else {
+ // return true;
+ // }
+ // }
+ //}
+ return true;
+ }
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
+ var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/txtHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ $("#HEquipID").val(data.HInterID);
+ $("#HEquipName").val(data.HName);
+ $("#HSignEmpID").val(data.HRepairEmpID);
+ $("#HSignEmpName").val(data.璐熻矗浜�);
+ $("#HMainSourceBillNo").val(data.鏁呴殰鐧昏鍗�);
+ $("#HMainSourceInterID").val(data.鏁呴殰鐧昏鍗旾D);
+ $("#HMainSourceEntryID").val(data.鏁呴殰鐧昏鍗曞瓙ID);
+
+ $("#HEquipConkBookBillNo").val(data.鏁呴殰鐧昏鍗�);
+ $("#HEquipConkBookInterID").val(data.鏁呴殰鐧昏鍗曞瓙ID);
+
+ $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ $("#HBarCode").css("background-color", "#efefef4d");
+
+ HProcExchBillNoFlag = true;
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ else {
+ $("#HBarCode").val("");
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ $("#HBarCode").val("");
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ </script>
+</body>
+</html>
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 3d05afb..b04c729 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"
@@ -544,6 +544,14 @@
, 'HTechParamUnitID': result.data[i].HTechParamUnitID
, 'HTechParamUnitNumber': result.data[i].HTechParamUnitNumber
, 'HTechParamUnitName': result.data[i].HTechParamUnitName
+
+ , 'HTechParamClassID': result.data[i].HTechParamClassID
+ , 'HTechParamClassName': result.data[i].HTechParamClassName
+ , 'HTechParamIDStd': result.data[i].HTechParamIDStd
+ , 'HTechParamIDStdName': result.data[i].HTechParamIDStdName
+ , 'HResultStd': result.data[i].HResultStd
+ , 'HSNO': result.data[i].HSNO
+
, 'HVaule': result.data[i].HVaule
, 'HStd': result.data[i].HStd
, 'HMax': result.data[i].HMax
@@ -1425,7 +1433,7 @@
"HTechParamIDStd": result.data[i]["HTechParamIDStd"],
"HTechParamIDStdName": result.data[i]["瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�"],
"HResultStd": "",
- "HVaule": "",
+ "HVaule": result.data[i]["鏁伴噰鍊�"],
"HStd": result.data[i]["鏍囧噯鍊�"],
"HMax": result.data[i]["涓婇檺鍊�"],
"HMin": result.data[i]["涓嬮檺鍊�"],
@@ -1514,7 +1522,7 @@
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
//鎿嶄綔绫诲瀷锛圤perationType=1鏂板銆丱perationType=2缂栬緫锛�
if (OperationType == 2) {
- Pub_Close(2);
+ Pub_Close(1);
}
else {
Pub_Close(2);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index 278e638..9d30fab 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -522,11 +522,11 @@
}
//涓嬮檺
else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
- var HDownLimit = calc(calc(s_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
+ var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
$("#HCPK").val(HDownLimit.toFixed(4));
} else {
var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), s_AVG, "-"), (3 * s_CPK), "/");
- var HDownLimit = calc(calc(s_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
+ var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
if (s_CPK == 0) {
$("#HCPK").val(0);
} else {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_TechnologyParameterClass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_TechnologyParameterClass.html"
index 333b31d..d80e828 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_TechnologyParameterClass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_TechnologyParameterClass.html"
@@ -769,7 +769,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HTechParamName").val(checkStatus.data[0].宸ヨ壓鍙傛暟鍚嶇О);
+ $("#HTechParamName").val(checkStatus.data[0].宸ヨ壓鍙傛暟鍒嗙被鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
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 349b56a..978fee1 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"
@@ -121,7 +121,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓氬姟鍛�<label style="color:red"> * </label></label>
+ <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; float: left; width: 150px;" readonly>
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -149,7 +149,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閲囪喘鏂瑰紡<label style="color:red"> * </label></label>
+ <label class="layui-form-label">閲囪喘鏂瑰紡</label>
<div class="layui-input-inline">
<input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
<input type="hidden" name="HPSStyleID" id="HPSStyleID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -159,7 +159,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </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="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;">
@@ -1868,10 +1868,10 @@
layer.msg("璇疯緭鍏ユ眹鐜囷紒");
return;
}
- if ($("#HEmpID").val() == 0) {
- layer.msg("璇烽�夋嫨涓氬姟鍛樺憳锛�");
- return;
- }
+ //if ($("#HEmpID").val() == 0) {
+ // layer.msg("璇烽�夋嫨涓氬姟鍛樺憳锛�");
+ // return;
+ //}
if ($("#HDeptID").val() == 0) {
layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�");
return;
@@ -1880,14 +1880,14 @@
layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒");
return;
}
- if ($("#HPSStyleID").val() == 0) {
- layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�");
- return;
- }
- if ($("#HSSID").val() == 0) {
- layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�");
- return;
- }
+ //if ($("#HPSStyleID").val() == 0) {
+ // layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�");
+ // return;
+ //}
+ //if ($("#HSSID").val() == 0) {
+ // layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�");
+ // return;
+ //}
temp = $("#HExRate").val() + "";
if (temp == 0) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 7428fe3..7abf806 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -142,7 +142,7 @@
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓荤<label style="color:red"> * </label></label>
+ <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;">
@@ -1223,10 +1223,10 @@
return false;
}
- if ($("#HManagerID").val() == "0") {
- layer.msg("涓荤鏈�夋嫨!");
- return false;
- }
+ //if ($("#HManagerID").val() == "0") {
+ // layer.msg("涓荤鏈�夋嫨!");
+ // return false;
+ //}
if ($("#HWHID").val() == "0") {
layer.msg("浠撳簱鏈�夋嫨!");
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 6d884bc..4ceb2df 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"
@@ -113,7 +113,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閲囪喘鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">閲囪喘鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -133,7 +133,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閲囪喘鏂瑰紡<label style="color:red"> * </label></label>
+ <label class="layui-form-label">閲囪喘鏂瑰紡</label>
<div class="layui-input-inline">
<input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HPSStyleID" id="HPSStyleID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -162,7 +162,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </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;">
@@ -1089,11 +1089,11 @@
layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HEmpID").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 ($("#HEmpID").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: "娓╅Θ鎻愮ず" });
@@ -1104,16 +1104,19 @@
layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HPSStyleID").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 ($("#HPSStyleID").val() == "" || $("#HPSStyleID").val() == null) {
+ $("#HPSStyleID").val(0)
}
- if ($("#HSSID").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 ($("#HPSStyleID").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 ($("#HSSID").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;
+ //}
//瀛愯〃鏁版嵁妫�楠岀畝鍗曡〃鍗曢獙璇�
//鍚庣画鍙敤澶氫釜鏁扮粍瀛樺偍鍒楀悕鎵╁睍
for (var i = 0; i < option.data.length; i++) {//閬嶅巻option.data鏁扮粍
@@ -1285,7 +1288,7 @@
//閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
var HSupID = $("#HSupID").val();
if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
- var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+ var Dec = getDecByMaterID(OptionData.HItemID) //鑾峰彇绮惧害
var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
@@ -1621,7 +1624,7 @@
$("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡);
$("#HAddress").val(checkStatus.data[0].鍦板尯);
$("#HPSStyleName").val(checkStatus.data[0].閲囪喘鏂瑰紡);
- $("#HPSStyleID").val(checkStatus.data[0].HPSStyleID);
+ $("#HPSStyleID").val((checkStatus.data[0].HPSStyleID == null) ? 0 : checkStatus.data[0].HPSStyleID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1933,7 +1936,7 @@
$("#HSSName").val(obj[0].缁撶畻鏂瑰紡);
$("#HAddress").val(obj[0].鍦板尯);
$("#HPSStyleName").val(obj[0].閲囪喘鏂瑰紡);
- $("#HPSStyleID").val(obj[0].HPSStyleID);
+ $("#HPSStyleID").val(obj[0].HPSStyleID == "" ? 0 : obj[0].HPSStyleID);
}
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 203e5a1..39bbd2b 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"
@@ -113,7 +113,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -123,7 +123,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">淇濈鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -133,7 +133,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓氬姟鍛�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -167,7 +167,7 @@
</div>-->
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
+ <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;">
@@ -2378,22 +2378,22 @@
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 ($("#HEmpID").val() == 0) {
- layer.msg("璇烽�夋嫨涓氬姟鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HKeeperID").val() == 0) {
- layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HSecManagerID").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 ($("#HEmpID").val() == 0) {
+ // layer.msg("璇烽�夋嫨涓氬姟鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HKeeperID").val() == 0) {
+ // layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HSecManagerID").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;
--
Gitblit v1.9.1