From 9ddbc1ebeee86292fc65d73d7fa8df1fc3570bf6 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 25 五月 2021 14:30:36 +0800
Subject: [PATCH] nothing
---
WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html | 11 +++--
WebTM/views/模治具管理/模治具管理/Sc_MouldRepairCheckBillList.html | 6 +-
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html | 49 ++++++++++++------------
3 files changed, 33 insertions(+), 33 deletions(-)
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_MouldConkBookBillList.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_MouldConkBookBillList.html"
index 2407cc9..07b2461 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_MouldConkBookBillList.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_MouldConkBookBillList.html"
@@ -37,7 +37,7 @@
<li class="layui-this">鍩烘湰淇℃伅</li>-->
<!--<li>鍏朵粬淇℃伅</li>-->
<!--</ul>-->
- <h1 style="text-align:center;"><b>妯″叿缁翠慨楠屾敹鍗�</b></h1>
+ <h1 style="text-align:center;"><b>妯″叿鏁呴殰鐧昏琛�</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
@@ -72,10 +72,7 @@
<div class="layui-inline">
<label class="layui-form-label">鏁呴殰绫诲埆</label>
<div class="layui-input-inline">
- <select name="HCheckResult" lay-filter="aihao" id="HCheckResult">
- <option value="鍐呴儴缁翠慨">鍐呴儴缁翠慨</option>
- <option value="濮斿缁翠慨">濮斿缁翠慨</option>
- </select>
+ <input type="text" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="0">
</div>
</div>
<div class="layui-inline">
@@ -87,13 +84,13 @@
<div class="layui-inline">
<label class="layui-form-label">鏁呴殰鍙戠敓鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HCheckBeginDate" id="HCheckBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
+ <input class="layui-input" name="HConkBeginDate" id="HConkBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瑕佹眰瀹屽杽鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HCheckBeginDate" id="HCheckBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
+ <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
</div>
@@ -191,10 +188,10 @@
});
laydate.render({
- elem: '#HRepairBeginDate'
+ elem: '#HConkBeginDate'
});
laydate.render({
- elem: '#HRepairEndDate'
+ elem: '#HEndDate'
});
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -212,9 +209,9 @@
, cols: [[ //琛ㄥご
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HRepairCheckID', title: '楠屾敹椤圭洰浠ｇ爜', edit: 'text', event: "" }
- , { field: 'HRepairCheckName', title: '楠屾敹椤圭洰', edit: 'text', event: "" }
- , { field: 'HRepairCheckContent', title: '楠屾敹鍐呭', edit: 'text' }
+ , { field: 'HConkReasonID', title: '鏁呴殰鍘熷洜浠ｇ爜', edit: 'text', event: "" }
+ , { field: 'HHConkReasonName', title: '鏁呴殰鍘熷洜', edit: 'text', event: "" }
+ , { field: 'HConkExplanation', title: '鏁呴殰鍘熷洜鎻忚堪', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text' }
, { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
@@ -225,14 +222,14 @@
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HRepairCheckID": 0, "HRepairCheckName": " ", "HRepairCheckContent": " ", "HManagerID": 0, "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HConkReasonID": 0, "HHConkReasonName": "", "HConkExplanation": "", "HManagerID": 0, "HManagerName": "", "HRemark": "" }];
table.render(option);
}
else {
$("#HInterID").val(hID);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sc_MouldRepairCheckBill/Sb_MouldRepairCheckBillListProjectDetai',
+ url: GetWEBURL() + 'Sc_MouldConkBookBill/Sb_MouldConkBookBillListProjectDetai',
type: "GET",
//data: { "sqlWhere": "and HInterID=" + hID },
data: { "sqlWhere": "and hmainid=" + hID },
@@ -261,7 +258,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HRepairCheckID": 0, "HRepairCheckName": " ", "HRepairCheckContent": " ", "HManagerID": 0, "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HConkReasonID": 0, "HHConkReasonName": "", "HConkExplanation": "", "HManagerID": 0, "HManagerName": "", "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -2256,25 +2253,26 @@
alert(hID);
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
- url: GetWEBURL() + "Sc_MouldRepairCheckBill/Sb_MouldRepairCheckBillListCheckDetai",
+ url: GetWEBURL() + "Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
type: "GET",
data: {
"HID": hID
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sc_MouldRepairCheckBillList[0];
+ var data = result.data.h_v_Sc_MouldConkBookBillList[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
, "HDate": data.鏃ユ湡
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HMouldID": data.HMouldID
- , "HCheckResult": data.楠屾敹缁撹
- , "HEmpID": data.HEmpID
- , "HCheckBeginDate": data.缁翠慨鏃ユ湡
- , "HDeptID": data.HDeptID
- , "HManagerID": data.HManagerID
- , "HExplanation": data.鎽樿
+ , "HConkTypeID": data.HConkTypeID //鏁呴殰绫诲埆
+ , "HEmpID": data.HEmpID //鍙戠幇浜�
+ , "HConkBeginDate": data.鏁呴殰鍙戠敓鏃ユ湡
+ , "HEndDate": data.瑕佹眰瀹屽杽鏃ユ湡
+ , "HManagerID": data.HManagerID //璐熻矗浜�
+ , "HDeptID": data.HDeptID //浣跨敤閮ㄩ棬
+ , "HExplanation": data.鏁呴殰鎻忚堪
, "HRemark": data.澶囨敞
});
@@ -2307,7 +2305,8 @@
//console.log(d.data);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
- $("#HCheckBeginDate").val(shijian);
+ $("#HConkBeginDate").val(shijian);
+ $("#HEndDate").val(shijian);
$("#HInterID").val(0);
}
});
@@ -2438,7 +2437,7 @@
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "/Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MouldConkBookBill/SaveGetMouldConkBookBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "msg": sMainSub },
dataType: "json",
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_MouldConkBookBillList.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_MouldConkBookBillList.html"
index 3bbf242..93342e5 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_MouldConkBookBillList.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_MouldConkBookBillList.html"
@@ -125,7 +125,8 @@
, page: true
, cellMinWidth: 90
, cols: [[
- { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ { type: 'checkbox', fixed: 'left' }
+ ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
@@ -189,7 +190,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板妯″叿缁翠慨鍗�',
+ title: '鏂板妯″叿鏁呴殰鐧昏鍗�',
closeBtn: false,
shift: 2,
area: ['100%', '100%'],
@@ -213,7 +214,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫妯″叿缁翠慨鍗�'
+ , title: '缂栬緫妯″叿鏁呴殰鐧昏鍗�'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
@@ -241,8 +242,8 @@
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
- type: "POST",
- url: GetWEBURL() + "/Sc_MouldRepairCheckBill/DeltetMouldRepairCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldConkBookBill/DeltetMouldConkBookBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID },
success: function (result) {
if (result.count == 1) {
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 76b4f0f..5158513 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"
@@ -187,7 +187,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板妯″叿缁翠慨鍗�',
+ title: '鏂板妯″叿缁翠慨楠屾敹鍗�',
closeBtn: false,
shift: 2,
area: ['100%', '100%'],
@@ -211,7 +211,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫妯″叿缁翠慨鍗�'
+ , title: '缂栬緫妯″叿缁翠慨楠屾敹鍗�'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
@@ -239,7 +239,7 @@
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
- type: "POST",
+ type: "GET",
url: GetWEBURL() + "/Sc_MouldRepairCheckBill/DeltetMouldRepairCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID },
success: function (result) {
--
Gitblit v1.9.1