From 48b564781aa3d20e0d644b5d026067fd8bfc8c99 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 17 十二月 2021 17:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 6 ++-
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 2
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 48 ++++++++++++++++++------
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 55 ++++++++++++++++++++++++---
WebTM/views/index.html | 8 ++--
5 files changed, 93 insertions(+), 26 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 44c6cfc..5a7950e 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -304,14 +304,14 @@
</dl>
</dd>
<dd>
- <a>姹囨姤绠＄悊</a>
+ <a>姹囨姤绠＄悊(宸ュ簭)</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">鐢熶骇姹囨姤鍗�</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">鐢熶骇姹囨姤鍗曠淮鎶�</a></dd>
<dd><a lay-href="">浜ч噺姹囨姤鍗昻ull</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList_Web.html">浜ч噺姹囨姤鍗曠淮鎶�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html">璐ㄩ噺姹囨姤鍗�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBillList.html">璐ㄩ噺姹囨姤鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">浜ч噺姹囨姤鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill.html">璐ㄩ噺姹囨姤鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBillList.html">璐ㄩ噺姹囨姤鍗曠淮鎶�</a></dd>
</dl>
</dd>
<dd>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index f4b1c9a..345c9fd 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -409,7 +409,7 @@
function set_EditFromGrid(linterid)
{
$.ajax({
- url: GetWEBURL() + "Xt_User/EditUser",
+ url: GetWEBURL() + "/Xt_User/EditUser",
type: "GET",
data: {
"HID": linterid
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 8c3f093..f7f4f8e 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"
@@ -76,7 +76,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName"" class="layui-input" value="" style="float:left;width:150px;">
+ <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="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -106,7 +106,7 @@
</button>
</div>
</div>
-
+
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -160,7 +160,7 @@
<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
</div>
</div>
-
+
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -377,7 +377,7 @@
get_checkManager();
});
-
+
//淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
@@ -432,8 +432,8 @@
, "HAddress": data.浜よ揣鍦扮偣
, "HInnerBillNo": data.杈呭姪瀛楁
, "HExRate": data.姹囩巼
- , "Box2": ""
- , "HRemark": data.琛ㄥご澶囨敞
+ , "Box2": ""
+ , "HRemark": data.琛ㄥご澶囨敞
, "HMaker": data.鍒跺崟浜�
, "HChecker": data.瀹℃牳浜�
, "HCloseMan": data.鍏抽棴浜�
@@ -474,19 +474,42 @@
//console.log(d.data);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
- $("#HInterID").val(d.data[0].HInterID);
+ $("#HInterID").val();
}
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(hID);
- /* RoadBillSub(linterid);*/
+ RoadBillMain(linterid);
+ //RoadBillSub(linterid);
}
+ //鏃ユ湡鏍煎紡鍖�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
var sMainStr = JSON.stringify(data.field);
-
+
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -512,6 +535,7 @@
});
}
//#endregion
+
function get_checkEmp() {
layer.open({
@@ -601,7 +625,7 @@
, btn2: function (index, layero) { }
})
}
-
+
function get_checkDept() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -624,7 +648,7 @@
, btn2: function (index, layero) { }
})
}
-
+
function get_checkManager() {
layer.open({
type: 2//寮圭獥绫诲瀷
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/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/Cg_POInStockBillList.html"
index 651f1ef..f37f830 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/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/Cg_POInStockBillList.html"
@@ -75,7 +75,7 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">涓荤</label>
<div class="layui-input-block">
@@ -91,6 +91,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
@@ -162,12 +164,13 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 150 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' ,width: 100}
, { field: 'HBillType', title: 'HBillType', hide: true }
, { field: 'HSupID', title: 'HSupID', width: 120, hide: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 150 }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 250 }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 }
, { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣' }
, { field: 'HCurID', title: 'HCurID', width: 120, hide: true }
, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜' }
@@ -217,7 +220,7 @@
, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-
+
]]
};
}
@@ -338,10 +341,48 @@
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
+ case 'btn-DeAudit':
+ DeAudit();
+ break;
};
});
-
+ function DeAudit(){
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1)
+ {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Cg_POInStockBill/DeAuditPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else
+ {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index a584201..2b0d015 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -44,8 +44,10 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
</div>
<div class="layui-col-xs8">
- <input type="text" value="鐢熶骇姹囨姤鍗�" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
- <input type="hidden" value="3711" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
+ <input type="text" value="鐢熶骇璁㈠崟" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
+ <input type="hidden" value="3710" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
+ <!--<input type="text" value="鐢熶骇姹囨姤鍗�" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
+ <input type="hidden" value="3711" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">-->
<!--<select name="HBillType" id="HBillType">
<option value="3711">鐢熶骇姹囨姤鍗�</option>
</select>-->
--
Gitblit v1.9.1