From cebd21645abb2337ea1ef7a17aa0823a3f8627b7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 05 九月 2022 10:42:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html | 154 ++++-----------------------------------------------
WebTM/views/index.html | 1
WebTM/WebTM.csproj | 2
3 files changed, 14 insertions(+), 143 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 55bd682..b1feabd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -990,7 +990,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
- <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangexdBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssueBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationQty.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index b9fedef..574f886 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -438,6 +438,7 @@
<dl class="layui-nav-child">
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">宸ュ簭娴佽浆鍗�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娴佽浆鍗＄淮鎶�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</a></dd>
<dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>
<dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangexdBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
similarity index 81%
rename from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangexdBillList.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
index de8d10f..424bc1e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangexdBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>宸ュ簭娴佽浆鍗″垪琛�</title>
+ <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">
@@ -89,18 +89,13 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
- <table class="" id="mainTable2" lay-filter="mainTable2"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <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="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Issue"><i class="layui-icon layui-icon-file-b"></i>涓嬭揪</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn1"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>
</div>
@@ -143,7 +138,7 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
//
- var HModName = "Sc_ProcessExchangeBillList";
+ var HModName = "Sc_ProcessExchangeIssueBillList";
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -210,8 +205,6 @@
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栦富琛ㄥ垪琛�
set_InitGrid();
- //鍒濆鍖栦粠琛ㄥ垪琛�
- set_InitGrid2();
//鏌ヨ
get_Display(sWhere);
}
@@ -285,36 +278,7 @@
form.on('checkbox(wybj)', function (data) {
wybj = data.elem.checked; //鏄惁琚�変腑锛宼rue鎴栬�協alse
});
-
- //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
- table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
- var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
- HBillNo = datas["鍗曟嵁鍙�"].toString();
- var HMainID = datas.hmainid;
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
- type: "GET",
- data: { "sWhere": HMainID },
- success: function (data1) {
- if (data1.count == 1) {
- option2.data = data1.data;
- table.render(option2);
- layer.close(wait);
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
- DisPlay_HideColumn_Sec();
- });
-
//#endregion
-
//鍒濆鍖栦富琛ㄥ垪琛�
function set_InitGrid() {
@@ -322,7 +286,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: true
- , height: 300
+ , height: 'full-50'
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -347,6 +311,11 @@
, { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true}
, { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
, { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+ , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+ , { field: 'HProcID', title: 'HProcID', hide: true }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
, { field: '濮斿鏍囪', title: '濮斿鏍囪' }
, { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true}
, { field: '瀛愪欢浠ｇ爜', title: '瀛愪欢浠ｇ爜' }
@@ -390,82 +359,12 @@
};
table.render(option);
}
-
- //鍒濆鍖栦粠琛ㄥ垪琛�
- function set_InitGrid2() {
- option2 = {
- elem: '#mainTable2'
- //, toolbar: '#toolbarDemo'
- , page: false
- , height: 500
- , cellMinWidth: 90
- , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: 'hsubid', title: 'hsubid', hide: true }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
- , { field: 'HProcID', title: 'HProcID', hide: true }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
- , { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺', width: 120 }
- , { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺', width: 120 }
- , { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', width: 150 }
- , { field: '杩斿伐鏍囪', title: '杩斿伐鏍囪' }
- , { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
- , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
- , { field: 'hmainid', title: 'hmainid', hide: true}
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'hicmointerid', title: 'hicmointerid', hide: true}
- , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 100}
- , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true}
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
- , { field: 'HMaterID', title: 'HMaterID', hide: true}
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: '鎵瑰彿', title: '鎵瑰彿' }
- , { field: 'HUnitID', title: 'HUnitID', hide: true}
- , { field: '鍗曚綅浠ｇ爜', title: '鍗曚綅浠ｇ爜' }
- , { field: '鍗曚綅', title: '鍗曚綅' }
- , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
- , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
- , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
- , { field: '鎽樿', title: '鎽樿' }
- , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
- , { field: 'HSupID', title: 'HSupID', hide: true}
- , { field: '濮斿鍔犲伐鍗曚綅浠ｇ爜', title: '濮斿鍔犲伐鍗曚綅浠ｇ爜' }
- , { field: '濮斿鍔犲伐鍗曚綅', title: '濮斿鍔犲伐鍗曚綅' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- , { field: 'HBillType', title: 'HBillType', hide: true}
- , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
- , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
- , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
- , { field: '姹囨姤鏁伴噺', title: '姹囨姤鏁伴噺' }
- , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
- , { field: '鍑虹珯娴佽浆宸ュ簭', title: '鍑虹珯娴佽浆宸ュ簭' }
- , { field: '棣栭亾宸ュ簭', title: '棣栭亾宸ュ簭' }
- , { field: '鏈亾宸ュ簭', title: '鏈亾宸ュ簭' }
- , { field: '涓嬮亾宸ュ簭鍙�', title: '涓嬮亾宸ュ簭鍙�' }
- , { field: '涓嶈壇鍝佸叧鑱旀暟閲�', title: '涓嶈壇鍝佸叧鑱旀暟閲�' }
- ]]
- };
- table.render(option2);
- }
//#region 鏌ヨ
function get_Display(sWhere) {
sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
+ url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeIssueBillList_Json',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
@@ -513,34 +412,6 @@
}
})
}
-
- //闅愯棌鍒楄缃�
- function get_HideColumn2() {
- var colName = "";
- for (var i = 1; i < option2.cols[0].length - 1; i++) {
- colName += option2.cols[0][i]["title"] + ",";
- }
-
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + "_Sec" + '&colName=' + colName, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn_Sec();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
-
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
@@ -624,7 +495,6 @@
}
})
}
-
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn_Sec() {
--
Gitblit v1.9.1