From 54ddbb9eba145dfdcee0c3d28bdd1a91aec34122 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 31 一月 2024 15:50:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html | 4
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html | 2
WebTM/views/生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html | 4
WebTM/views/IpadIndex.html | 66 ++
WebTM/views/基础资料/公用基础资料/xmlPM_WorkTaskBillMyList.aspx.designer.cs | 26 +
WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html | 6
WebTM/views/基础资料/公用基础资料/xmlPM_ProjectBillMainMy.aspx | 2
WebTM/views/生产管理/工单/Sc_MyTicketList.html | 8
WebTM/views/grf/我的任务.grf | 252 ++++++++++++++
WebTM/views/项目管理/工作任务/PM_WorkTaskBillMainMy.html | 530 +++++++++++++++++++++++++++++
WebTM/views/基础资料/公用基础资料/xmlPM_WorkTaskBillMyList.aspx.cs | 17
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html | 92 ++++
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 3
WebTM/views/基础资料/公用基础资料/xmlPM_WorkTaskBillMyList.aspx | 28 +
WebTM/WebTM.csproj | 10
15 files changed, 1,018 insertions(+), 32 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e68f2ed..88b887c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -307,6 +307,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx" />
@@ -672,6 +673,7 @@
<Content Include="views\grf\閫�鏂欓�氱煡鍗�.grf" />
<Content Include="views\grf\鎴戠殑椤圭洰.grf" />
<Content Include="views\grf\鎴戠殑宸ュ崟.grf" />
+ <Content Include="views\grf\鎴戠殑浠诲姟.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1578,6 +1580,7 @@
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBillList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBillMainMy.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBillList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_WorkPlanMonthBillMain.html" />
@@ -1760,6 +1763,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_MyTicke.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx.cs">
+ <DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx.designer.cs">
+ <DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx.cs">
<DependentUpon>xmlPM_ProjectBillMainMy.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 0864503..7745b58 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -38,6 +38,9 @@
var HICMOBillNo = ""; //浠诲姟鍗曞彿
var HMaterName = ""; //浜у搧鍚嶇О
var HMaterID = 0; //浜у搧ID
+ var HProQty = []; //鏃堕棿鐐逛骇閲�
+ var HBadQty = []; //涓嶈壇鏁伴噺
+ var HBadReason = []; //涓嶈壇鍘熷洜
//娉ㄦ剰锛氶�夐」鍗� 渚濊禆 element 妯″潡锛屽惁鍒欐棤娉曡繘琛屽姛鑳芥�ф搷浣�
layui.config({
base: '../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -51,9 +54,9 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
-
- var mychart1 = echarts.init(document.getElementById('mychart1'));
- var mychart2 = echarts.init(document.getElementById('mychart2'));
+ //window 鍏ㄥ眬鍙橀噺
+ window.mychart1 = echarts.init(document.getElementById('mychart1'));
+ window.mychart2 = echarts.init(document.getElementById('mychart2'));
element.on('tab(TabTest)', function (data) {
Mychart(mychart1, mychart2);
@@ -64,7 +67,7 @@
TSLoad();
});
function TSLoad() {
- $("#topleft").html("");
+ $("#topleft").html("");
var HUserName = sessionStorage["HUserName"]; //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
@@ -139,6 +142,9 @@
wktag = 0;
$("#btomleft").html("");
$("#topright").html("");
+ HProQty = []; //鏃堕棿鐐逛骇閲�
+ HBadQty = []; //涓嶈壇鏁伴噺
+ HBadReason = []; //涓嶈壇鍘熷洜
var partid = $(obj).parent().attr("id"); //鑾峰彇鐖剁骇id
var eqpid = "eqpid" + i; //鑾峰彇鎸囧畾璧勬簮鏍峰紡ID
var HSourceID = $("#" + eqpid + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮ID)
@@ -159,6 +165,8 @@
var LoadData1 = data.data.h_p_JIT_GetWorkBillListInfoBySource;
var LoadData2 = data.data.h_p_JIT_GetWorkBillListInfoBySource1;
+ var LoadData3 = data.data.h_p_JIT_GetWorkBillListInfoBySource2; //鏃堕棿鐐逛骇閲�
+ var LoadData4 = data.data.h_p_JIT_GetWorkBillListInfoBySource3; //涓嶈壇鍒嗘瀽
if (LoadData1.length > 0) //宸ュ崟鍒楄〃鏁版嵁
{
@@ -240,13 +248,40 @@
$("#topright").append(html1);
}
}
+ if (LoadData3.length > 0) //褰撳墠鐘舵�佹暟鎹�
+ {
+ let k = 0; //LoadData3 鏁版嵁鏁扮粍鐨勪笅鏍�
+ for (let i = 8; i < 21; i++) {
+ let IsAdd = false; //鏄惁瑕佺疮鍔� LoadData3 鏁版嵁鏁扮粍鐨勪笅鏍囧��
+ for (let j = 0; j < LoadData3.length; k) {
+ if (i == LoadData3[k].鏃堕棿鐐�) { //濡傛灉 i锛�8--20锛� 鏃堕棿鐐规湁浜ч噺锛屽垯鎶婁骇閲忓啓鍏ユ暟缁� HProQty锛屽惁鍒欏啓鍏� 0
+ HProQty.push(LoadData3[k].浜ч噺)
+ IsAdd = true;
+ break;
+ } else {
+ HProQty.push(0)
+ break;
+ }
+ }
+ if (k < LoadData3.length - 1 && IsAdd == true) {
+ k++;
+ }
+ }
+ }
+ if (LoadData4.length > 0) {
+ for (let i = 0; i < LoadData4.length; i++) {
+ HBadReason.push(LoadData4[i].涓嶈壇鍘熷洜);
+ HBadQty.push(LoadData4[i].涓嶈壇鏁伴噺);
+ }
+ }
+ //鍒锋柊鍥捐〃鏁版嵁
+ Mychart(mychart1, mychart2);
},
error: function (err) {
layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
return false;
}
});
-
}
}
@@ -392,6 +427,7 @@
function Mychart(mychart1, mychart2) {
+ //鐢熶骇鏁堢巼
option1 = {
title: {
text: '褰撳墠璁惧鏃ョ敓浜ф晥鐜�'
@@ -416,7 +452,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00']
+ data: ['08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00']
},
yAxis: {
type: 'value'
@@ -426,14 +462,14 @@
name: '褰撳墠璁惧鏃ョ敓浜ф晥鐜�',
type: 'line',
stack: '鎬婚噺',
- data: [120, 132, 101, 134, 90, 230, 210]
+ data: HProQty
}
]
};
-
+ //涓嶈壇鍒嗘瀽
option2 = {
title: {
- text: '褰撳墠璁惧褰撴棩涓嶈壇鍘熷洜瀵规瘮'
+ text: '褰撳墠璁惧鏈懆涓嶈壇鍘熷洜瀵规瘮'
},
legend: {
data: ['涓嶈壇鍘熷洜']
@@ -445,7 +481,7 @@
containLabel: true
},
xAxis: {
- data: ['涓嶈壇1', '涓嶈壇浜�', '涓嶈壇涓�', '涓嶈壇鍥�']
+ data: HBadReason
},
yAxis: {},
series: [{
@@ -454,7 +490,7 @@
itemStyle: {
normal: {
color: function (params) {
- var colorList = ['#2eddc1', '#FCCE10', '#E87C25', '#27727B', '#9efdc6'];
+ var colorList = ['#2eddc1', '#FCCE10', '#E87C25', '#27727B', '#9efdc6', '#F00DC6', '#8317E5', '#29086A', '#D8E848', '#17ADE5', '#FF1F86', '#A27E90', '#71BCCE', '#11715012', '#DBF7B2',];
return colorList[params.dataIndex]
},
label: {
@@ -464,7 +500,7 @@
}
}
},
- data: [220, 182, 191, 234]
+ data: HBadQty
}]
};
@@ -778,7 +814,7 @@
if (wktag == 0) {
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
- }
+ }
var IsCheck = false;
@@ -837,7 +873,7 @@
});
}
-
+
}
//涓婃枡闃查敊鍗�
@@ -1038,7 +1074,7 @@
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
<ul class="layui-tab-title">
<li class="layui-this">宸ュ崟鍒楄〃</li>
- <li style="pointer-events: none; background-color:rgb(0 0 0 / 10%);">鏁堢巼/涓嶈壇鍒嗘瀽</li>
+ <li>鏁堢巼/涓嶈壇鍒嗘瀽</li><!--style="pointer-events: none; background-color:rgb(0 0 0 / 10%);"-->
</ul>
<div class="layui-tab-content content3">
<div class="layui-tab-item layui-show">
diff --git "a/WebTM/views/grf/\346\210\221\347\232\204\344\273\273\345\212\241.grf" "b/WebTM/views/grf/\346\210\221\347\232\204\344\273\273\345\212\241.grf"
new file mode 100644
index 0000000..23c76d8
--- /dev/null
+++ "b/WebTM/views/grf/\346\210\221\347\232\204\344\273\273\345\212\241.grf"
@@ -0,0 +1,252 @@
+锘縶
+ "Version":"6.0.0.6",
+ "Title":"1a.绠�鍗曡〃鏍�",
+ "Author":"閿愭氮鎶ヨ〃杞欢",
+ "Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "LeftMargin":1,
+ "TopMargin":1,
+ "RightMargin":1,
+ "BottomMargin":1
+ },
+ "DetailGrid":{
+ "FixCols":20,
+ "AppendBlankRow":true,
+ "AppendBlankRowAtLast":true,
+ "AppendBlankCol":true,
+ "AppendBlankColWidth":40,
+ "GrowToBottom":true,
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"椤圭洰鍚嶇О"
+ },
+ {
+ "Name":"瀹㈡埛"
+ },
+ {
+ "Name":"浠诲姟鍚嶇О"
+ },
+ {
+ "Name":"浠诲姟鎻忚堪"
+ },
+ {
+ "Name":"椤圭洰缁忕悊"
+ },
+ {
+ "Name":"浠诲姟绫诲瀷"
+ },
+ {
+ "Name":"娲惧崟浜�"
+ },
+ {
+ "Name":"鎺ュ崟浜�"
+ },
+ {
+ "Name":"璇勪及宸ユ椂"
+ },
+ {
+ "Name":"鑰楃敤宸ユ椂"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"Column2",
+ "Width":2.80458
+ },
+ {
+ "Name":"Column3",
+ "Width":2.77813
+ },
+ {
+ "Name":"Column4",
+ "Width":2.77813
+ },
+ {
+ "Name":"Column5",
+ "Width":2.80458
+ },
+ {
+ "Name":"Column6",
+ "Width":2.80458
+ },
+ {
+ "Name":"Column7",
+ "Width":3.01625
+ },
+ {
+ "Name":"Column8",
+ "Width":2.59292
+ },
+ {
+ "Name":"Column9",
+ "Width":3.20146
+ },
+ {
+ "Name":"Column10",
+ "Width":4.20688
+ },
+ {
+ "Name":"Column11",
+ "Width":4.20688
+ }
+ ],
+ "ColumnContent":{
+ "Height":0.608542,
+ "ColumnContentCell":[
+ {
+ "Column":"Column2",
+ "TextAlign":"MiddleCenter",
+ "DataField":"椤圭洰鍚嶇О"
+ },
+ {
+ "Column":"Column3",
+ "TextAlign":"MiddleCenter",
+ "DataField":"瀹㈡埛"
+ },
+ {
+ "Column":"Column4",
+ "TextAlign":"MiddleCenter",
+ "DataField":"浠诲姟鍚嶇О"
+ },
+ {
+ "Column":"Column5",
+ "TextAlign":"MiddleCenter",
+ "DataField":"浠诲姟鎻忚堪"
+ },
+ {
+ "Column":"Column6",
+ "TextAlign":"MiddleCenter",
+ "DataField":"椤圭洰缁忕悊"
+ },
+ {
+ "Column":"Column7",
+ "TextAlign":"MiddleCenter",
+ "DataField":"浠诲姟绫诲瀷"
+ },
+ {
+ "Column":"Column8",
+ "TextAlign":"MiddleCenter",
+ "DataField":"娲惧崟浜�"
+ },
+ {
+ "Column":"Column9",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鎺ュ崟浜�"
+ },
+ {
+ "Column":"Column10",
+ "TextAlign":"MiddleCenter",
+ "DataField":"璇勪及宸ユ椂"
+ },
+ {
+ "Column":"Column11",
+ "TextAlign":"MiddleCenter",
+ "DataField":"璇勪及宸ユ椂"
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":0.608542,
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"Column2",
+ "TextAlign":"TopCenter",
+ "Text":"椤圭洰鍚嶇О\r\n"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column3",
+ "TextAlign":"TopCenter",
+ "Text":"瀹㈡埛"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column4",
+ "TextAlign":"TopCenter",
+ "Text":"浠诲姟鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column5",
+ "TextAlign":"TopCenter",
+ "Text":"浠诲姟鎻忚堪"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column6",
+ "TextAlign":"TopCenter",
+ "Text":"椤圭洰缁忕悊"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column7",
+ "TextAlign":"TopCenter",
+ "Text":"浠诲姟绫诲瀷"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column8",
+ "TextAlign":"TopCenter",
+ "Text":"娲惧崟浜�"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column9",
+ "TextAlign":"TopCenter",
+ "Text":"鎺ュ崟浜�"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column10",
+ "TextAlign":"TopCenter",
+ "Text":"璇勪及宸ユ椂"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column11",
+ "TextAlign":"TopCenter",
+ "Text":"鑰楃敤宸ユ椂"
+ }
+ ]
+ }
+ },
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader2",
+ "Height":2.01083,
+ "Control":[
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Left":12.8058,
+ "Top":0.608542,
+ "Width":2.80458,
+ "Height":0.582083,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":157500,
+ "Weight":400,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鎴戠殑浠诲姟"
+ }
+ ]
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":1.79917
+ }
+ ]
+}
\ 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/HBarPlanPrint.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/HBarPlanPrint.html"
index e4ca1f7..08e2d58 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/HBarPlanPrint.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/HBarPlanPrint.html"
@@ -245,6 +245,9 @@
case "Sc_MyTicketList": //鎴戠殑宸ュ崟
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_MyTicke.aspx?linterid=" + value, true, "");
break;
+ case "PM_WorkTaskBillMyList": //鎴戠殑浠诲姟
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlPM_WorkTaskBillMyList.aspx?linterid=" + value, true, "");
+ break;
}
</script>
</body>
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/xmlPM_ProjectBillMainMy.aspx" "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/xmlPM_ProjectBillMainMy.aspx"
index 21e0a54..d05e610 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/xmlPM_ProjectBillMainMy.aspx"
+++ "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/xmlPM_ProjectBillMainMy.aspx"
@@ -15,7 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "exec h_p_My_PM_ProjectReportBill '',"+Request.Params["Num"]+","+Request.Params["linterid"]);
+ SqlXMLReportData.GenOneRecordset(this, "exec h_p_My_PM_ProjectReportBill '',"+Request.Params["Num"]+",'"+Request.Params["linterid"]+"'");
}
</script>
</head>
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/xmlPM_WorkTaskBillMyList.aspx" "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/xmlPM_WorkTaskBillMyList.aspx"
new file mode 100644
index 0000000..275d588
--- /dev/null
+++ "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/xmlPM_WorkTaskBillMyList.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlPM_WorkTaskBillMyList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlPM_WorkTaskBillMyList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_PM_WorkTaskBillMyList where HInterID in("+Request.Params["linterid"]+" ) " );
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</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/xmlPM_WorkTaskBillMyList.aspx.cs" "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/xmlPM_WorkTaskBillMyList.aspx.cs"
new file mode 100644
index 0000000..c264adb
--- /dev/null
+++ "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/xmlPM_WorkTaskBillMyList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlPM_WorkTaskBillMyList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ 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/xmlPM_WorkTaskBillMyList.aspx.designer.cs" "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/xmlPM_WorkTaskBillMyList.aspx.designer.cs"
new file mode 100644
index 0000000..10b8991
--- /dev/null
+++ "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/xmlPM_WorkTaskBillMyList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlPM_WorkTaskBillMyList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_MyTicketList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_MyTicketList.html"
index b7e4ef8..b7dde12 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_MyTicketList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_MyTicketList.html"
@@ -161,7 +161,7 @@
function set_InitGrid_notStart() {
option_notStart = {
elem: '#mainTable_notStart'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, page: true
, height: 300
, cellMinWidth: 90
@@ -236,7 +236,7 @@
//鍔ㄦ�佹樉绀哄垪鍚�
option_notStart = {
elem: '#mainTable_notStart'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data.h_p_Sc_MyICMOWorkBill
, height: 'full-80'
@@ -250,7 +250,7 @@
option_finish = {
elem: '#mainTable_finish'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data.h_p_Sc_MyICMOWorkBill1
, height: 'full-80'
@@ -263,7 +263,7 @@
option_proc = {
elem: '#mainTable_proc'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data.h_p_Sc_MyICMOWorkBill2
, height: 'full-80'
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
index 10ff6e3..c2e8dd4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
@@ -96,8 +96,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></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="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="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="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
@@ -161,12 +161,12 @@
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
- ////瀹℃牳鎸夐挳
- //case 'btn-Audit': set_CheckBill();
- // break;
- ////鍙嶅鏍告寜閽�
- //case 'btn-DeAudit': set_AbandonCheck();
- // break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit': set_CheckBill();
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit': set_AbandonCheck();
+ break;
////棰勮鎸夐挳
//case 'get_PrintReport': get_PrintReport();
// break;
@@ -470,6 +470,78 @@
}
//#endregion
+ //瀹℃牳
+ function set_CheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ICMOBillQualityStatus_Tmp/Audit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+
+ //鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ICMOBillQualityStatus_Tmp/Audit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+
+ }
+
////#region 娓呯┖杩囨护鏉′欢
//function set_ClearQuery() {
// $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -689,9 +761,9 @@
});
- //#endregion
+ //#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+ //浠ヤ笂鏄痩ayui妯″潡
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
index e0660f2..8740758 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
@@ -102,6 +102,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="btn-get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -176,6 +177,9 @@
//瀹℃牳鎸夐挳
case 'btn-Audit': set_CheckBill();
break;
+ //鍙嶅鏍告寜閽�
+ case 'set_AbandonCheck': set_AbandonCheck();
+ break;
//閫�鍑�
case 'get_Exit': Pub_Close(2);
break;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
index a7c5507..68ba8e8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
@@ -120,6 +120,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Audit" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="HideColumn" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -193,6 +194,9 @@
//瀹℃牳鎸夐挳
case 'btn-Audit': set_CheckBill();
break;
+ //鍙嶅鏍告寜閽�
+ case 'set_AbandonCheck': set_AbandonCheck();
+ break;
//閫�鍑�
case 'get_Exit': Pub_Close(2);
break;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
index 11cfb4b..aa967ea 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
@@ -120,6 +120,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="btn-get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -193,6 +194,9 @@
break;
//瀹℃牳鎸夐挳
case 'btn-Audit': set_CheckBill();
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'set_AbandonCheck': set_AbandonCheck();
break;
//閫�鍑�
case 'get_Exit': Pub_Close(2);
@@ -625,7 +629,7 @@
data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
index 28007c8..77eef0f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
@@ -745,7 +745,7 @@
data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 10000, icon: 1 }, function () {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillMainMy.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillMainMy.html"
new file mode 100644
index 0000000..471eac4
--- /dev/null
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillMainMy.html"
@@ -0,0 +1,530 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鎴戠殑浠诲姟鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group"
+ <div style="padding: 10px; ">
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_LookDown" lay-filter="btn_LookDown">寮曞嚭</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">棰勮</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_report" lay-filter="btn_report">姹囨姤</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">鏈畬鎴�</li>
+ <li lay-id="2">姝ｅ湪杩涜</li>
+ <li lay-id="3">宸插畬鎴�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--鏈畬鎴�-->
+ <table class="layui-hide" id="mainTable_notcomplete" lay-filter="mainTable_notcomplete"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--姝ｅ湪杩涜-->
+ <table class="layui-hide" id="mainTable_proc" lay-filter="mainTable_proc"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--宸插畬鎴�-->
+ <table class="layui-hide" id="mainTable_finish" lay-filter="mainTable_finish"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option_notcomplete = ""; //鏈畬鎴�
+ var option_finish = ""; //宸插畬鎴�
+ var option_proc = ""; //姝ｅ湪杩涜
+ var ins;
+ var TableTab = "mainTable_notcomplete"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滄湭瀹屾垚鈥� 椤电
+ var cur_title = "鏈畬鎴�"; //褰撳墠閫変腑椤电
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "PM_WorkTaskBillMainMy";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
+ var titleData = ["HInterID", "HEntryID","HCusID", "鍗曟嵁鐘舵��", "鍗曟嵁鍙�", "HProjectID", "椤圭洰浠ｇ爜", "HPMEmpID","HEntryID"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ //寮曞嚭
+ form.on('submit(btn_LookDown)', function (data) {
+ get_Export();
+ });
+ //棰勮
+ form.on('submit(btn_view)', function (data) {
+ get_print();
+ });
+
+ //姹囨姤
+ form.on('submit(btn_report)', function (data) {
+ get_report();
+ });
+
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
+ });
+
+
+
+
+ //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+ element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
+ cur_title = data.elem.context.innerText;
+ if (cur_title == "鏈畬鎴�") {
+ TableTab = "mainTable_notcomplete";
+ } else if (cur_title == "宸插畬鎴�") {
+ TableTab = "mainTable_finish";
+ } else if (cur_title == "姝ｅ湪杩涜") {
+ TableTab = "mainTable_proc";
+ }
+ })
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栨湭瀹屾垚鍒楄〃
+ set_InitGrid_notStart();
+ //鍒濆鍖栨鍦ㄨ繘琛�
+ set_InitGrid_proc();
+ //鍒濆鍖栧凡瀹屾垚鍒楄〃
+ set_InitGrid_finish();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //鍒濆鍖栨湭瀹屾垚鍒楄〃
+ function set_InitGrid_notStart() {
+ option_notcomplete = {
+ elem: '#mainTable_notcomplete'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栧凡瀹屾垚鍒楄〃
+ function set_InitGrid_finish() {
+ option_finish = {
+ elem: '#mainTable_finish'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栨鍦ㄧ户缁垪琛�
+ function set_InitGrid_proc() {
+ option_proc = {
+ elem: '#mainTable_proc'
+ , page: false
+ , height: 500
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/PM_WorkTaskBill/PM_WorkTaskBillMainList',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_notcomplete = {
+ elem: '#mainTable_notcomplete'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_PM_WorkTaskBillMyList
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_notcomplete);
+ ins = table.render(option_notcomplete);
+
+ option_finish = {
+ elem: '#mainTable_finish'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_PM_WorkTaskBillMyList1
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_finish);
+
+ option_proc = {
+ elem: '#mainTable_proc'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data.h_p_PM_WorkTaskBillMyList2
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_proc);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "鎴戠殑浠诲姟";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+
+ table.exportFile(ins.config.id, option_notcomplete.data, "xls");
+ }
+
+ //#region 姹囨姤
+ function get_report() {
+ var checkStatus = table.checkStatus("mainTable_proc")
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板浜ч噺姹囨姤鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../../鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var deliverData = [];
+ deliverData.push({
+ "HBillType": data[0].鍗曟嵁绫诲瀷,
+ "HSourceInterID": data[0].HInterID,
+ "HSourceEntryID": data[0].婧愬崟瀛愬唴鐮�,
+ "HSourceBillNo": data[0].婧愬崟鍗曞彿,
+ "HSourceBillType": data[0].婧愬崟绫诲瀷
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(deliverData);
+ },
+ });
+ } else {
+ layer.msg('璇峰湪 姝ｅ湪鐢熶骇 椤电涓�夋嫨涓�琛屾暟鎹紑宸ワ紒');
+ }
+ }
+ //#endregion
+
+ //#region 棰勮
+ function get_print() {
+ var activeTab = getActiveTab();
+
+ if (activeTab=="鏈畬鎴�") {
+ var checkStatus = table.checkStatus('mainTable_notcomplete')
+ , data = checkStatus.data;
+ } else if (activeTab == "宸插畬鎴�") {
+ var checkStatus = table.checkStatus('mainTable_finish')
+ , data = checkStatus.data;
+ } else if (activeTab == "姝ｅ湪杩涜"){
+ var checkStatus = table.checkStatus('mainTable_proc')
+ , data = checkStatus.data;
+ }
+
+ if (checkStatus.data.length > 0) {
+ var linterid = [];
+
+ for (var i = 0; i < data.length; i++) {
+ linterid.push(data[i].HInterID.toString())
+ }
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=PM_WorkTaskBillMyList', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ }
+ }
+
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
--
Gitblit v1.9.1