From 8dc28871e65261d716f0f05aa105a39fbd9dc3a2 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 11 三月 2024 23:13:35 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 13
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 32
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_AreaSet.html | 24
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html | 608 +++++++++++++++++++++++---
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.htmlList.html | 31
WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html | 20
WebTM/views/IpadIndex.html | 36 +
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html | 4
WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html | 2
WebTM/WebTM.csproj | 1
WebTM/views/生产管理/工单/Sc_CurrentTicket.html | 549 +++++++++++++++++++++++
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 17
12 files changed, 1,197 insertions(+), 140 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f1f3bb4..b635a0a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -404,6 +404,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_SplitBarCode.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MaterialMouldBillMainList.html" />
<Content Include="views\鐢熶骇绠＄悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
+ <Content Include="views\鐢熶骇绠＄悊\宸ュ崟\Sc_CurrentTicket.html" />
<Content Include="views\鐢熶骇绠＄悊\宸ュ崟\Sc_MyTicketList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ICMOBillQualityStatus_TmpList.html" />
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 7745b58..ccfe5fd 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -575,8 +575,7 @@
}
return result;
}
-
-
+
//寮�宸ユ寜閽偣鍑讳簨浠�
function OpenWork(event, obj) {
if (wktag == 0) {
@@ -983,6 +982,27 @@
})
}
+ //褰撳墠宸ュ崟鎸夐挳鐐瑰嚮浜嬩欢
+ function CurrentStatus(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '褰撳墠宸ュ崟',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/宸ュ崟/Sc_CurrentTicket.html?OperationType=2&linterid=&HSouceBillType=',
+ end: function () {
+
+ }
+ });
+ }
+
//閫�鍑�
function Esc(event, obj) {
parent.location.href = "index.html"
@@ -1124,13 +1144,13 @@
</div>
</div>
<div class="layui-row layui-col-space10" style="display:none;">
- <div class="layui-col-sm12 layui-col-md4" onclick="KSOpenWork(event,this)" >
+ <div class="layui-col-sm12 layui-col-md4" onclick="KSOpenWork(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-pause imgicon"></span>
<span class="imgtitle">蹇�熷紑宸�</span>
</div>
</div>
-
+
</div>
<div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md4" onclick="SOP(event,this)">
@@ -1198,6 +1218,14 @@
</div>
</div>
</div>
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 layui-col-md4" onclick="CurrentStatus(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-console imgicon"></span>
+ <span class="imgtitle">褰撳墠鐘舵��</span>
+ </div>
+ </div>
+ </div>
</div>
</fieldset>
</div>
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_AreaSet.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/Add_Edit_Gy_AreaSet.html"
index 396e7c6..84c97c2 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/Add_Edit_Gy_AreaSet.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/Add_Edit_Gy_AreaSet.html"
@@ -35,7 +35,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">浠ｇ爜锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off" readonly>
<input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
</div>
</div>
@@ -138,6 +138,9 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
+
+ //鑷姩鐢熸垚娴佹按鍙�
+ CreateNumber();
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid();
@@ -214,7 +217,7 @@
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
$("#HItemID").val("0");
- $("#HNumber").val("");
+
}
//缂栬緫
function set_EditFromGrid() {
@@ -278,6 +281,23 @@
}
})
}
+
+ //#region 鐢熸垚娴佹按鍙�
+ function CreateNumber() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumber",
+ async: false,
+ type: "GET",
+ //绗竴涓弬鏁�:褰撳墠鍒楄〃鍚嶇О鐨勬瘡涓瓧鐨勯瀛楁瘝 绗簩涓�:鎻掑叆鍔ㄦ�佸垪琛ㄧ殑鍒楄〃鍚嶇О,瑕佸瓨鍏ユ暟鎹簱 绗笁涓�:褰撳墠鍒楄〃鐨勮〃鍚�,瑕佸瓨鍏ユ暟鎹簱
+ data: { "HBillType": 'DQ', "HName": '鍦板尯', "TableName":'Gy_AreaSet'}, //鏍规嵁 HName 鐨勫�煎幓鏌ュ綋鍓嶆祦姘村彿
+ success: function (d) {
+ $("#HNumber").val(d.data[0].HNumber);
+
+ }
+ });
+ }
+ //#endregion
+
//#endregion
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
index d20f59a..822c570 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
@@ -891,17 +891,17 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function () {
-
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
});
- if (data.Verify == "Y") //鑷姩瀹℃牳
- {
- layer.close(index);
- SaveVerify(); //瀹℃牳
- }
- else {
- layer.close(index);
- }
+
//layer.confirm(data.Message, {
// btn: ['纭']
//}, function (index) {
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"
new file mode 100644
index 0000000..a55070f
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html"
@@ -0,0 +1,549 @@
+锘�<!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>
+ <script src="../../../layuiadmin/echarts.min.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 id="top" style="width:100%;height:calc(44vh);">
+ <div id="top-left" style="width:49.8%;height:calc(44vh);float:left;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">璁惧</span></label>
+ </div>
+ <div>
+ <img src="../../../layuiadmin/layui/images/device.png" onerror="javascript:this.src='../../../layuiadmin/layui/images/erro.png';this.onerror = null" style="width:20%;height:calc(35vh);float:left" />
+ <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>
+ </dd>
+ </dl>
+ </div>
+ </div>
+ </div>
+ <div id="top-right" style="width:49.8%;height:calc(44vh);float:left;margin-left:0.2%;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">宸ュ崟</span></label>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸� 鍗� 鍙�</label>
+ <span>aaaaaaa</span>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">褰撳墠鐘舵��</label>
+ <span>aaaaaaa</span>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <span>aaaaaaa</span>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁″垝鏁伴噺</label>
+ <span>aaaaaaa</span>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浜у搧浠ｇ爜</label>
+ <span>aaaaaaa</span>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">姹囨姤鎬绘暟</label>
+ <span>aaaaaaa</span>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <span>aaaaaaa</span>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">棰嗘枡鐘舵��</label>
+ <span>aaaaaaa</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="center" style="width: 100%;height:calc(44vh);margin-top:1%;">
+ <div id="center-left" style="width:49.8%;height:calc(44vh);float:left;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">浜哄憳</span></label>
+ </div>
+ <div style="margin-left:25%;">
+ <dl>
+ <dd>
+ <h2><span>閮ㄩ棬</span></h2>
+ <h3><span>鐝粍</span></h3>
+ <h3><span>鎿嶄綔鍛�</span></h3>
+ <h3><span>璐熻矗浜�</span></h3>
+ </dd>
+ </dl>
+ </div>
+ </div>
+ <div id="center-right" style="width:49.8%;height:calc(44vh);float:left;margin-left:0.2%;">
+ <div id="chart1" style="width: 40%;height: calc(40vh);left: 2%;float:left;"></div>
+ <div id="chart2" style="width: 40%;height: calc(40vh);left: 2%;float:left;"></div>
+ </div>
+ </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="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>
+ </div>
+ </div>
+ </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 = "";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var HModName = "Sc_CurrentTicket";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 銆愪华琛ㄧ洏銆�
+ var chart1 = echarts.init(document.getElementById("chart1"));
+
+ var colorTemplate1 = [[0.2, "rgba(255,0,0,0.8)"], [0.8, "rgba(0,255,255,0.8)"], [1, "rgba(0,255,0,0.8)"]];
+
+ var data1 = [{
+ name: "瀹屾垚鐜�",
+ value: 55.55,
+ }];
+
+ // 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
+ var option = {
+ //backgroundColor: "#000",
+ tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
+ show: true,
+ formatter: "{b}锛歿c}%",
+ backgroundColor: "rgba(50,50,50,0.7)", // 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
+ borderColor: "#333", // 鎻愮ず妗嗘诞灞傜殑杈规棰滆壊銆�...
+ borderWidth: 0, // 鎻愮ず妗嗘诞灞傜殑杈规瀹姐��...
+ padding: 5, // 鎻愮ず妗嗘诞灞傚唴杈硅窛锛屽崟浣峱x锛岄粯璁ゅ悇鏂瑰悜鍐呰竟璺濅负5锛屾帴鍙楁暟缁勫垎鍒瀹氫笂鍙充笅宸﹁竟璺濄��...
+ textStyle: { // 鎻愮ず妗嗘诞灞傜殑鏂囨湰鏍峰紡銆�...
+ // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
+ },
+ },
+ series: [
+ {
+ name: "鍗曚华琛ㄧ洏绀轰緥", // 绯诲垪鍚嶇О,鐢ㄤ簬tooltip鐨勬樉绀猴紝legend 鐨勫浘渚嬬瓫閫夛紝鍦� setOption 鏇存柊鏁版嵁鍜岄厤缃」鏃剁敤浜庢寚瀹氬搴旂殑绯诲垪銆�
+ type: "gauge", // 绯诲垪绫诲瀷
+ radius: "80%", // 鍙傛暟:number, string銆� 浠〃鐩樺崐寰�,榛樿 75% 锛屽彲浠ユ槸鐩稿浜庡鍣ㄩ珮瀹戒腑杈冨皬鐨勪竴椤圭殑涓�鍗婄殑鐧惧垎姣旓紝涔熷彲浠ユ槸缁濆鐨勬暟鍊笺��
+ center: ["50%", "55%"], // 浠〃鐩樹綅缃�(鍦嗗績鍧愭爣)
+ startAngle: 225, // 浠〃鐩樿捣濮嬭搴�,榛樿 225銆傚渾蹇� 姝ｅ彸鎵嬩晶涓�0搴︼紝姝ｄ笂鏂逛负90搴︼紝姝ｅ乏鎵嬩晶涓�180搴︺��
+ endAngle: -45, // 浠〃鐩樼粨鏉熻搴�,榛樿 -45
+ clockwise: true, // 浠〃鐩樺埢搴︽槸鍚︽槸椤烘椂閽堝闀�,榛樿 true銆�
+ min: 0, // 鏈�灏忕殑鏁版嵁鍊�,榛樿 0 銆傛槧灏勫埌 minAngle銆�
+ max: 100, // 鏈�澶х殑鏁版嵁鍊�,榛樿 100 銆傛槧灏勫埌 maxAngle銆�
+ splitNumber: 10, // 浠〃鐩樺埢搴︾殑鍒嗗壊娈垫暟,榛樿 10銆�
+ axisLine: { // 浠〃鐩樿酱绾�(杞粨绾�)鐩稿叧閰嶇疆銆�
+ show: true, // 鏄惁鏄剧ず浠〃鐩樿酱绾�(杞粨绾�),榛樿 true銆�
+ lineStyle: { // 浠〃鐩樿酱绾挎牱寮忋��
+ 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 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ }
+ },
+ splitLine: { // 鍒嗛殧绾挎牱寮忋��
+ show: true, // 鏄惁鏄剧ず鍒嗛殧绾�,榛樿 true銆�
+ length: 30, // 鍒嗛殧绾跨嚎闀裤�傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 30銆�
+ lineStyle: { // 鍒嗛殧绾挎牱寮忋��
+ color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
+ opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ width: 2, //绾垮害,榛樿 2銆�
+ type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ }
+ },
+ axisTick: { // 鍒诲害(绾�)鏍峰紡銆�
+ show: true, // 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
+ splitNumber: 5, // 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
+ length: 8, // 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
+ lineStyle: { // 鍒诲害绾挎牱寮忋��
+ color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
+ opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ width: 1, //绾垮害,榛樿 1銆�
+ type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ },
+ },
+ axisLabel: { // 鍒诲害鏍囩銆�
+ show: true, // 鏄惁鏄剧ず鏍囩,榛樿 true銆�
+ distance: 5, // 鏍囩涓庡埢搴︾嚎鐨勮窛绂�,榛樿 5銆�
+ color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #fff銆�
+ fontSize: 9, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 5銆�
+ formatter: "{value}", // 鍒诲害鏍囩鐨勫唴瀹规牸寮忓櫒锛屾敮鎸佸瓧绗︿覆妯℃澘鍜屽洖璋冨嚱鏁颁袱绉嶅舰寮忋�� 绀轰緥:// 浣跨敤瀛楃涓叉ā鏉匡紝妯℃澘鍙橀噺涓哄埢搴﹂粯璁ゆ爣绛� {value},濡�:formatter: '{value} kg'; // 浣跨敤鍑芥暟妯℃澘锛屽嚱鏁板弬鏁板垎鍒负鍒诲害鏁板��,濡俧ormatter: function (value) {return value + 'km/h';}
+ },
+ pointer: { // 浠〃鐩樻寚閽堛��
+ show: true, // 鏄惁鏄剧ず鎸囬拡,榛樿 true銆�
+ length: "70%", // 鎸囬拡闀垮害锛屽彲浠ユ槸缁濆鏁板�硷紝涔熷彲浠ユ槸鐩稿浜庡崐寰勭殑鐧惧垎姣�,榛樿 80%銆�
+ width: 5, // 鎸囬拡瀹藉害,榛樿 8銆�
+ },
+ itemStyle: { // 浠〃鐩樻寚閽堟牱寮忋��
+ color: "auto", // 鎸囬拡棰滆壊锛岄粯璁�(auto)鍙栨暟鍊兼墍鍦ㄧ殑鍖洪棿鐨勯鑹�
+ opacity: 1, // 鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ borderWidth: 0, // 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
+ borderType: "solid", // 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
+ borderColor: "#000", // 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
+ shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowColor: "#fff", // 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ },
+ emphasis: { // 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
+ itemStyle: {
+ //楂樹寒 鍜屾甯� 涓よ�呭叿鏈夊悓鏍风殑閰嶇疆椤�,鍙槸鍦ㄤ笉鍚岀姸鎬佷笅閰嶇疆椤圭殑鍊间笉鍚屻��
+ }
+ },
+ title: { // 浠〃鐩樻爣棰樸��
+ show: true, // 鏄惁鏄剧ず鏍囬,榛樿 true銆�
+ offsetCenter: [0, "95%"],//鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+ color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #333銆�
+ fontSize: 20, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+ },
+ detail: { // 浠〃鐩樿鎯咃紝鐢ㄤ簬鏄剧ず鏁版嵁銆�
+ show: true, // 鏄惁鏄剧ず璇︽儏,榛樿 true銆�
+ offsetCenter: [0, "70%"],// 鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+ color: "auto", // 鏂囧瓧鐨勯鑹�,榛樿 auto銆�
+ fontSize: 30, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+ formatter: "{value}%", // 鏍煎紡鍖栧嚱鏁版垨鑰呭瓧绗︿覆
+ },
+ data: data1
+ }
+ ]
+ };
+ // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃
+ chart1.setOption(option);
+
+
+ var chart2 = echarts.init(document.getElementById("chart2"));
+
+ var data2 = [{
+ name: "鍚堟牸鐜�",
+ value: 85,
+ }];
+
+ // 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
+ var option2 = {
+ //backgroundColor: "#000",
+ tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
+ show: true,
+ formatter: "{b}锛歿c}%",
+ backgroundColor: "rgba(50,50,50,0.7)", // 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
+ borderColor: "#333", // 鎻愮ず妗嗘诞灞傜殑杈规棰滆壊銆�...
+ borderWidth: 0, // 鎻愮ず妗嗘诞灞傜殑杈规瀹姐��...
+ padding: 5, // 鎻愮ず妗嗘诞灞傚唴杈硅窛锛屽崟浣峱x锛岄粯璁ゅ悇鏂瑰悜鍐呰竟璺濅负5锛屾帴鍙楁暟缁勫垎鍒瀹氫笂鍙充笅宸﹁竟璺濄��...
+ textStyle: { // 鎻愮ず妗嗘诞灞傜殑鏂囨湰鏍峰紡銆�...
+ // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
+ },
+ },
+ series: [
+ {
+ name: "鍗曚华琛ㄧ洏绀轰緥", // 绯诲垪鍚嶇О,鐢ㄤ簬tooltip鐨勬樉绀猴紝legend 鐨勫浘渚嬬瓫閫夛紝鍦� setOption 鏇存柊鏁版嵁鍜岄厤缃」鏃剁敤浜庢寚瀹氬搴旂殑绯诲垪銆�
+ type: "gauge", // 绯诲垪绫诲瀷
+ radius: "80%", // 鍙傛暟:number, string銆� 浠〃鐩樺崐寰�,榛樿 75% 锛屽彲浠ユ槸鐩稿浜庡鍣ㄩ珮瀹戒腑杈冨皬鐨勪竴椤圭殑涓�鍗婄殑鐧惧垎姣旓紝涔熷彲浠ユ槸缁濆鐨勬暟鍊笺��
+ center: ["50%", "55%"], // 浠〃鐩樹綅缃�(鍦嗗績鍧愭爣)
+ startAngle: 225, // 浠〃鐩樿捣濮嬭搴�,榛樿 225銆傚渾蹇� 姝ｅ彸鎵嬩晶涓�0搴︼紝姝ｄ笂鏂逛负90搴︼紝姝ｅ乏鎵嬩晶涓�180搴︺��
+ endAngle: -45, // 浠〃鐩樼粨鏉熻搴�,榛樿 -45
+ clockwise: true, // 浠〃鐩樺埢搴︽槸鍚︽槸椤烘椂閽堝闀�,榛樿 true銆�
+ min: 0, // 鏈�灏忕殑鏁版嵁鍊�,榛樿 0 銆傛槧灏勫埌 minAngle銆�
+ max: 100, // 鏈�澶х殑鏁版嵁鍊�,榛樿 100 銆傛槧灏勫埌 maxAngle銆�
+ splitNumber: 10, // 浠〃鐩樺埢搴︾殑鍒嗗壊娈垫暟,榛樿 10銆�
+ axisLine: { // 浠〃鐩樿酱绾�(杞粨绾�)鐩稿叧閰嶇疆銆�
+ show: true, // 鏄惁鏄剧ず浠〃鐩樿酱绾�(杞粨绾�),榛樿 true銆�
+ lineStyle: { // 浠〃鐩樿酱绾挎牱寮忋��
+ 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 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ }
+ },
+ splitLine: { // 鍒嗛殧绾挎牱寮忋��
+ show: true, // 鏄惁鏄剧ず鍒嗛殧绾�,榛樿 true銆�
+ length: 30, // 鍒嗛殧绾跨嚎闀裤�傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 30銆�
+ lineStyle: { // 鍒嗛殧绾挎牱寮忋��
+ color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
+ opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ width: 2, //绾垮害,榛樿 2銆�
+ type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ }
+ },
+ axisTick: { // 鍒诲害(绾�)鏍峰紡銆�
+ show: true, // 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
+ splitNumber: 5, // 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
+ length: 8, // 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
+ lineStyle: { // 鍒诲害绾挎牱寮忋��
+ color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
+ opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ width: 1, //绾垮害,榛樿 1銆�
+ type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ },
+ },
+ axisLabel: { // 鍒诲害鏍囩銆�
+ show: true, // 鏄惁鏄剧ず鏍囩,榛樿 true銆�
+ distance: 5, // 鏍囩涓庡埢搴︾嚎鐨勮窛绂�,榛樿 5銆�
+ color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #fff銆�
+ fontSize: 9, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 5銆�
+ formatter: "{value}", // 鍒诲害鏍囩鐨勫唴瀹规牸寮忓櫒锛屾敮鎸佸瓧绗︿覆妯℃澘鍜屽洖璋冨嚱鏁颁袱绉嶅舰寮忋�� 绀轰緥:// 浣跨敤瀛楃涓叉ā鏉匡紝妯℃澘鍙橀噺涓哄埢搴﹂粯璁ゆ爣绛� {value},濡�:formatter: '{value} kg'; // 浣跨敤鍑芥暟妯℃澘锛屽嚱鏁板弬鏁板垎鍒负鍒诲害鏁板��,濡俧ormatter: function (value) {return value + 'km/h';}
+ },
+ pointer: { // 浠〃鐩樻寚閽堛��
+ show: true, // 鏄惁鏄剧ず鎸囬拡,榛樿 true銆�
+ length: "70%", // 鎸囬拡闀垮害锛屽彲浠ユ槸缁濆鏁板�硷紝涔熷彲浠ユ槸鐩稿浜庡崐寰勭殑鐧惧垎姣�,榛樿 80%銆�
+ width: 5, // 鎸囬拡瀹藉害,榛樿 8銆�
+ },
+ itemStyle: { // 浠〃鐩樻寚閽堟牱寮忋��
+ color: "auto", // 鎸囬拡棰滆壊锛岄粯璁�(auto)鍙栨暟鍊兼墍鍦ㄧ殑鍖洪棿鐨勯鑹�
+ opacity: 1, // 鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+ borderWidth: 0, // 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
+ borderType: "solid", // 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
+ borderColor: "#000", // 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
+ shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowColor: "#fff", // 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+ },
+ emphasis: { // 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
+ itemStyle: {
+ //楂樹寒 鍜屾甯� 涓よ�呭叿鏈夊悓鏍风殑閰嶇疆椤�,鍙槸鍦ㄤ笉鍚岀姸鎬佷笅閰嶇疆椤圭殑鍊间笉鍚屻��
+ }
+ },
+ title: { // 浠〃鐩樻爣棰樸��
+ show: true, // 鏄惁鏄剧ず鏍囬,榛樿 true銆�
+ offsetCenter: [0, "95%"],//鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+ color: "#1E1E1E", // 鏂囧瓧鐨勯鑹�,榛樿 #333銆�
+ fontSize: 20, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+ },
+ detail: { // 浠〃鐩樿鎯咃紝鐢ㄤ簬鏄剧ず鏁版嵁銆�
+ show: true, // 鏄惁鏄剧ず璇︽儏,榛樿 true銆�
+ offsetCenter: [0, "70%"],// 鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+ color: "auto", // 鏂囧瓧鐨勯鑹�,榛樿 auto銆�
+ fontSize: 30, // 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+ formatter: "{value}%", // 鏍煎紡鍖栧嚱鏁版垨鑰呭瓧绗︿覆
+ },
+ data: data2
+ }
+ ]
+ };
+ // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃
+ chart2.setOption(option2);
+
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ //棰勮
+ form.on('submit(btn_view)', function (data) {
+ get_print();
+ });
+
+ //寮�宸�
+ form.on('submit(btn_start)', function (data) {
+ get_start();
+ });
+
+ //姹囨姤
+ form.on('submit(btn_report)', function (data) {
+ get_report();
+ });
+
+ //閫�鍑�
+ form.on('submit(get_Exit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //鍒锋柊
+ form.on('submit(btn_refresh)', function (data) {
+ get_Refresh();
+ });
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MyTicket/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();
+
+ 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 鍒锋柊
+ function get_Refresh() {
+ get_FastQuery();
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index 154313c..2fd01f3 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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -585,8 +585,8 @@
if (checkStatus.data.length === 1) {
console.log(data[0]);
var HInterID = data[0].HInterID;
- var HICMOInID = data[0].HSourceInterID;
- var HICMOEnID = data[0].HSourceEntryID;
+ var HICMOInID = data[0].HICMOInterID;
+ var HICMOEnID = data[0].HICMOEntryID;
var HRelationInterID = data[0].HRelationInterID;
if (HRelationInterID == 1) {
layer.msg('鍗曟嵁宸叉姤妫�瀹℃牳鏃犳硶淇敼锛�');
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index 44c714c..250faf5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -645,15 +645,16 @@
layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
//layer.close(layer.index);
//window.parent.location.reload();
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
});
- if (data.Verify == "Y") //鑷姩瀹℃牳
- {
- layer.close(index);
- SaveVerify(); //瀹℃牳
- }
- else {
- layer.close(index);
- }
+
//layer.confirm(data.Message, {
// btn: ['纭']
//}, function (index) {
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_Add_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_Add_ICMOReportBillList.html"
index defe5bd..310f872 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_Add_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_Add_ICMOReportBillList.html"
@@ -453,7 +453,7 @@
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
- "HSourceBillType": 0
+ "HSourceBillType": 0,"HICMOTempID":0
}];
table.render(option);
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -484,7 +484,7 @@
table.cache["mainTable"].push({
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
- "HSourceBillType": 0
+ "HSourceBillType": 0, "HICMOTempID": 0
});
option.data = table.cache["mainTable"];
table.render(option);
@@ -903,6 +903,7 @@
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', width: 100, hide: true }
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text', width: 100, hide: true }
+ , { field: 'HICMOTempID', title: 'HICMOTempID', edit: 'text', width: 100, hide: true }
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
@@ -997,7 +998,7 @@
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
- "HSourceBillType": 0
+ "HSourceBillType": 0,"HICMOTempID":0
}];
table.render(option);
}
@@ -1030,7 +1031,7 @@
"HSourceName": data[i].鐢熶骇璧勬簮鍚嶇О, "HWorkerid": data[i].鎿嶄綔鍛業D, "HWorkerCode": data[i].鎿嶄綔鍛樹唬鐮�,
"HWorkerName": data[i].鎿嶄綔鍛樺悕绉�, "HQty": data[i].浜ч噺, "HBadQty": data[i].涓嶈壇鏁伴噺 == '' ? 0 : data[i].涓嶈壇鏁伴噺, "HICMOBillNo": data[i].鐢熶骇璁㈠崟鍙�,
"HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": "", "HSourceInterID": data[i].HICMOInterID, "HSourceEntryID": data[i].HICMOEntryID, "HSourceBillNo": data[i].鐢熶骇璁㈠崟鍙�,
- "HSourceBillType": 3710
+ "HSourceBillType": 3710, "HICMOTempID": data[i].HICMOTempID
});
}
@@ -1062,7 +1063,7 @@
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
- "HSourceBillType": 0
+ "HSourceBillType": 0, "HICMOTempID": 0
}];
table.render(option);
}
@@ -1078,7 +1079,7 @@
"HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
"HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
"HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
- "HSourceBillType": 0
+ "HSourceBillType": 0, "HICMOTempID": 0
}];
table.render(option);
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 9aff68b..215c28c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -749,6 +749,7 @@
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150, sort: true });
columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
+ columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150, sort: true });
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, sort: true });
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, sort: true });
@@ -916,7 +917,7 @@
columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
columns.push({ field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 150, hide: true });
columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
- columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
+
columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
@@ -1572,20 +1573,23 @@
data: { "sWhere": sWhere },
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var HInterID = data.data[0]["HInterID"];
+ if (data.data.length == 0) {
+ return layer.msg("褰撳墠鐗╂枡娌℃湁宸ヨ壓璺嚎!");
+ } else {
+ var HInterID = data.data[0]["HInterID"];
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '宸ヨ壓璺嚎-缂栬緫'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=3301'
- , end: function () {
- //鍒锋柊椤甸潰,
- //location.reload();
- }
- })
-
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=3301'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ }
+ })
+ }
}
else {
layer.msg(data.Message, { icon: 5 });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
index f98bced..23da22c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
@@ -527,7 +527,7 @@
if (data.id == "0") {
sql = " and 鏃ユ湡 like'%" + HDate + "%'";
} else {
- sql = " and HSourceID='" + data.id + "' and (鏃ユ湡 like'%" + HDate +"%' or 鏃ユ湡 is null)";
+ sql = " and HSourceID='" + data.id + "' and (鏃ユ湡 like'%" + HDate +"%' or 鏃ユ湡 is null or 鏃ユ湡 is not null)";
}
get_Display(sql);
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
index 7a5075f..0d23316 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
@@ -15,14 +15,29 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <style>
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
<div class="layui-card" style="padding: 2px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;height :700px">
<div style="padding: 2px; ">
+
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
</div>
@@ -53,7 +68,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" >
+ <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -99,7 +114,7 @@
<div class="layui-input-inline">
<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
</div>
- </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -130,19 +145,19 @@
<div class="layui-inline">
<label class="layui-form-label">涓嶅惈绋庨噾棰�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMoney" id="HMoney" value="0" autocomplete="off" >
+ <input type="text" class="layui-input" name="HMoney" id="HMoney" value="0" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">绋庣巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="0" autocomplete="off" >
+ <input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="0" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鎬婚噾棰�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" value="0" autocomplete="off">
+ <input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" value="0" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -265,10 +280,41 @@
</div>
</div>
</div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰闃舵</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--瀛愯〃-->
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
</form>
</div>
</div>
</div>
+ <!--瀛愯〃琛細鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <!--琛屼笅鎷夐�夋嫨(鍙戠エ绫诲瀷)-->
+ <script type="text/html" id="HTypeSub">
+ <select name="HTypeSub" lay-filter="HTypeSub" id="HTypeSub{{d.LAY_TABLE_INDEX+1}}">
+ <option value="鏅�氬彂绁�">鏅�氬彂绁�</option>
+ <option value="澧炲�肩◣鍙戠エ">澧炲�肩◣鍙戠エ</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </script>
<script>
@@ -307,7 +353,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
ColFilter();//鍙戠エ绫诲瀷
@@ -324,26 +370,31 @@
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
-
+ //瀛愯〃椤甸潰鍒濆鍖�
+ get_InitGrid();
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HAccDate").val(Format(new Date(), "yyyy-MM-dd"));
-
+
}
else if (OperationType == 3) { //缂栬緫
+
+ //瀛愯〃椤甸潰鍒濆鍖�
+ get_InitGrid();
+
//鍔犺浇缂栬緫椤甸潰
RoadBillMain(linterid);
}
-
+
//#endregion
//#region 缁勭粐鍒濆鍖�
Organ();
//#endregion
-
+
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -380,11 +431,214 @@
});
//#endregion
+ //#region 瀹℃牳 鍙嶅鏍�
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(0);
+ });
+ //鍙嶅鏍�
+ form.on('submit(set_AbandonCheck)', function (data) {
+ set_CheckBill(1);
+ });
//#endregion
+
+ //#region 瀛愯〃锛氬ご宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow =
+ {
+ "HProjectMoneyID": "0"
+ , "HPMoneyName": ""
+ , "HTypeSub": ""
+ , "HMoney": "0"
+ , "HTaxRate": "0"
+ , "HSumMoney": "0"
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HTypeSub' + i + '').find("option[value='" + option.data[i - 1].HTypeSub + "']").attr("selected", true);
+
+ }
+ form.render('select');
+
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HTypeSub' + i + '').find("option[value='" + option.data[i - 1].HTypeSub + "']").attr("selected", true);
+
+ }
+ form.render('select');
+ }
+ break;
+
+ }
+ });
+ //#endregion
+
+ //#region 瀛愯〃锛氳鍐呬簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ });
//#endregion
- //#region 澶嶉�夋瑙﹀彂浜嬩欢
+ //#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+
+ switch (field) {
+ case "HMoney": //涓嶅惈绋庨噾棰�
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ table.render(option);
+
+ layer.msg("涓嶅惈绋庨噾棰濊杈撳叆澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HMoney = value * 1; //涓嶅惈绋庨噾棰�
+ var HTaxRate = obj.data.HTaxRate * 1; //绋庣巼
+ var HSumMoney = HMoney * (1 + (HTaxRate * 0.01)); //鎬婚噾棰�=涓嶅惈绋庨噾棰�*(1+(绋庣巼*0.01))
+
+
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HMoney = dealDoubleToFixed(HMoney, 2);
+
+ HTaxRate = HTaxRate;
+ HSumMoney = dealDoubleToFixed(HSumMoney, 2);
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: HMoney
+ , HTaxRate: HTaxRate
+ , HSumMoney: HSumMoney
+ });
+ break;
+ case "HTaxRate": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxRate: oldText
+ });
+ table.render(option);
+
+ layer.msg("绋庣巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HTaxRate = value * 1; //绋庣巼
+ var HMoney = obj.data.HMoney * 1; //涓嶅惈绋庨噾棰�
+ var HSumMoney = HMoney * (1 + (HTaxRate * 0.01)); //鎬婚噾棰�=涓嶅惈绋庨噾棰�*(1+(绋庣巼*0.01))
+
+
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HMoney = dealDoubleToFixed(HMoney, 2);
+
+ HTaxRate = HTaxRate;
+ HSumMoney = dealDoubleToFixed(HSumMoney, 2);
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: HMoney
+ , HTaxRate: HTaxRate
+ , HSumMoney: HSumMoney
+ });
+ break;
+ case "HSumMoney": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HSumMoney: oldText
+ });
+ layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HSumMoney = value * 1; //鎬婚噾棰�
+
+ var HTaxRate = obj.data.HTaxRate * 1; //绋庣巼
+ var HMoney = HSumMoney / (1 + (HTaxRate * 0.01));
+
+
+
+
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HMoney = dealDoubleToFixed(HMoney, 2);
+
+ HTaxRate = HTaxRate;
+ HSumMoney = dealDoubleToFixed(HSumMoney, 2);
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: HMoney
+ , HTaxRate: HTaxRate
+ , HSumMoney: HSumMoney
+ });
+ default:
+ }
+ });
+ //#endregion
+
+ //#region 琛ㄦ牸琛岄�夋嫨澶勭悊锛堟槸鍚﹀彇搴撳瓨锛�
+ form.on('select(HTypeSub)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HTypeSub = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //#endregion
+
//#endregion
//#region 鏂囨湰妗嗙洃鍚�
@@ -408,10 +662,10 @@
//杈撳叆鐨勪笉鍚◣閲戦鍚堟硶锛岄噸
var HMoney = newHMoney * 1; //绠楁�婚噾棰� //涓嶅惈绋庨噾棰�
var HTaxRate = $("#HTaxRate").val() * 1; //绋庣巼
- var HRelSumMoney = HMoney * (1 + (HTaxRate * 0.01) ); //鎬婚噾棰�
+ var HRelSumMoney = HMoney * (1 + (HTaxRate * 0.01)); //鎬婚噾棰�
$("#HSumMoney").val(HRelSumMoney);
-
+
});
//#endregion
@@ -449,7 +703,7 @@
oldHSumMoney = $("#HSumMoney").val() * 1; //涓嶅惈绋庨噾棰濇枃鏈鑾峰彇鐒︾偣鏃惰幏鍙栦慨鏀瑰墠鐨勫��
}).on('blur', function (data) {
newHSumMoney = $("#HSumMoney").val(); //涓嶅惈绋庨噾棰濇枃鏈澶辩劍鏃惰幏鍙栦慨鏀瑰悗鐨勫��
- if (newHSumMoney!=0) {
+ if (newHSumMoney != 0) {
//鍒ゆ柇杈撳叆鐨勯噾棰濇槸鍚﹀悎娉�
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
if (!ref.test(newHSumMoney)) {
@@ -465,25 +719,48 @@
$("#HMoney").val(HMoney);
}
-
+
});
//#endregion
//#endregion
});
//#endregion
-
+
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
//#region 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
if (AllowLoadData(data)) {
- set_AddNew(data);
+
+ var sWhere = " and hmainid = '" + $("#HInterID").val() + "' ";
+ $.ajax({
+ url: GetWEBURL() + '/YS_ReceiveOtherBill/YS_ReceiveOtherBillMainList',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data.length<1) {
+ set_AddNew(data);
+ } else {
+ var starts = data1.data[0].鍗曟嵁鐘舵��
+ if (starts == "鍒涘缓") {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg('姝ゅ崟鎹笉鏄垱寤虹姸鎬侊紒鏃犳硶杩涜缂栬緫淇濆瓨!');
+ }
+ }
+ }
+ }
+ });
}
+
});
//#endregion
-
+
//#region 閫�鍑�
form.on('submit(btnEdit)', function (data) {
@@ -592,8 +869,102 @@
}
//#endregion
-
+ //#region 鍏朵粬搴旀敹鍗曞瓙琛ㄥ垵濮嬪寲
+ function get_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HProjectMoneyID', title: '璐圭敤椤圭洰ID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HPMoneyName', title: '璐圭敤椤圭洰鍚嶇О', edit: 'text', event: "HPMoneyName",style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HTypeSub', title: '鍙戠エ绫诲瀷', templet: '#HTypeSub' }
+ , { field: 'HMoney', title: '涓嶅惈绋庨噾棰�', edit: 'text', style: 'background-color: #f9f9f9;' }
+ , { field: 'HTaxRate', title: '绋庣巼', edit: 'text', style: 'background-color: #f9f9f9;' }
+ , { field: 'HSumMoney', title: '鎬婚噾棰�', edit: 'text', style: 'background-color: #f9f9f9;' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+
+ var rowdata = [
+ {
+ "HProjectMoneyID": "0"
+ , "HPMoneyName": ""
+ , "HTypeSub": ""
+ , "HMoney": "0"
+ , "HTaxRate": "0"
+ , "HSumMoney": "0"
+ }
+ ];
+ option.data = rowdata;
+ table.render(option);
+
+ }
+ //#endregion
+
+ //#region 琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
//#region 寮圭獥椤甸潰鏂规硶
+
+ //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鍣ㄥ叿绠＄悊
+ if (obj.event == "HPMoneyName") {
+ //鎵撳紑鍣ㄥ叿绠＄悊灏忕獥浣�
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '椤圭洰璐圭敤鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney.html?OperationType=2", "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('璇烽�夋嫨鏁版嵁');
+ }
+
+ obj.update({
+ "HProjectMoneyID": checkStatus.data[0].HItemID
+ , "HPMoneyName": checkStatus.data[0].椤圭洰璐圭敤鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+ //#endregion
+
//#region 閫夋嫨閮ㄩ棬
function get_checkDept() {
layer.open({
@@ -686,10 +1057,10 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+
$("#HCusName").val(checkStatus.data[0].HName);
$("#HCusID").val(checkStatus.data[0].HItemID);
- var HCusID=$("#HCusID").val();
+ var HCusID = $("#HCusID").val();
getHTaxRateByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
getCustomerByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜�,绋庣巼
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -715,7 +1086,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+
$("#HProjectMoneyID").val(checkStatus.data[0].HItemID);
$("#HProjectMoneyName").val(checkStatus.data[0].椤圭洰璐圭敤鍚嶇О);
@@ -788,11 +1159,20 @@
}
return true;
}
- //#endregion
//#endregion
-
+ //#endregion
+
//#region 淇濆瓨HMaker
function set_AddNew(data) {
+
+ //鑾峰彇椤圭洰璐圭敤琛ㄦ暟鎹�
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
//鑾峰彇鎿嶄綔鏂瑰紡
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
@@ -813,9 +1193,10 @@
//鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
-
+ //鍏朵粬搴旀敹鍗曞瓙琛ㄥ簭鍒楀寲
+ var sSubStr = JSON.stringify(num);
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
- var sMainSub = sMainStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr+';'+ refSav + ';' + sessionStorage["HUserName"];
$.ajax({
type: "POST",
@@ -857,52 +1238,66 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
-
+ var data1 = result.data[1];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HInterID": data.hmainid
- ,"HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HAccDate": formatDate(data.鏀舵鏃ユ湡)
- , "HCusID": data.HCusID
- , "HCusName": data.瀹㈡埛
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- , "HDeptID": data.HDeptID
- , "HDeptName": data.閮ㄩ棬
- , "HEmpID": data.HEmpID
- , "HEmpName": data.缁忔墜浜�
-
-
- , "HProjectMoneyID": data.HProjectMoneyID
- , "HProjectMoneyName": data.璐圭敤椤圭洰
- , "HType": data.鍙戠エ绫诲瀷
- , "HMoney": data.涓嶅惈绋庨噾棰�
- , "HTaxRate": data.绋庣巼
- , "HSumMoney": data.鎬婚噾棰�
- , "HExplanation": data.鎽樿
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HRemark": data.琛ㄥご澶囨敞
+ "HInterID": data[0]["hmainid"]
+ , "HBillNo": data[0]["鍗曟嵁鍙�"]
+ , "HDate": formatDate(data[0]["鏃ユ湡"])
+ , "HAccDate": formatDate(data[0]["鏀舵鏃ユ湡"])
+ , "HCusID": data[0]["HCusID"]
+ , "HCusName": data[0]["瀹㈡埛"]
+ , "HCurID": data[0]["HCurID"]
+ , "HCurName": data[0]["甯佸埆"]
+ , "HExRate": data[0]["姹囩巼"]
+ , "HDeptID": data[0]["HDeptID"]
+ , "HDeptName": data[0]["閮ㄩ棬"]
+ , "HEmpID": data[0]["HEmpID"]
+ , "HEmpName": data[0]["缁忔墜浜�"]
- , "HMainSourceInterID": data.HMainSourceInterID == null ? 0 : data.HMainSourceInterID
- , "HMainSourceEntryID": data.HMainSourceEntryID == null ? 0 : data.HMainSourceEntryID
- , "HMainSourceBillNo": data.HMainSourceBillNo
- , "HMainSourceBillType": data.HMainSourceBillType
- , "HMaker": data.鍒跺崟浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
- , "HUpDater": data.淇敼浜�
- , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd")
- , "HChecker": data.瀹℃牳浜�
- , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
- , "HCloseMan": data.鍏抽棴浜�
- , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
- , "HDeleteMan": data.浣滃簾浜�
- , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
+ , "HProjectMoneyID": data[0]["HProjectMoneyID"]
+ , "HProjectMoneyName": data[0]["璐圭敤椤圭洰"]
+ , "HType": data[0]["鍙戠エ绫诲瀷"]
+ , "HMoney": data[0]["涓嶅惈绋庨噾棰�"]
+ , "HTaxRate": data[0]["绋庣巼"]
+ , "HSumMoney": data[0]["鎬婚噾棰�"]
+ , "HExplanation": data[0]["鎽樿"]
+ , "HInnerBillNo": data[0]["鍐呴儴鍗曟嵁鍙�"]
+ , "HRemark": data[0]["琛ㄥご澶囨敞"]
+
+ , "HMainSourceInterID": data[0]["HMainSourceInterID"] == null ? 0 : data[0]["HMainSourceInterID"]
+ , "HMainSourceEntryID": data[0]["HMainSourceEntryID"] == null ? 0 : data[0]["HMainSourceEntryID"]
+ , "HMainSourceBillNo": data[0]["HMainSourceBillNo"]
+ , "HMainSourceBillType": data[0]["HMainSourceBillType"]
+
+ , "HMaker": data[0]["鍒跺崟浜�"]
+ , "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+ , "HUpDater": data[0]["淇敼浜�"]
+ , "HUpDateDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+ , "HChecker": data[0]["瀹℃牳浜�"]
+ , "HCheckDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCloseMan": data[0]["鍏抽棴浜�"]
+ , "HCloseDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+ , "HDeleteMan": data[0]["浣滃簾浜�"]
+ , "HDeleteDate": data[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
});
- HOrgIDBar = data.HOrgID == null ? 0 : data.HOrgID;
+ HOrgIDBar = data[0]["HOrgID"] == null ? 0 : data[0]["HOrgID"];
+ //瀛愯〃鏁版嵁璧嬪��
+ option.data = data1;
+ table.render(option);
+ for (var i = 0; i <data1.length; i++) {
+
+
+ //寤惰繜鍘熷洜
+ $('#HTypeSub' + (i + 1)).find("option[value='" + data1[i].HTypeSub + "']").attr("selected", true);
+ }
+ form.render('select');
+ form.render('checkbox');
+
+
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -916,7 +1311,36 @@
}
//#endregion
-
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var InterID = $("#HInterID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/YS_ReceiveOtherBill/AuditYS_ReceiveOtherBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "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 });
+ }
+ });
+ }
+ //#endregion
+
+
//#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
function getHTaxRateByCusID(HCusID) {
$.ajax({
@@ -939,7 +1363,7 @@
}
});
}
- //#endregion
+ //#endregion
//#region 鏍规嵁鐧诲綍鐢ㄦ埛 鑾峰彇閮ㄩ棬 缁忔墜浜�
function getCzyglByUser() {
@@ -997,7 +1421,7 @@
}
});
}
- //#endregion
+ //#endregion
//#endregion
@@ -1015,12 +1439,46 @@
$("#HEmpID").val(obj[0].HItemID);
}
- //function GetHSupValue(obj) //杩斿洖瀹㈡埛
- //{
- // $("#HCusName").val(obj[0].HName);
- // $("#HCusID").val(obj[0].HItemID);
- //}
+ //function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ //{
+ // $("#HCusName").val(obj[0].HName);
+ // $("#HCusID").val(obj[0].HItemID);
+ //}
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+ function dealDoubleToFixed(data, num) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 0;
+ if (num == 1) { //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+ dotLength = 6;
+ } else if (num == 2) { //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+ dotLength = 2;
+ } else if (num == 3) { //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+ dotLength = 4;
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength);
+ }
+ }
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
index 6a1fc52..01d3c2e 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
@@ -131,7 +131,7 @@
var HModName = "YS_ReceiveBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid", "HDeptID", "HEmpID", "HCurID", "HCusID", "HProjectMoneyID",];
+ var titleData = ["hmainid", "HDeptID", "HEmpID", "HCurID", "HCusID", "HProjectMoneyID","瀛愯垂鐢ㄩ」鐩甀d"];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2002";
@@ -482,23 +482,18 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- if (data[0].鍗曟嵁鐘舵�� =="鍒涘缓") {
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , btn: [],
- end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
- }
- })
- }
- else {
- layer.msg('鍗曟嵁涓嶆槸鍒涘缓鐘舵�侊紒鏃犳硶缂栬緫锛�');
- }
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
--
Gitblit v1.9.1