From cc304a3ffc2cd300963e2b7a43f9a810ecb68965 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 09 四月 2024 17:23:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/工单/Sc_CurrentTicket.html | 264 +++++++++++++++++++++++++---------------------------
1 files changed, 127 insertions(+), 137 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html"
index a55070f..94c45de 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html"
@@ -36,10 +36,12 @@
<div style="float:left;margin-left:5%;">
<dl>
<dd>
- <h2><span>璁惧鍚嶇О</span></h2>
- <h3><span>璁惧缂栧彿</span></h3>
- <h3><span>璁惧鐘舵��</span></h3>
- <h3><span>杩愯鏃堕棿</span></h3>
+ <h2><span style="margin-left:10px;" id="HEquipName"></span></h2>
+ <h3><span>璁惧缂栧彿:<span style="margin-left:10px;" id="HEquipCode"></span></span></h3>
+ <h3><span>璁惧鐘舵��:<span style="margin-left:10px;" id="HEquipStatus"></span></span></h3>
+ <h3><span>杩愯鏃堕棿:<span style="margin-left:10px;" id="HWorkTime"></span></span></h3>
+ <h3><span>褰撴棩鐐规鏃堕棿:<span style="margin-left:10px;" id="HDotCheckDate"></span></span></h3>
+ <h3><span>鏈�鍚庝繚鍏绘椂闂�:<span style="margin-left:10px;" id="HMaintainDate"></span></span></h3>
</dd>
</dl>
</div>
@@ -51,42 +53,58 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸� 鍗� 鍙�</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">宸� 鍗� 鍙�:</label>
+ <span style="margin-left:10px;" id="HICMOBillNo"></span>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">褰撳墠鐘舵��</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">褰撳墠鐘舵��:</label>
+ <span style="margin-left:10px;" id="HICMOBillStatus"></span>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">浜у搧鍚嶇О:</label>
+ <span style="margin-left:10px;" id="HMaterName"></span>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璁″垝鏁伴噺</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">璁″垝鏁伴噺:</label>
+ <span style="margin-left:10px;" id="HPlanQty"></span>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浜у搧浠ｇ爜</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">浜у搧浠ｇ爜:</label>
+ <span style="margin-left:10px;" id="HMaterNumber"></span>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">姹囨姤鎬绘暟</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">姹囨姤鎬绘暟:</label>
+ <span style="margin-left:10px;" id="HReportQty"></span>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">瑙勬牸鍨嬪彿:</label>
+ <span style="margin-left:10px;" id="HMaterModel"></span>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">棰嗘枡鐘舵��</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">棰嗘枡鐘舵��:</label>
+ <span style="margin-left:10px;" id="HPickMtrlStatus"></span>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">棣栨娆℃暟:</label>
+ <span style="margin-left:10px;" id="HFCheckNum"></span>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩囩▼妫�娆℃暟:</label>
+ <span style="margin-left:10px;" id="HPrCheckNum"></span>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸℃娆℃暟:</label>
+ <span style="margin-left:10px;" id="HPPCheckNum"></span>
</div>
</div>
</div>
@@ -99,10 +117,10 @@
<div style="margin-left:25%;">
<dl>
<dd>
- <h2><span>閮ㄩ棬</span></h2>
- <h3><span>鐝粍</span></h3>
- <h3><span>鎿嶄綔鍛�</span></h3>
- <h3><span>璐熻矗浜�</span></h3>
+ <h2><span>閮ㄩ棬<span style="margin-left:10px;" id="HDepName"></span></span></h2>
+ <h3><span>鐝粍:<span style="margin-left:10px;" id="HGroupName"></span></span></h3>
+ <h3><span>鎿嶄綔鍛�:<span style="margin-left:10px;" id="HEmpName"></span></span></h3>
+ <h3><span>璐熻矗浜�:<span style="margin-left:10px;" id="HManagerName"></span></span></h3>
</dd>
</dl>
</div>
@@ -114,12 +132,12 @@
</div>
<div id="bottom" style="width: 100%;height:calc(7vh);">
<div class="layui-form-item" style="text-align: center;">
- <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
+ <!--<button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
<button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">鏂板</button>
<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
- <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
- <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
- <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui<!---btn-radius layui-btn-danger">閫�鍑�</button>
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>-->
+ <button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
</div>
</div>
</form>
@@ -128,11 +146,39 @@
</div>
</div>
<script>
+ //鑾峰彇鍙傛暟
+ var HBillType = ""; //鍗曟嵁绫诲瀷
+ var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
+ var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
+ var HSourceBillNo = ""; //婧愬崟鍗曞彿
+ var HSourceBillType = ""; //婧愬崟绫诲瀷
+ var HEquipName = ""; //璁惧鍚嶇О
+ var HEquipCode = ""; //璁惧缂栧彿
+ var HEmpName = ""; //鎿嶄綔鍛�
+ var HManagerName = ""; //璐熻矗浜�
+ var HGroupName = ""; //鐝粍
+
+ var edit = function (data) {
+ HBillType = data[0].HBillType;
+ HSourceInterID = data[0].HSourceInterID;
+ HSourceEntryID = data[0].HSourceEntryID;
+ HSourceBillNo = data[0].HSourceBillNo;
+ HSourceBillType = data[0].HSourceBillType;
+ HEquipName = data[0].HEquipName;//璁惧鍚嶇О
+ HEquipCode = data[0].HEquipCode;//璁惧缂栧彿
+ HICMOBillNo = data[0].HICMOBillNo;//鐢熶骇璁㈠崟鍗曞彿
+ HICMOInterID = data[0].HICMOInterID;//鐢熶骇璁㈠崟涓诲唴鐮�
+ HICMOEntryID = data[0].HICMOEntryID;//鐢熶骇璁㈠崟瀛愬唴鐮�
+ HSourceID = data[0].HSourceID;//鐢熶骇璧勬簮id
+ HEmpName = data[0].HEmpName;//鎿嶄綔鍛�
+ HManagerName = data[0].HManagerName;//璐熻矗浜�
+ HGroupName = data[0].HGroupName;//鐝粍
+ }
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -144,16 +190,24 @@
, laydate = layui.laydate
, util = layui.util
, soulTable = layui.soulTable
- var sWhere = "";
+ var sWhere = "";
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
var HModName = "Sc_CurrentTicket";
- //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HInterID", "HEntryID", "HSourceID", "HMaterID", "HDeptID", "婧愬崟瀛愬唴鐮�", "婧愬崟绫诲瀷", "鍗曟嵁绫诲瀷"];
+ var HFinishRate = 0; //瀹屾垚鐜�
+ var HQualifiedRate = 0; //鍚堟牸鐜�
//鍒濆鍖栫晫闈�
set_ClearBill();
+
+ $("#HEquipName").text(HEquipName);//璁惧鍚嶇О
+ $("#HEquipCode").text(HEquipCode);//璁惧缂栧彿
+ $("#HEmpName").text(HEmpName);//鎿嶄綔鍛�
+ $("#HManagerName").text(HManagerName);//璐熻矗浜�
+ $("#HGroupName").text(HGroupName);//鐝粍
//#endregion
//#region 銆愪华琛ㄧ洏銆�
@@ -163,13 +217,13 @@
var data1 = [{
name: "瀹屾垚鐜�",
- value: 55.55,
+ value: HFinishRate.toFixed(2),
}];
// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
var option = {
//backgroundColor: "#000",
- tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
+ tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
show: true,
formatter: "{b}锛歿c}%",
backgroundColor: "rgba(50,50,50,0.7)", // 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
@@ -198,7 +252,7 @@
color: colorTemplate1, //浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑 缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜� 棰滆壊 鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 30, //杞寸嚎瀹藉害,榛樿 30銆�
- shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
}
},
@@ -210,7 +264,7 @@
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 2, //绾垮害,榛樿 2銆�
type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
}
},
@@ -218,12 +272,12 @@
show: true, // 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
splitNumber: 5, // 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
length: 8, // 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
- lineStyle: { // 鍒诲害绾挎牱寮忋��
+ lineStyle: { // 鍒诲害绾挎牱寮忋��
color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 1, //绾垮害,榛樿 1銆�
type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
},
},
@@ -245,7 +299,7 @@
borderWidth: 0, // 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
borderType: "solid", // 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
borderColor: "#000", // 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
- shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", // 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
},
emphasis: { // 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
@@ -274,17 +328,17 @@
chart1.setOption(option);
- var chart2 = echarts.init(document.getElementById("chart2"));
+ var chart2 = echarts.init(document.getElementById("chart2"));
var data2 = [{
name: "鍚堟牸鐜�",
- value: 85,
+ value: HQualifiedRate.toFixed(2),
}];
// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
var option2 = {
//backgroundColor: "#000",
- tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
+ tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
show: true,
formatter: "{b}锛歿c}%",
backgroundColor: "rgba(50,50,50,0.7)", // 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
@@ -313,7 +367,7 @@
color: colorTemplate1, //浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑 缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜� 棰滆壊 鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 30, //杞寸嚎瀹藉害,榛樿 30銆�
- shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
}
},
@@ -325,7 +379,7 @@
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 2, //绾垮害,榛樿 2銆�
type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
}
},
@@ -333,12 +387,12 @@
show: true, // 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
splitNumber: 5, // 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
length: 8, // 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
- lineStyle: { // 鍒诲害绾挎牱寮忋��
+ lineStyle: { // 鍒诲害绾挎牱寮忋��
color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 1, //绾垮害,榛樿 1銆�
type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
},
},
@@ -360,7 +414,7 @@
borderWidth: 0, // 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
borderType: "solid", // 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
borderColor: "#000", // 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
- shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", // 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
},
emphasis: { // 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
@@ -407,8 +461,9 @@
});
//閫�鍑�
- form.on('submit(get_Exit)', function (data) {
- Pub_Close(2);
+ form.on('submit(Exit)', function (data) {
+ Pub_Close(1);
+ window.parent.location.reload();
});
//鍒锋柊
@@ -419,7 +474,7 @@
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
- function set_ClearBill() {
+ function set_ClearBill() {
//鏌ヨ
get_FastQuery();
}
@@ -430,101 +485,36 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
-
+
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
-
$.ajax({
- url: GetWEBURL() + '/Sc_MyTicket/list',
+ //h_p_JIT_GetCurrentTicketInfo
+ url: GetWEBURL() + '/Sc_CurrentTicket/list',
type: "GET",
async: false,
- data: { "HSourceID": sessionStorage["HSourceID"], "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_notStart = {
- elem: '#mainTable_notStart'
- //, toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data.h_p_Sc_MyICMOWorkBill
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- }
- table.render(option_notStart);
- ins = table.render(option_notStart);
-
- option_finish = {
- elem: '#mainTable_finish'
- //, toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data.h_p_Sc_MyICMOWorkBill1
- , 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_Sc_MyICMOWorkBill2
- , 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();
-
+ data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HSourceInterID": HSourceInterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data.h_p_JIT_GetCurrentTicketInfo[0];
+ $("#HICMOBillNo").text(data.HSourceBillNo);//宸ュ崟鍙�
+ $("#HICMOBillStatus").text('');//褰撳墠鐘舵��
+ $("#HMaterNumber").text(data.HMaterNumber);//浜у搧浠ｇ爜
+ $("#HMaterName").text(data.HMaterName);//浜у搧鍚嶇О
+ $("#HMaterModel").text(data.HModel);//瑙勬牸鍨嬪彿
+ $("#HPlanQty").text(data.HPlanQty);//璁″垝鏁伴噺
+ $("#HReportQty").text(data.HRelationQty);//姹囨姤鎬绘暟
+ $("#HPickMtrlStatus").text('');//棰嗘枡鐘舵��
+ $("#HFCheckNum").text(data.棣栨娆℃暟);//棣栨娆℃暟
+ $("#HPrCheckNum").text(data.杩囩▼妫�娆℃暟);//杩囩▼妫�娆℃暟
+ $("#HPPCheckNum").text(data.宸℃娆℃暟);//宸℃娆℃暟
+ HFinishRate = data.瀹屾垚鐜�;//瀹屾垚鐜�
+ HQualifiedRate = data.鍚堟牸鐜�;//鍚堟牸鐜�
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 });
+ layer.alert(result.code + result.Message, { icon: 5 });
}
}, error: function () {
layer.close(ajaxLoad);
@@ -541,7 +531,7 @@
get_FastQuery();
}
//#endregion
-
+
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
--
Gitblit v1.9.1