From a30bcc5d636f04898c6c1fcd40305b5e9a1fc2bb Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 七月 2023 17:24:00 +0800
Subject: [PATCH] 工厂日历 功能优化
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html | 1
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html | 1
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillQuery_Mobile.html | 297 +++++++++++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillList.html | 1
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html | 2
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 6
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 1
WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html | 548 ++++++++++++++++++++++++++++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcExchRecordBackBillList.html | 1
WebTM/WebTM.csproj | 1
11 files changed, 856 insertions(+), 5 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e3f1bd3..148f47e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -209,6 +209,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Excel.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 9f0f239..51cab6d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -254,6 +254,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
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"
new file mode 100644
index 0000000..a7b69b3
--- /dev/null
+++ "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"
@@ -0,0 +1,548 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸ュ巶鏃ュ巻</title>
+ <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/layui/layui1.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 class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-block" style="width:100px">
+ <select name="HDate" lay-verify="required" id="HDate">
+ <!--鍔ㄦ�佽幏鍙栨棩鏈�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
+ </div>
+ </div>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 83%">
+ <div>
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+ <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
+ <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
+ <table class="layui-hide" id="mainTable5" lay-filter="mainTable5"></table>
+ <table class="layui-hide" id="mainTable6" lay-filter="mainTable6"></table>
+ <table class="layui-hide" id="mainTable7" lay-filter="mainTable7"></table>
+ <table class="layui-hide" id="mainTable8" lay-filter="mainTable8"></table>
+ <table class="layui-hide" id="mainTable9" lay-filter="mainTable9"></table>
+ <table class="layui-hide" id="mainTable10" lay-filter="mainTable10"></table>
+ <table class="layui-hide" id="mainTable11" lay-filter="mainTable11"></table>
+ <table class="layui-hide" id="mainTable12" lay-filter="mainTable12"></table>
+ </div>
+ </div>
+ </div>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','tree'], 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
+ , tree = layui.tree
+ var TagId = "";
+ var option1 = [];
+ var option2 = [];
+ var option3 = [];
+ var option4 = [];
+ var option5 = [];
+ var option6 = [];
+ var option7 = [];
+ var option8 = [];
+ var option9 = [];
+ var option10 = [];
+ var option11 = [];
+ var option12 = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ set_ClearBill();
+
+ //#endregion
+
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+
+ //琛屽唴榧犳爣绂诲紑浜嬩欢
+ table.on('edit(mainTable1)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable2)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable3)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable4)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable5)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable6)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable7)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable8)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable9)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable10)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable11)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+ table.on('edit(mainTable12)', function (obj) {
+ var hdate = obj.field;
+ var hvalue = obj.value;
+
+ Save(hdate, hvalue, TagId)
+ })
+
+
+ //蹇�熻繃婊�
+ form.on('submit(btnSearch)', function (data) {
+ var Year = new Date($("#HDate").val()).getFullYear();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid(Year, 1, "");
+ set_InitGrid(Year, 2, "");
+ set_InitGrid(Year, 3, "");
+ set_InitGrid(Year, 4, "");
+ set_InitGrid(Year, 5, "");
+ set_InitGrid(Year, 6, "");
+ set_InitGrid(Year, 7, "");
+ set_InitGrid(Year, 8, "");
+ set_InitGrid(Year, 9, "");
+ set_InitGrid(Year, 10, "");
+ set_InitGrid(Year, 11, "");
+ set_InitGrid(Year, 12, "");
+ get_Display_Tree();
+ get_Display("");
+ });
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ getDate();
+ //鑾峰彇骞�
+ var Year = new Date($("#HDate").val()).getFullYear();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid(Year, 1,"");
+ set_InitGrid(Year, 2, "");
+ set_InitGrid(Year, 3, "");
+ set_InitGrid(Year, 4, "");
+ set_InitGrid(Year, 5, "");
+ set_InitGrid(Year, 6, "");
+ set_InitGrid(Year, 7, "");
+ set_InitGrid(Year, 8, "");
+ set_InitGrid(Year, 9, "");
+ set_InitGrid(Year, 10, "");
+ set_InitGrid(Year, 11, "");
+ set_InitGrid(Year, 12, "");
+ get_Display_Tree();
+ get_Display("");
+ }
+
+ function getDate() {
+ var NowDate = new Date().getFullYear();
+ var sqlDate = '<option style="color:blue;" value="' + NowDate + '">' + NowDate +'</option>';
+ for (var i = 1; i <= 10; i++) {
+ sqlDate += '<option style="color:blue;" value="' + (NowDate - i) + '">' + (NowDate - i) + '</option>';
+ }
+ $("#HDate").empty();
+ $("#HDate").append(sqlDate);
+ form.render('select');
+ }
+
+ //鏈堜唤
+ function set_InitGrid(Year,Month,num) {
+ var SumMonth = new Date(Year, Month, 0).getDate(); //鍔ㄦ�佽幏鍙栨湀澶╂暟
+ var col = [];
+ var colData = "{";
+ col.push({ field: "鏈堜唤", title: "鏈堜唤", width: 60 })
+ colData += "\"鏈堜唤\":\"" + Month+"鏈圽",";
+ for (var j = 1; j <= SumMonth; j++) {
+ col.push({ field: Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd'), title: Format(Year + '/' + Month + '/' + j, 'dd'), width: 50, edit: 'text' })
+ colData += "\"" + Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd') + "\":\"" + num + "\",";
+ }
+ colData = colData.substr(0, colData.length - 1);
+ colData += "}";
+ var option = {
+ elem: '#mainTable' + Month
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , height: 100
+ , cols: [col]
+ , data: [JSON.parse(colData)]
+ , done: function (res, curr, count) {
+ var NowDate = Format(new Date(), "yyyy-MM-dd");
+ var Month = new Date().getMonth() + 1 + "鏈�";
+
+ for (var i in res.data) {
+ var item = res.data[i];
+ if (item["鏈堜唤"] == Month) {
+ for (var j = 0; j < option.cols[0].length; j++) {
+ if (option.cols[0][j].field == NowDate) {
+ option.cols[0][j]["style"] = " background-color: #59c5ea";
+ }
+ }
+ }
+ }
+ }
+ };
+ table.render(option);
+
+ switch (Month) {
+ case 1 :
+ option1 = option;
+ break;
+ case 2:
+ option2 = option;
+ break;
+ case 3:
+ option3 = option;
+ break;
+ case 4:
+ option4= option;
+ break;
+ case 5:
+ option5= option;
+ break;
+ case 6:
+ option6= option;
+ break;
+ case 7:
+ option7= option;
+ break;
+ case 8:
+ option8= option;
+ break;
+ case 9:
+ option9= option;
+ break;
+ case 10:
+ option10= option;
+ break;
+ case 11:
+ option11= option;
+ break;
+ case 12:
+ option12= option;
+ break;
+ }
+ }
+
+ //鏌ヨ鏁版嵁
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/MaterOutEntryReport/Sc_ShopCalendar',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var Year = new Date($("#HDate").val()).getFullYear();
+ var num = "";
+ if (data1.data.length != 0) {
+ set_InitGrid(Year, 1, num);
+ set_InitGrid(Year, 2, num);
+ set_InitGrid(Year, 3, num);
+ set_InitGrid(Year, 4, num);
+ set_InitGrid(Year, 5, num);
+ set_InitGrid(Year, 6, num);
+ set_InitGrid(Year, 7, num);
+ set_InitGrid(Year, 8, num);
+ set_InitGrid(Year, 9, num);
+ set_InitGrid(Year, 10, num);
+ set_InitGrid(Year, 11, num);
+ set_InitGrid(Year, 12, num);
+ for (var i = 0; i < data1.data.length; i++) {
+ var Month = new Date(data1.data[i]["鏃ユ湡"]).getMonth() + 1;
+ switch (Month) {
+ case 1:
+ option1.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 2:
+ option2.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 3:
+ option3.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 4:
+ option4.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 5:
+ option5.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 6:
+ option6.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 7:
+ option7.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 8:
+ option8.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 9:
+ option9.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 10:
+ option10.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 11:
+ option11.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ case 12:
+ option12.data[0][data1.data[i]["鏃ユ湡"]] = data1.data[i]["鍔犵彮宸ユ椂"];
+ break;
+ }
+ }
+ } else {
+ num = 8;
+ set_InitGrid(Year, 1, num);
+ set_InitGrid(Year, 2, num);
+ set_InitGrid(Year, 3, num);
+ set_InitGrid(Year, 4, num);
+ set_InitGrid(Year, 5, num);
+ set_InitGrid(Year, 6, num);
+ set_InitGrid(Year, 7, num);
+ set_InitGrid(Year, 8, num);
+ set_InitGrid(Year, 9, num);
+ set_InitGrid(Year, 10, num);
+ set_InitGrid(Year, 11, num);
+ set_InitGrid(Year, 12, num);
+ }
+ table.render(option1);
+ table.render(option2);
+ table.render(option3);
+ table.render(option4);
+ table.render(option5);
+ table.render(option6);
+ table.render(option7);
+ table.render(option8);
+ table.render(option9);
+ table.render(option10);
+ table.render(option11);
+ table.render(option12);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/MaterOutEntryReport/Gy_SourceList',
+ type: "GET",
+ async: false,
+ data: { "HOrgid": sessionStorage["OrganizationID"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , click: function (obj) {
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ TagId = data.id;
+ var sql = "";
+ var HDate = $("#HDate").val();
+ if (data.id == "0") {
+ sql = " and 鏃ユ湡 like'%" + HDate + "%'";
+ } else {
+ sql = " and HSourceID='" + data.id + "' and 鏃ユ湡 like'%" + HDate+"%'";
+ }
+ get_Display(sql);
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
+ //淇濆瓨
+ function Save(hdate, hvalue, TagId) {
+ if (TagId == "") {
+ return layer.msg("璇峰厛閫夋嫨鐢熶骇璧勬簮!");
+ }
+ var reg = /^\d+(\.\d+)?$/;
+ if (reg.test(hvalue) == false || hvalue == "" || hvalue == "0") {
+ layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟");
+ return false;
+ }
+
+ var sMainSub = hdate + ";" + hvalue + ";" + TagId + ";" + sessionStorage["HUserName"];
+
+ $.ajax({
+ url: GetWEBURL() + '/MaterOutEntryReport/Sc_ShopCalendarSave',
+ type: "POST",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
index d56c92c..643b471 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
@@ -395,7 +395,7 @@
<!--闅愯棌瀛楁-->
<input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
- <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
+ <!--<input type="hidden" name="HMaker" id="HMaker">--><!--鍒跺崟浜�-->
<input type="hidden" name="eventType" id="eventType" value="Add">
</form>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index 5b36bee..c50967b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -1015,7 +1015,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../../views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
+ content: ['../../views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
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_ProcExchRecordBackBillList.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_ProcExchRecordBackBillList.html"
index e0314c1..fc2e3c1 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_ProcExchRecordBackBillList.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_ProcExchRecordBackBillList.html"
@@ -227,6 +227,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
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_ProcExchWorkBackBillList.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_ProcExchWorkBackBillList.html"
index c331069..3ae0f64 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_ProcExchWorkBackBillList.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_ProcExchWorkBackBillList.html"
@@ -226,6 +226,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
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_ProcessExchangeBillQuery_Mobile.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_ProcessExchangeBillQuery_Mobile.html"
new file mode 100644
index 0000000..4324757
--- /dev/null
+++ "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_ProcessExchangeBillQuery_Mobile.html"
@@ -0,0 +1,297 @@
+锘�<!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>
+
+</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 class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹㈡埛</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HCurName" id="HCurName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px;">
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+ var sWhere = "";
+ var option = [];
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ get_FastQuery();
+ });
+ //#endregion
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鑾峰彇缁勭粐
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
+ }
+ //#endregion
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , loading: false
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', sort: true, width: 120 }
+ , { field: '浜у搧瑙勬牸', title: '浜у搧瑙勬牸', width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 120 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 120 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
+ ]]
+ };
+ }
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HCurName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+ $("#btnSearch").click();
+ sWhere = "";
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ //sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ } 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_FastQuery() {
+
+ var HCurName = $("#HCurName").val();
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+
+
+ var HOrgID= sessionStorage["OrganizationID"];
+
+ if (HCurName) {
+ sWhere += " and 瀹㈡埛 like '%" + HCurName + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HOrgID) {
+ sWhere += " and HPRDORGID = '" + HOrgID + "'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#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
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+</script>
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_ProcessExchangeIssueBillList.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"
index bb9425f..8f3e8e2 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_ProcessExchangeIssueBillList.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"
@@ -248,6 +248,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
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_ProcessSendWorkList.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_ProcessSendWorkList.html"
index 7ce45e4..bb6efb2 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_ProcessSendWorkList.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_ProcessSendWorkList.html"
@@ -231,6 +231,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index dbb442f..84b1c3a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -1409,8 +1409,8 @@
}
layer.load(3);
element.tabChange('tab-MateOutBill', '2');
- //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌浠撳簱涓�
- $("#HBarCode").focus();
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌浠撲綅涓�
+ $("#HStockPlaceName").focus();
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
}
@@ -1873,7 +1873,7 @@
table.render(listOption);
FIFOlistOption.data = result.data.FIFOlist;
table.render(FIFOlistOption);
-
+ if (result.data.BarCodeDetailslist[0])
$("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
$("#HMaterName_B").val(result.data.BarCodeDetailslist[0].HMaterName);
$("#HMaterModel_B").val(result.data.BarCodeDetailslist[0].HMaterModel);
--
Gitblit v1.9.1