From 06ea27bce6337d9ca08ad4ebb447988079b91d86 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 22 四月 2024 17:26:27 +0800
Subject: [PATCH] 1.工程项目的编辑页面，增加 工程信息 页签； 页签里 增加字段 项目类别HProjectClassID，状态，建设单位HBuildComp，地点HBuildAddress，任务编号HWorkNo，受理日期HReDate，图纸编号HPicNo，任务下达HWorkTask，项目内容HProjectNote ； 2.仓储流程的测试并完善功能； 分步式调出单-》分布式调入单 直接调拨单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html | 32 ++++++
WebTM/views/项目管理/基础建模/Add_Edit_Gy_ProjectClass.html | 0
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillEdit.html | 28 +++--
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillEdit.html | 20 ++-
WebTM/views/项目管理/基础建模/Gy_TaskClass.html | 8
WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html | 4
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html | 2
WebTM/views/项目管理/基础建模/Add_Edit_Gy_TaskClass.html | 0
WebTM/views/项目管理/基础建模/Gy_ProjectClass.html | 19 +++
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html | 1
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 119 +++++++++++++++++++++++
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html | 22 ++-
WebTM/WebTM.csproj | 8
13 files changed, 223 insertions(+), 40 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a16e1e1..53cf985 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -293,8 +293,8 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TaskClass.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ProjectClass.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_ProjectClass.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectBasis.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PoStockStyle.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CusType.html" />
@@ -312,8 +312,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectMethod.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectValue.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TemporaryArea.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TaskClass.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ProjectClass.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_ProjectClass.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_InspectBasis.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_AreaSet.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CusType.html" />
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
index bd0ca99..154f117 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
@@ -353,6 +353,8 @@
var shijian = year + "-" + month + "-" + day;
var allVal;
+ //鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
+ window.OptionData = {};
//#endregion
@@ -1566,7 +1568,7 @@
"HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "璋冨叆浠撳簱": checkStatus.data[j].璋冨叆浠撳簱, "HSCWHID": checkStatus.data[j].HSCWHID, "璋冨嚭浠撳簱": checkStatus.data[j].璋冨嚭浠撳簱,
"HPOOrderInterID": checkStatus.data[j].HPOOrderInterID, "HPOOrderEntryID": checkStatus.data[j].HPOOrderEntryID, "HPOOrderBillNo": checkStatus.data[j].閲囪喘璁㈠崟鍙�,
"HSeOrderInterID": checkStatus.data[j].HSeOrderInterID, "HSeOrderEntryID": checkStatus.data[j].HSeOrderEntryID, "HSeOrderBillNo": checkStatus.data[j].閿�鍞鍗曞彿,
- "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+ "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillSubType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
})
j++;
}
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
index 3875d75..5e54b38 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
@@ -492,7 +492,7 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
- url: GetWEBURL() + "Kf_OtherOutBill/DelteteGetOtherOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Kf_MoveStockBill/DelteteGetMoveStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillEdit.html"
index 8afb355..c52074b 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillEdit.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillEdit.html"
@@ -65,7 +65,7 @@
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" value="0">
- <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+ <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -297,6 +297,8 @@
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
var allVal;
+ //鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
+ window.OptionData = {};
//#endregion
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
@@ -790,7 +792,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -825,7 +827,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWHSub', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1201,10 +1203,14 @@
OptionData = data
}
- //鍙屽嚮杩斿洖鏀舵枡浠撳簱
- function GetGyWarehouse(data) {
- OptionData = data
- }
+ //鍙屽嚮杩斿洖璋冨叆浠撳簱
+ function GetGyWarehouse(data) {
+ OptionData = data[0]
+ }
+ //鍙屽嚮杩斿洖璋冨嚭浠撳簱
+ function GetHWHSubValue(data) {
+ OptionData = data[0]
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
index 13a9b3c..dc196fe 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
@@ -251,6 +251,7 @@
, cols: [[
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
+ , { field: 'HBillSubType', title: '鍗曟嵁绫诲瀷', hide: true, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160, sort: true }
, { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true, sort: true }
@@ -362,6 +363,37 @@
});
}
+ //缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐩存帴璋冩嫧鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: './Kf_MoveStockRequestBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
index 962cf81..79f5a4e 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
@@ -310,6 +310,8 @@
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
var allVal;
+ //鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
+ window.OptionData = {};
//#endregion
@@ -848,7 +850,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -883,7 +885,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWHSub', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -988,7 +990,7 @@
, "HSecManagerName": data.楠屾敹
, "HKeeperID": data.HKeeperID
, "HKeeperName": data.淇濈鍛�
- , "HSourceBillType": data.婧愬崟绫诲瀷
+ , "HSourceBillType": data.鍗曟嵁绫诲瀷
});
@@ -999,7 +1001,7 @@
"HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HQtyMust": checkStatus.data[j].搴旀敹鏁伴噺,
"HQty": checkStatus.data[j].瀹炴敹鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环, "HBatchNo": checkStatus.data[j].鎵规, "HRemark": checkStatus.data[j].琛ㄤ綋澶囨敞,
"HMoney": checkStatus.data[j].閲戦, "HOrderPrice": checkStatus.data[j].閲囪喘閲戦, "HWHID": checkStatus.data[j].HWHID, "璋冨叆浠撳簱": checkStatus.data[j].璋冨叆浠撳簱, "HSCWHID": checkStatus.data[j].HSCWHID, "璋冨嚭浠撳簱": checkStatus.data[j].璋冨嚭浠撳簱,
- "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+ "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].鍗曟嵁绫诲瀷, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
})
j++;
}
@@ -1332,10 +1334,14 @@
OptionData = data
}
- //鍙屽嚮杩斿洖鏀舵枡浠撳簱
- function GetGyWarehouse(data) {
- OptionData = data
- }
+ //鍙屽嚮杩斿洖璋冨叆浠撳簱
+ function GetGyWarehouse(data) {
+ OptionData = data[0]
+ }
+ //鍙屽嚮杩斿洖璋冨嚭浠撳簱
+ function GetHWHSubValue(data) {
+ OptionData = data[0]
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ProjectClass.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ProjectClass.html"
similarity index 100%
rename from "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_ProjectClass.html"
rename to "WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_ProjectClass.html"
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_TaskClass.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_TaskClass.html"
similarity index 100%
rename from "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_TaskClass.html"
rename to "WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Add_Edit_Gy_TaskClass.html"
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_ProjectClass.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ProjectClass.html"
similarity index 97%
rename from "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_ProjectClass.html"
rename to "WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ProjectClass.html"
index ac716e7..4f229ae 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_ProjectClass.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_ProjectClass.html"
@@ -362,12 +362,12 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板鍦板尯',
+ title: '鏂板椤圭洰绫诲埆',
closeBtn: 1,
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectClass.html?OperationType=1&linterid=&HSouceBillType=',
+ content: '../鍩虹寤烘ā/Add_Edit_Gy_ProjectClass.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -386,11 +386,11 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫鍦板尯'
+ , title: '缂栬緫椤圭洰绫诲埆'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , content: '../鍩虹寤烘ā/Add_Edit_Gy_ProjectClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -443,6 +443,17 @@
}
//#endregion
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetProjectClassValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+
+ //#endregion
+
//#region 鍙嶅鏍�/瀹℃牳鏁版嵁
function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
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_TaskClass.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
similarity index 98%
rename from "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_TaskClass.html"
rename to "WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
index 76bc67a..3504903 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_TaskClass.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_TaskClass.html"
@@ -362,12 +362,12 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板鍦板尯',
+ title: '鏂板浠诲姟绫诲埆',
closeBtn: 1,
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_TaskClass.html?OperationType=1&linterid=&HSouceBillType=',
+ content: '../鍩虹寤烘ā/Add_Edit_Gy_TaskClass.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -386,11 +386,11 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫鍦板尯'
+ , title: '缂栬緫浠诲姟绫诲埆'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_TaskClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , content: '../鍩虹寤烘ā/Add_Edit_Gy_TaskClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index a8c5a50..f88679a 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -69,6 +69,7 @@
<h1 style="text-align: center; padding: 10px 0;"><b>宸ョ▼椤圭洰</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">宸ョ▼淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
</ul>
<div class="layui-tab-content">
@@ -265,6 +266,73 @@
</div>
</div>
</div>
+ </div>
+ </div>
+ <!--宸ョ▼淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <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" lay-verify="HProjectClassName" name="HProjectClassName" id="HProjectClassName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProjectClassID" id="HProjectClassID" lay-verify="HProjectClassID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProjectClass" id="btnSearchHProjectClass" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <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" lay-verify="HBuildComp" name="HBuildComp" id="HBuildComp">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍦扮偣</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HBuildAddress" name="HBuildAddress" id="HBuildAddress">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟缂栧彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HWorkNo" name="HWorkNo" id="HWorkNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍙楃悊鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" lay-verify="HReDate" name="HReDate" id="HReDate" style="padding-left: 80px;">
+ </div>
+
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍥剧焊缂栧彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HPicNo" name="HPicNo" id="HPicNo">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟涓嬭揪</label>
+ <div class="layui-input-block" style="margin-left: 120px; width:815px;">
+ <textarea class="layui-textarea" name="HWorkTask" id="HWorkTask" lay-verify="HWorkTask" style="height:100px"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">椤圭洰鍐呭</label>
+ <div class="layui-input-block" style="margin-left: 120px; width:815px;">
+ <textarea class="layui-textarea" name="HProjectNote" id="HProjectNote" lay-verify="HProjectNote" style="height:100px"></textarea>
+ </div>
+ </div>
+ </div>
+
</div>
</div>
<!--鍏朵粬淇℃伅-->
@@ -501,6 +569,7 @@
$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HReDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid1();
}
@@ -580,6 +649,14 @@
form.on('submit(btnSearchHPayCus)', function () {
CusType = 2;
get_checkSearchHPayCus();
+ });
+ //#endregion
+
+ //#region 閫夋嫨椤圭洰绫诲埆鎸夐挳
+ form.on('submit(btnSearchHProjectClass)', function () {
+ get_checkSearchHProjectClass();
+
+
});
//#endregion
@@ -1226,6 +1303,34 @@
}
//#endregion
+ //#region 椤圭洰绫诲埆閫夋嫨椤甸潰
+ function get_checkSearchHProjectClass() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '椤圭洰绫诲埆琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectClass.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProjectClassID").val(checkStatus.data[0].HItemID);//椤圭洰绫诲埆id
+ $("#HProjectClassName").val(checkStatus.data[0].椤圭洰绫诲埆鍚嶇О);//椤圭洰绫诲埆鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
//#region 缁撶畻鏂归�夋嫨椤甸潰
function get_checkSearchHPayCus() {
var HOrgID = $("#HOrgID").val();
@@ -1452,6 +1557,15 @@
, "HProType": tableMain[0]["HProType"]
, "HRemark": tableMain[0]["HRemark"]
, "HOrgID": tableMain[0]["HOrgID"]
+ , "HProjectClassID": tableMain[0]["HProjectClassID"]
+ , "HProjectClassName": tableMain[0]["HProjectClassName"]
+ , "HBuildComp": tableMain[0]["HBuildComp"]
+ , "HBuildAddress": tableMain[0]["HBuildAddress"]
+ , "HWorkNo": tableMain[0]["HWorkNo"]
+ , "HReDate": tableMain[0]["HReDate"]
+ , "HPicNo": tableMain[0]["HPicNo"]
+ , "HWorkTask": tableMain[0]["HWorkTask"]
+ , "HProjectNote": tableMain[0]["HProjectNote"]
, "HMaker": tableMain[0]["HMaker"]
, "HUpdater": tableMain[0]["HUpdater"]
, "HChecker": tableMain[0]["HChecker"]
@@ -2448,6 +2562,11 @@
$("#HPMEmpID").val(obj[0].HItemID);//瀹㈡埛id
$("#HPMEmpName").val(obj[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
}
+ //椤圭洰绫诲埆
+ function GetProjectClassValue(obj) {
+ $("#HProjectClassID").val(obj[0].HItemID);//椤圭洰绫诲埆id
+ $("#HProjectClassName").val(obj[0].椤圭洰绫诲埆鍚嶇О);//椤圭洰绫诲埆鍚嶇О
+ }
//瀹炴柦鎷呭綋
function GetHWorkerValue(obj) {
$("#HWorkEmpID").val(obj[0].HItemID);//鍛樺伐id
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
index cd3babc..72d9d68 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
@@ -296,6 +296,8 @@
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
var allVal;
+ //鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
+ window.OptionData = {};
//#endregion
@@ -800,7 +802,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -818,11 +820,11 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
- })
- }
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ }
})
}
//璋冨嚭浠撳簱
@@ -835,7 +837,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWHSub', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1139,10 +1141,14 @@
OptionData = data
}
- //鍙屽嚮杩斿洖鏀舵枡浠撳簱
- function GetGyWarehouse(data) {
- OptionData = data
- }
+ //鍙屽嚮杩斿洖璋冨叆浠撳簱
+ function GetGyWarehouse(data) {
+ OptionData = data[0]
+ }
+ //鍙屽嚮杩斿洖璋冨嚭浠撳簱
+ function GetHWHSubValue(data) {
+ OptionData = data[0]
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
index 14ce60f..5e8e3d7 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
@@ -322,6 +322,7 @@
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125, sort: true }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125, sort: true }
+ , { field: '琛屽叧闂棩鏈�', title: '琛屽叧闂棩鏈�', width: 120, templet: "<div>{{d.琛屽叧闂棩鏈� ==null || d.琛屽叧闂棩鏈�=='' ?'':layui.util.toDateString(d.琛屽叧闂棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125, sort: true }
, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true, sort: true }
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true, sort: true }
--
Gitblit v1.9.1