From 6547f98680567698e9c4562da97fb39192082252 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 30 八月 2022 16:23:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/设备管理/Sb_EqpRepairCheckBillList.html | 5
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html | 3
WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckPlanBillList.html | 84 ++++++---
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html | 3
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 7
WebTM/views/设备管理/设备维修派工单/Sb_EquipRepairSendWorkBillEdit.html | 23 ++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillEdit.html | 11 +
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 104 +++++++-----
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html | 1
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 8
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 3
WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html | 7
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html | 3
WebTM/views/基础资料/基础资料/Gy_RepairList.html | 2
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 9
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html | 16 +
WebTM/views/模治具管理/模治具管理/Sc_MouldRepairCheckBillList.html | 7
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillEdit.html | 8
WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckBillList.html | 4
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 2
WebTM/views/设备管理/Sb_EquipDotCheckBillList.html | 1
WebTM/views/基础资料/基础资料/Gy_DotCheckList.html | 2
WebTM/views/基础资料/基础资料/Gy_RepairCheckList.html | 2
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html | 2
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 16 ++
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckPlanBillList.html | 47 +++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html | 13 +
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill.html | 4
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 29 +-
31 files changed, 282 insertions(+), 150 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index d75e26b..ae34338 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -4,10 +4,10 @@
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
- //var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
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_Department.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_Department.html"
index 070cfbf..e8a05a4 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_Department.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_Department.html"
@@ -43,7 +43,7 @@
<label class="layui-form-label">閮ㄩ棬浠ｇ爜</label>
<div class="layui-input-inline">
<input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
- <input type="hidden" name="HUseOrgID" id="HUseOrgID" value="">
+ <input type="hidden" lay-verify="HUseOrgID" id="HUseOrgID" name="HUseOrgID" value="0">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -124,7 +124,13 @@
var month = date.getMonth() + 1;
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
- $("#HUseOrgID").val(sessionStorage["OrganizationID"]);
+ if (sessionStorage["OrganizationID"] == null || sessionStorage["OrganizationID"] == undefined || sessionStorage["OrganizationID"] == " ") {
+ $("#HUseOrgID").val(0);
+ }
+ else {
+ $("#HUseOrgID").val(sessionStorage["OrganizationID"]);
+ }
+
//#endregion
@@ -280,7 +286,6 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- $("#HUseOrgID").val(sessionStorage["OrganizationID"]);
var sMainStr = JSON.stringify(data.field);
if (!$("#HNumber").val()) {
layer.msg("璇疯緭鍏ラ儴闂ㄤ唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -298,7 +303,7 @@
type: "POST",
url: GetWEBURL() + "Gy_Department/AddBill1", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
+ data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
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_DotCheckList.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_DotCheckList.html"
index 1d18d21..ba01203 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_DotCheckList.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_DotCheckList.html"
@@ -231,7 +231,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板淇濆吇椤圭洰',
+ title: '鏂板鐐规椤圭洰',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
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_RepairCheckList.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_RepairCheckList.html"
index 5e27667..015d87f 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_RepairCheckList.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_RepairCheckList.html"
@@ -231,7 +231,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板淇濆吇椤圭洰',
+ title: '鏂板缁翠慨妫�楠岄」鐩�',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
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_RepairList.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_RepairList.html"
index e709aad..4d159bd 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_RepairList.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_RepairList.html"
@@ -231,7 +231,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板淇濆吇椤圭洰',
+ title: '鏂板缁翠慨椤圭洰',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index 1e5fe8e..4b0288f 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -1003,9 +1003,6 @@
HWHID: checkStatus.data[0].HItemID,
HWHCode: checkStatus.data[0].HNumber,
HWHName: checkStatus.data[0].HName,
- HSPID: "",
- HSPCode: "",
- HSPName: "",
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
index 13680ab..b858f21 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
@@ -47,7 +47,6 @@
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
- <input id="HYear" name="HYear" type="hidden"/>
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
</div>
</div>
@@ -682,7 +681,6 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HInterID").val(0);
- $("#HYear").val(Pub_Format(new Date(), "yyyy"));
}
});
}
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index 6d9bec8..6050efb 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -1025,9 +1025,6 @@
HWHID: checkStatus.data[0].HItemID,
HWHCode: checkStatus.data[0].HNumber,
HWHName: checkStatus.data[0].HName,
- HSPID: "",
- HSPCode: "",
- HSPName: "",
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html"
index 4e43f53..cdd3032 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillEdit.html"
@@ -606,9 +606,11 @@
//鏂板
form.on('submit(set_AddNew)', function (data) {
- $("#component-form-group")[0].reset();
- layui.form.render();
- set_AddFNew();
+ //$("#component-form-group")[0].reset();
+ //$('#add-btn').addClass("layui-btn-disabled").attr("disabled", false);
+ //layui.form.render();
+ //set_AddFNew();
+ location.reload();
});
//淇濆瓨
form.on('submit(Saver)', function (data) {
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
index e42a4f3..1f4bb30 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
@@ -354,7 +354,6 @@
});
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
- alert(1);
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
});
@@ -743,7 +742,14 @@
});
//閫�鍑�
form.on('submit(Exit)', function (data) {//
- Pub_Close(1);
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
});
//鎵撳嵃Printing
form.on("submit(view)", function (data) {
@@ -892,6 +898,7 @@
, { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 100 }
, { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
id: 'mainTable'
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
index 20afce2..8553896 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
@@ -752,6 +752,7 @@
, { field: 'HSPName', title: '浠撲綅鍚嶇О', edit: 'text', width: 100 }
, { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
@@ -1158,9 +1159,6 @@
HWHID: checkStatus.data[0].HItemID,
HWHCode: checkStatus.data[0].HNumber,
HWHName: checkStatus.data[0].HName,
- HSPID: "",
- HSPCode: "",
- HSPName: "",
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index ebee0eb..db3ed87 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -1116,9 +1116,6 @@
HWHID: checkStatus.data[0].HItemID,
HWHCode: checkStatus.data[0].HNumber,
HWHName: checkStatus.data[0].HName,
- HSPID: "",
- HSPCode: "",
- HSPName: "",
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
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/Gy_MouldFile.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/Gy_MouldFile.html"
index 3695598..c7cb71b 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/Gy_MouldFile.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/Gy_MouldFile.html"
@@ -51,7 +51,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" readonly>
<input type="hidden" name="HInterID" id="HInterID">
</div>
</div>
@@ -73,21 +73,21 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿缂栧彿</label>
+ <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿缂栧彿<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鍚嶇О</label>
+ <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HName" id="HName" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HName" id="HName" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿瑙勬牸</label>
+ <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿瑙勬牸<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HModel" id="HModel" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HModel" id="HModel" >
</div>
</div>
</div>
@@ -95,19 +95,19 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HModel2" id="HModel2" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HModel2" id="HModel2">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐩村緞</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HDiameter" id="HDiameter" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HDiameter" id="HDiameter" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">杈呭姪灞炴��</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSubjoin" id="HSubjoin" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HSubjoin" id="HSubjoin" >
</div>
</div>
</div>
@@ -115,19 +115,19 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">杈呭姪灞炴��2</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSubjoin2" id="HSubjoin2" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HSubjoin2" id="HSubjoin2" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍥惧彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HPICNo" id="HPICNo" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HPICNo" id="HPICNo" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐢熶骇浜у搧鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWorkMaterModel" id="HWorkMaterModel" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HWorkMaterModel" id="HWorkMaterModel" >
</div>
</div>
</div>
@@ -135,7 +135,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -143,9 +143,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍣ㄥ叿鍒嗙被</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍣ㄥ叿鍒嗙被<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -153,9 +153,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曚綅</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曚綅<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -173,13 +173,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍑哄巶缂栧彿</label>
<div class="layui-input-block" style="margin-left: 125px;">
- <input type="text" class="layui-input" name="HOutComNo" id="HOutComNo" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HOutComNo" id="HOutComNo" />
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤閮ㄩ棬</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 80px;">
- <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
@@ -189,9 +189,9 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -201,37 +201,37 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍣ㄥ叿鐘舵��</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMouldStatus" id="HMouldStatus" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HMouldStatus" id="HMouldStatus" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹夊叏瀵垮懡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSaveLife" id="HSaveLife" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HSaveLife" id="HSaveLife" >
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撳簱</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HWHName" id="HWHName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐗堟湰鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HVersion" id="HVersion" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HVersion" id="HVersion" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HSPName" id="HSPName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
@@ -277,19 +277,19 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁捐瀵垮懡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HDesignLife" id="HDesignLife" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HDesignLife" id="HDesignLife" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浣跨敤瀵垮懡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HUseLife" id="HUseLife" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HUseLife" id="HUseLife" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍓╀綑瀵垮懡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HLeaveLife" id="HLeaveLife" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HLeaveLife" id="HLeaveLife" >
</div>
</div>
</div>
@@ -297,27 +297,27 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸茬敓浜ф暟閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProdQty" id="HProdQty" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HProdQty" id="HProdQty" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸茬敓浜ч噸閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProdWeight" id="HProdWeight" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HProdWeight" id="HProdWeight">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">绌存暟</label>
+ <label class="layui-form-label" style="width: 85px;">绌存暟<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty" >
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿淇濆吇瑙勭▼</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿淇濆吇瑙勭▼<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMouldMaintainRuleInterName" id="HMouldMaintainRuleInterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMouldMaintainRuleInterName" id="HMouldMaintainRuleInterName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMouldMaintainRuleInterList" id="HMouldMaintainRuleInterList" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -327,9 +327,19 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏉＄爜缂栧彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="background-color:#efefef4d;">
+ <input type="text" class="layui-input" name="HBarCode" id="HBarCode">
</div>
</div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">铏氭嫙浠�<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HNowSupName" id="HNowSupName" style="width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HNowSupID" id="HNowSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HNowSupList" id="HNowSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
</div>
</div>
@@ -1133,6 +1143,7 @@
},
success: function (d) {
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+
$("#HInterID").val(d.data[0].hmainid);
$("#HBillNo").val(d.data[0].鍗曟嵁鍙�);
$("#HDate").val(formatDate(d.data[0].鏃ユ湡));
@@ -1168,7 +1179,7 @@
//$("#HSPGroupID").val(d.data[0].HSPGroupID);
$("#HSPID").val(d.data[0].HSPID);
$("#HSPName").val(d.data[0].榛樿浠撲綅);
- $("#HBarCode").var(d.data[0].鏉＄爜缂栧彿);
+ //$("#HBarCode").var(d.data[0].鏉＄爜缂栧彿);
//$("#HInitDesignLife").val(d.data[0].HInitDesignLife);
//$("#HInitModel").val(d.data[0].HInitModel);
$("#HDesignLife").val(d.data[0].鍒濆璁捐瀵垮懡);
@@ -1181,6 +1192,9 @@
$("#HMouldDotCheckRuleInterID").val(d.data[0].HMouldDotCheckRuleInterID);
$("#HMouldMaintainRuleInterName").val(d.data[0].淇濆吇瑙勭▼鍗曞彿);
$("#HMouldMaintainRuleInterID").val(d.data[0].HMouldMaintainRuleInterID);
+ $("#HBarCode").val(d.data[0].鏉＄爜缂栧彿);
+ //$("#HNowSupID").val(d.data[0].HNowSupID);
+ //$("#HNowSupName").val(d.data[0].铏氭嫙浠�);
}
});
@@ -1336,8 +1350,12 @@
layer.msg("绌存暟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HNowSupID").val() == '' || $("#HCaveQty").val() == null) {
- layer.msg("璇烽�夋嫨铏氭嫙浠擄紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //if ($("#HNowSupID").val() == '' || $("#HNowSupID").val() == null) {
+ // layer.msg("璇烽�夋嫨铏氭嫙浠擄紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ if ($("#HMouldMaintainRuleInterID").val() == '' || $("#HMouldMaintainRuleInterID").val() == null) {
+ layer.msg("璇烽�夋嫨榛樿淇濆吇瑙勭▼锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
return Result;
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 6b231e4..9d0c87e 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"
@@ -212,7 +212,7 @@
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
- <option value="2" selected="selected">閲囪喘璁㈠崟</option>
+ <option value="2" selected="selected">鏁呴殰鐧昏鍗�</option>
<option value="1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -647,7 +647,7 @@
title: '鍣ㄥ叿鏁呴殰鐧昏鍗曞垪琛�',
shift: 2,
area: ['90%', '90%'],
- content: ['../../PublicPage/PurchOrder.html', 'yes'],
+ content: ['../妯℃不鍏风鐞�/Sc_MouldConkBookBillList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -659,6 +659,9 @@
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鍗曟嵁鏁版嵁');
+ }
+ else if (checkStatus.data.length >1) {
+ return layer.msg('璇烽�夋嫨涓�琛屽崟鎹暟鎹�');
}
//鍒锋柊褰撳墠椤佃〃鏍兼暟鎹噸杞�
//var oldData = table.cache["mainTable"];
@@ -858,7 +861,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [];
+ option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " " }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
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_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_MouldRepairWorkBillList.html"
index 2f0629a..5faebc9 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_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_MouldRepairWorkBillList.html"
@@ -501,7 +501,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
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_MouldDotCheckBillList.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_MouldDotCheckBillList.html"
index 68392cb..bf5dc29 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_MouldDotCheckBillList.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_MouldDotCheckBillList.html"
@@ -242,6 +242,22 @@
console.log(checkStatus);
$("#HPlanInterName").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HPlanInterID").val(checkStatus.data[0].hmainid);
+ $.ajax({
+ url: GetWEBURL() + 'Sc_MouldDotCheckBill/Sc_MouldDotCheckSubBillListByPlan',
+ type: "GET",
+ data: { "HPlanInterID": $("#HPlanInterID").val() },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
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_MouldDotCheckPlanBillList.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_MouldDotCheckPlanBillList.html"
index 2dd5100..6765b27 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_MouldDotCheckPlanBillList.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_MouldDotCheckPlanBillList.html"
@@ -56,9 +56,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿</label>
+ <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HMouldID" id="HMouldID" class="layui-input" value="0">
+ <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>
@@ -180,6 +184,44 @@
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
//#endregion
+
+ //琛ㄥご浜у搧妯″叿淇℃伅
+ form.on('submit(HMouldList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜у搧鍣ㄥ叿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/MouldInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ console.log(checkStatus);
+ $("#HMouldName").val(checkStatus.data[0].HName);
+ $("#HMouldID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//#region 澶村伐鍏锋爮浜嬩欢
@@ -361,6 +403,7 @@
, "HExplanation": data.鎽樿
, "HRemark": data.澶囨敞
, "HMouldID": data.HMouldID
+ , "HMouldName": data.浜у搧妯″叿
, "HCycleUnit": data.鍛ㄦ湡鍗曚綅
, "HCheckCycle": data.淇濆吇鍛ㄦ湡
, "HBeginDate": data.璁″垝寮�濮嬫棩鏈�
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 ba25ded..92db996 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"
@@ -77,7 +77,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">淇濆吇璁″垝鍐呯爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HPlanInterName" id="HPlanInterName" class="layui-input" value="" style="float:left;width:150px;">
@@ -86,7 +86,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">淇濆吇寮�濮嬫棩鏈�</label>
<div class="layui-input-inline">
@@ -1018,7 +1018,8 @@
, "HPlanInterID": data.淇濆吇璁″垝鍐呯爜
, "HMouldID": data.HMouldID
, "HMouldName": data.浜у搧妯″叿
-
+ , "HMouldMaintainRuleInterID": data.HMouldMaintainRuleInterID
+ , "HMouldMaintainRuleInterNo": 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_MouldDotCheckBillList.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_MouldDotCheckBillList.html"
index c63b862..be245de 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_MouldDotCheckBillList.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_MouldDotCheckBillList.html"
@@ -49,6 +49,7 @@
<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>
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
<div class="layui-colla-content">
<div class="layui-inline">
@@ -187,9 +188,10 @@
function set_ClearQuery() {
$("#HBillNo").val("");
$("#PartModul").val("");
- $("#CheckItem").val("");
$("#BenginHCreateDate").val("");
$("#EndHCreateDate").val("");
+ sWhere = "";
+ get_Display(sWhere);
}
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
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_MouldDotCheckPlanBillList.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_MouldDotCheckPlanBillList.html"
index edd68e7..14fb36a 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_MouldDotCheckPlanBillList.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_MouldDotCheckPlanBillList.html"
@@ -28,14 +28,16 @@
<span>鏇村</span>
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
<div class="layui-input-block">
- <select name="HBillType" id="HBillType">
- <option value="">鎵�鏈�</option>
- <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
- <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
- </select>
+ <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
</div>
</div>
<div class="layui-inline">
@@ -45,34 +47,24 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�</label>
+ <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
+ <input type="text" class="layui-input" name="PartModul" id="PartModul">
</div>
- </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>
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
<!--<div class="layui-colla-content">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫椂闂�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃堕棿</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
- </div>
- </div>
- </div>-->
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+
+ </div>-->
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -85,7 +77,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-
+
</div>
</script>
</form>
@@ -179,10 +171,40 @@
});
//蹇�熻繃婊�
function get_FastQuery(table, option) {
- var index = layer.load(0);
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var PartModul = $("#PartModul").val();//浜у搧妯″叿
+ var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬫棩鏈�
+ var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鏃ユ湡
+
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartModul) {
+ sWhere += " and 浜у搧妯″叿 like '%" + PartModul + "%'";
+ }
+ if (BenginHCreateDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+ }
+ if (EndHCreateDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ sWhere = "";
+ get_Display(sWhere);
+ }
+
+
function set_InitGrid() {
option = {
elem: '#mainTable'
@@ -200,7 +222,7 @@
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
, { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
, { field: '浜у搧妯″叿浠ｇ爜', title: '浜у搧鍣ㄥ叿浠ｇ爜', width: 200 }
- , { field: '浜у搧妯″叿', title: '浜у搧鍣ㄥ叿', width: 200, hide: true }
+ , { field: '浜у搧妯″叿', title: '浜у搧鍣ㄥ叿', width: 200 }
, { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
, { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200 }
, { field: '璁″垝寮�濮嬫棩鏈�', title: '璁″垝寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>" }
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_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_MouldMaintainPlanBillList.html"
index 590e32c..becb8bb 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_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_MouldMaintainPlanBillList.html"
@@ -171,6 +171,7 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
+ $("#HBillNo").val("");//鍗曟嵁鍙�
sWhere = "";
get_Display(sWhere);
}
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_MouldOtherInBillList.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_MouldOtherInBillList.html"
index 7b41bce..ea12d4f 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_MouldOtherInBillList.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_MouldOtherInBillList.html"
@@ -1,4 +1,4 @@
-锘縡<!DOCTYPE html>
+锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -121,6 +121,7 @@
</div>
</div>
</div>
+
<!--<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -444,11 +445,11 @@
var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
- var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
-
+
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
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_MouldRepairCheckBillList.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_MouldRepairCheckBillList.html"
index 94fe768..945c3b6 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_MouldRepairCheckBillList.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_MouldRepairCheckBillList.html"
@@ -159,7 +159,7 @@
break;
//鍒锋柊
case 'btn-reload':
- get_Refresh();
+ set_ClearQuery();
break;
//閫�鍑烘寜閽�
case 'btn-exit':
@@ -368,7 +368,7 @@
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
if (HCreateBy) {
- sWhere += " and 鍒跺崟浜� like '%" + HBillNo + "%'";
+ sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
}
if (BenginHCreateDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
@@ -387,7 +387,8 @@
$("#HCreateBy").val("");//鍒跺崟浜�
$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#btnSearch").click();
+ sWhere = "";
+ get_Display(sWhere);
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
index cdd6328..6b8507c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
@@ -89,7 +89,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -149,6 +149,9 @@
case 'btn-Delete':
set_DeleteBill();
break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
};
});
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 493d465..044d03e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -696,6 +696,8 @@
, "HPlanNo": data.鐐规璁″垝缂栧彿 //鐐规璁″垝缂栧彿
, "HPlanName": data.鐐规璁″垝 //鐐规璁″垝缂栧彿
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HEquipDotCheckRuleInterID": data.璁惧鐐规瑙勭▼ID // 璁惧鐐规瑙勭▼ID
+ , "HEquipDotCheckRuleInterNo": data.璁惧鐐规瑙勭▼ // 璁惧鐐规瑙勭▼
});
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index 5c45a6e..ba00879 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -188,6 +188,7 @@
, { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 160 }
, { field: '璁惧浠ｇ爜', title: '璁惧浠ｇ爜', width: 200 }
, { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200 }
+ , { field: '璁惧鐐规瑙勭▼', title: '璁惧鐐规瑙勭▼', width: 200 }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200}
, { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.寮�濮嬫棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
, { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撴潫鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 9227e57..dc4bcff 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -265,7 +265,7 @@
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
- set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ set_GridCellCheckMain(obj); //琛屽唴蹇嵎閿瓫閫�
});
//琛屽唴浜嬩欢
table.on('tool(mainTable1)', function (obj) {
@@ -614,8 +614,8 @@
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
- , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', hide: true ,edit: 'text', event: 'HMaintainItemNumber' }
- , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text' }
+ , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', hide: true ,edit: 'text' }
+ , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: 'HMaintainItemNumber' }
, { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
@@ -880,7 +880,7 @@
}
}
//琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
- function set_GridCellCheck(obj) {
+ function set_GridCellCheckMain(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event === 'HMaintainItemNumber') //淇濆吇椤圭洰淇℃伅
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 d55efca..0d055b7 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"
@@ -33,7 +33,7 @@
<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 class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">閫�鍑�</button>
</div>
</div>
<div class="layui-card-body">
@@ -256,7 +256,7 @@
</div>
<div class="layui-inline">
<label class="layui-form-label">璁惧鐘舵��<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
<select name="HStatus" lay-filter="aihao" id="HStatus">
<option value="绌洪棽" selected="selected">绌洪棽</option>
<option value="鍗犵敤">鍗犵敤</option>
@@ -268,7 +268,7 @@
</div>
</div>
</div>
- </div>
+ </div>
<!--鍏朵粬淇℃伅-->
<!--<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -381,6 +381,7 @@
, util = layui.util
;
var sBillType = "3308";
+ $("#HMakeSupID").val(0);
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -407,8 +408,15 @@
form.on('submit(Saver)', function (data) {//鎻愪氦
set_btnSave(data);
})
-
-
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function () {
+ if (linterid == undefined) {
+ Pub_Close(2);
+ }
+ else {
+ Pub_Close(1);
+ }
+ })
//璁惧淇濆吇瑙勭▼
form.on('submit(HEquipMaintainRuleInterList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -966,15 +974,6 @@
}
}
- //閫�鍑烘寜閽�
- form.on('submit(Exit)', function () {
- if (linterid == undefined) {
- Pub_Close(2);
- }
- else {
- Pub_Close(1);
- }
- })
});
function AllowLoadData() { //闈炵┖楠岃瘉
@@ -982,7 +981,7 @@
if ($("#HEquipFileNo").val() == '' || $("#HEquipFileNo").val() == null) {
layer.msg("璁惧缂栧彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
- }
+ }
if ($("#HEquipFileNumber").val() == '' || $("#HEquipFileNumber").val() == null) {
layer.msg("璁惧浠ｇ爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
index 7836d2e..80bea1f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
@@ -139,7 +139,11 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃堕棿鍗曚綅</label>
<div class="layui-input-block" style="margin-left: 125px;">
- <input type="text" class="layui-input" name="HCycleUnit" lay-verify="HCycleUnit" style="width:100%" id="HCycleUnit" value="" onmouseover="this.title=this.value">
+ <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
+ <option value="灏忔椂" selected="selected">灏忔椂</option>
+ <option value="澶�">澶�</option>
+ <option value="鏈�">鏈�</option>
+ </select>
</div>
</div>
</div>
@@ -563,10 +567,19 @@
dataType: "json",
success: function (data) {
if (data.count == 1) {
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
- $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
- location.reload();
+ if (linterid == undefined) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ location.reload();
+ });
+ }
+ else {
+ layer.msg("淇敼鎴愬姛", { time: 1 * 1000, icon: 1 }, function () {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ Pub_Close(1);
+ });
+ }
+
}
else {
layer.close(index);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index f1b88f4..6d291a8 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -127,7 +127,9 @@
</div>
</div>
</div>
-
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </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>
@@ -429,12 +431,12 @@
"HBillNo": data.鍗曟嵁鍙�
, "HInterID": data.hmainid
, "HDate": formatDate(data.鏃ユ湡)
- ,"HBeginDate":formatDate(data.璁″垝寮�濮嬫棩鏈�)
- ,"HEndDate":formatDate(data.璁″垝缁撴潫鏃ユ湡)
- ,"HCheckCycle":data.鐐规鍛ㄦ湡
- ,"HCycleUnit":data.鍛ㄦ湡鍗曚綅
- ,"HExplanation":data.鎽樿
- ,"HRemark":data.澶囨敞
+ , "HBeginDate": formatDate(data.璁″垝寮�濮嬫棩鏈�)
+ , "HEndDate": formatDate(data.璁″垝缁撴潫鏃ユ湡)
+ , "HCheckCycle": data.鐐规鍛ㄦ湡
+ , "HCycleUnit": data.鍛ㄦ湡鍗曚綅
+ , "HExplanation": data.鎽樿
+ , "HRemark": data.澶囨敞
});
} else {
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/Kf_POStockInBill_Fast.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/Kf_POStockInBill_Fast.html"
index 150f1c0..d0ecc67 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/Kf_POStockInBill_Fast.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/Kf_POStockInBill_Fast.html"
@@ -166,6 +166,7 @@
<input type="text" name="HBillerID" id="HBillerID" lay-verify="HBillerID" autocomplete="off" class="layui-input">
<input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
<input type="hidden" name="HMakerID" id="HMakerID" lay-verify="HMakerID" value="0" autocomplete="off" class="layui-input" style="display : none">
+ <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0" autocomplete="off" class="layui-input" style="display : none">
</div>
</div>
</div>
@@ -404,6 +405,8 @@
$("#HMakerID").hide();
$("#HBillerID").val(sessionStorage["HBillerID"]);
$("#HBillerID").hide();
+ $("#HSTOCKORGID").val(sessionStorage["OrganizationID"]);
+ $("#HSTOCKORGID").hide();
var HSourceFlag = sessionStorage["SourceFlag"];
//榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
--
Gitblit v1.9.1