From d036bd6901fd5af43069e0f8c8eb0a2beedf57c8 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 21 十二月 2021 13:43:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 48 ++
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 55 +++
WebTM/WebTM.csproj | 1
WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 716 +++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 801 insertions(+), 19 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7add5ae..b106070 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -608,6 +608,7 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\InventoryAnalysis.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
new file mode 100644
index 0000000..d38d0b3
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
@@ -0,0 +1,716 @@
+锘�<!DOCTYPE html>
+<html>
+<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>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</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 style="padding:20px;margin:0px 700px">
+ <h1>鐩樼偣鍒嗘瀽琛�</h1>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐩樼偣鏂规</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSourceInterID" id="HSourceInterID">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">
+ 鏌ヨ
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">
+ 閲嶇疆
+ </button>
+
+ </div>
+ </div>
+
+ <div class="layui-tab layui-tab-card" style="margin-top:10px">
+ <ul class="layui-tab-title">
+ <li class="layui-this">姝ｅ父</li>
+ <li>璋冩嫧</li>
+ <li>鍑哄簱</li>
+ <li>鍏ュ簱</li>
+ <li>鐩樼泩</li>
+ <li>鐩樹簭</li>
+ <li>閫�搴�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable5" lay-filter="mainTable5"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable6" lay-filter="mainTable6"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable7" lay-filter="mainTable7"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo1">
+ <div class="layui-btn-container">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check1"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh1"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit1"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check2"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh2"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit2"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo3">
+ <div class="layui-btn-container">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check3"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh3"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit3"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo4">
+ <div class="layui-btn-container">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check4"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh4"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit4"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo5">
+ <div class="layui-btn-container">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check5"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh5"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit5"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo6">
+ <div class="layui-btn-container">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check6"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh6"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit6"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo7">
+ <div class="layui-btn-container">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check7"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh7"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit7"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <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/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+ <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
+ , table1 = layui.table
+ , table2 = layui.table
+ , table3 = layui.table
+ , table4 = layui.table
+ , table5 = layui.table
+ , table6 = layui.table
+ , table7 = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option1 = [];
+ var option2 = [];
+ var option3 = [];
+ var option4 = [];
+ var option5 = [];
+ var option6 = [];
+ var option7 = [];
+ var col = [
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: '鏉＄爜', title: '鍣ㄥ叿鏉＄爜', width: 200 }
+ , { field: '鍣ㄥ叿缂栧彿', title: '鍣ㄥ叿缂栧彿', width: 200 }
+ , { field: '鐩樼偣鏂规', title: '鐩樼偣鏂规', width: 200 }
+ , { field: '瀹為檯浣嶇疆绫诲瀷', title: '瀹為檯浣嶇疆绫诲瀷', width: 200 }
+ , { field: '瀹為檯浣嶇疆', title: '瀹為檯浣嶇疆', width: 200 }
+ , { field: '璐﹂潰浣嶇疆绫诲瀷', title: '璐﹂潰浣嶇疆绫诲瀷', width: 200 }
+ , { field: '璐﹂潰浣嶇疆', title: '璐﹂潰浣嶇疆', width: 200 }
+ ];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 澶村伐鍏锋爮浜嬩欢 姝ｅ父
+ table.on('toolbar(mainTable1)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btn-Check1': set_CheckBill1();
+ break;
+ //鍒锋柊
+ case 'btn-Refresh1': set_ClearQuery();;
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Exit1': Pub_Close1(2);
+ break;
+ };
+ });
+ //#endregion
+ //#region 澶村伐鍏锋爮浜嬩欢 璋冩嫧
+ table.on('toolbar(mainTable2)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btn-Check2': set_CheckBill2();
+ break;
+ //鍒锋柊
+ case 'btn-Refresh2': set_ClearQuery();;
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Exit2': Pub_Close2(2);
+ break;
+ };
+ });
+ //#endregion
+ //#region 澶村伐鍏锋爮浜嬩欢 鍑哄簱
+ table.on('toolbar(mainTable3)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btn-Check3': set_CheckBill3();
+ break;
+ //鍒锋柊
+ case 'btn-Refresh3': set_ClearQuery();;
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Exit3': Pub_Close3(2);
+ break;
+ };
+ });
+ //#endregion
+ //#region 澶村伐鍏锋爮浜嬩欢 鍏ュ簱
+ table.on('toolbar(mainTable4)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btn-Check4': set_CheckBill4();
+ break;
+ //鍒锋柊
+ case 'btn-Refresh4': set_ClearQuery();;
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Exit4': Pub_Close4(2);
+ break;
+ };
+ });
+ //#endregion
+ //#region 澶村伐鍏锋爮浜嬩欢 鐩樼泩
+ table.on('toolbar(mainTable5)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btn-Check5': set_CheckBill5();
+ break;
+ //鍒锋柊
+ case 'btn-Refresh5': set_ClearQuery();;
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Exit5': Pub_Close5(2);
+ break;
+ };
+ });
+ //#endregion
+ //#region 澶村伐鍏锋爮浜嬩欢 鐩樹簭
+ table.on('toolbar(mainTable6)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btn-Check6': set_CheckBill6();
+ break;
+ //鍒锋柊
+ case 'btn-Refresh6': set_ClearQuery();;
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Exit6': Pub_Close6(2);
+ break;
+ };
+ });
+ //#endregion
+ //#region 澶村伐鍏锋爮浜嬩欢 閫�搴�
+ table.on('toolbar(mainTable7)', function (obj) {
+ switch (obj.event) {
+ //瀹℃牳
+ case 'btn-Check7': set_CheckBill7();
+ break;
+ //鍒锋柊
+ case 'btn-Refresh7': set_ClearQuery();;
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Exit7': Pub_Close7(2);
+ break;
+ };
+ });
+ //#endregion
+
+ // 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //#endregion
+
+ //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�(姝ｅ父)
+ set_InitGrid1();
+ //鍒濆鍖栬〃鏍�(璋冩嫧)
+ set_InitGrid2();
+ //鍒濆鍖栬〃鏍�(鍑哄簱)
+ set_InitGrid3();
+ //鍒濆鍖栬〃鏍�(鍏ュ簱)
+ set_InitGrid4();
+ //鍒濆鍖栬〃鏍�(鐩樼泩)
+ set_InitGrid5();
+ //鍒濆鍖栬〃鏍�(鐩樹簭)
+ set_InitGrid6();
+ //鍒濆鍖栬〃鏍�(閫�搴�)
+ set_InitGrid7();
+ //鏌ヨ
+ //get_Display(sWhere);
+
+ }
+
+ //鍒濆鍖栬〃鏍�(姝ｅ父)
+ function set_InitGrid1()
+ {
+ var ajaxLoad = layer.load();
+ option1 = {
+ elem: '#mainTable1'
+ , toolbar: '#toolbarDemo1'
+ , height: '550'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [col]
+ };
+ option1.data = [];
+ table1.render(option1);
+ layer.close(ajaxLoad);
+ }
+
+ //鍒濆鍖栬〃鏍�(璋冩嫧)
+ function set_InitGrid2() {
+ var ajaxLoad = layer.load();
+ option2 = {
+ elem: '#mainTable2'
+ , toolbar: '#toolbarDemo2'
+ , height: '550'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [col]
+ };
+ option2.data = [];
+ table2.render(option2);
+ layer.close(ajaxLoad);
+ }
+
+ //鍒濆鍖栬〃鏍�(鍑哄簱)
+ function set_InitGrid3() {
+ var ajaxLoad = layer.load();
+ option3 = {
+ elem: '#mainTable3'
+ , toolbar: '#toolbarDemo3'
+ , height: '550'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [col]
+ };
+ option3.data = [];
+ table3.render(option3);
+ layer.close(ajaxLoad);
+ }
+
+ //鍒濆鍖栬〃鏍�(鍏ュ簱)
+ function set_InitGrid4() {
+ var ajaxLoad = layer.load();
+ option4 = {
+ elem: '#mainTable4'
+ , toolbar: '#toolbarDemo4'
+ , height: '550'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [col]
+ };
+ option4.data = [];
+ table4.render(option4);
+ layer.close(ajaxLoad);
+ }
+
+ //鍒濆鍖栬〃鏍�(鐩樼泩)
+ function set_InitGrid5() {
+ var ajaxLoad = layer.load();
+ option5 = {
+ elem: '#mainTable5'
+ , toolbar: '#toolbarDemo5'
+ , height: '550'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [col]
+ };
+ option5.data = [];
+ table5.render(option5);
+ layer.close(ajaxLoad);
+ }
+
+ //鍒濆鍖栬〃鏍�(鐩樹簭)
+ function set_InitGrid6() {
+ var ajaxLoad = layer.load();
+ option6 = {
+ elem: '#mainTable6'
+ , toolbar: '#toolbarDemo6'
+ , height: '550'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [col]
+ };
+ option6.data = [];
+ table6.render(option6);
+ layer.close(ajaxLoad);
+ }
+
+ //鍒濆鍖栬〃鏍�(閫�搴�)
+ function set_InitGrid7() {
+ var ajaxLoad = layer.load();
+ option7 = {
+ elem: '#mainTable7'
+ , toolbar: '#toolbarDemo7'
+ , height: '550'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [col]
+ };
+ option7.data = [];
+ table7.render(option7);
+ layer.close(ajaxLoad);
+ }
+
+ //鏌ヨ
+ function get_Display(sWhere) {
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option1.data = data1.list[0];
+ table1.render(option1);
+ option2.data = data1.list[1];
+ table2.render(option2);
+ option3.data = data1.list[2];
+ table3.render(option3);
+ option4.data = data1.list[3];
+ table4.render(option4);
+ option5.data = data1.list[4];
+ table5.render(option5);
+ option6.data = data1.list[5];
+ table6.render(option6);
+ option7.data = data1.list[6];
+ table7.render(option7);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HSourceInterID = $("#HSourceInterID").val();//鍗曟嵁绫诲瀷
+ if (HSourceInterID) {
+ sWhere += " and HSourceInterID like '%" + HSourceInterID + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HSourceInterID").val("");//鍗曟嵁绫诲瀷
+ $("#btnSearch").click();
+ sWhere = "";
+ }
+
+ //#region 瀹℃牳
+ //瀹℃牳 璋冩嫧
+ function set_CheckBill2() {
+ var checkStatus = table.checkStatus('mainTable2')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鏉＄爜.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdMove", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //瀹℃牳 鍑哄簱
+ function set_CheckBill3() {
+ var checkStatus = table.checkStatus('mainTable3')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鏉＄爜.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOut", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //瀹℃牳 鍏堥��搴撳啀鍑哄簱
+ function set_CheckBill4() {
+ var checkStatus = table.checkStatus('mainTable4')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鏉＄爜.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOutBack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //瀹℃牳 鐩樼泩
+ function set_CheckBill5() {
+ var checkStatus = table.checkStatus('mainTable5')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鏉＄爜.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeOtherIn", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //瀹℃牳 鐩樹簭
+ function set_CheckBill6() {
+ var checkStatus = table.checkStatus('mainTable6')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鏉＄爜.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeScrapOut", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //瀹℃牳 閫�搴�
+ function set_CheckBill7() {
+ var checkStatus = table.checkStatus('mainTable7')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].鏉＄爜.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdBack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+
+ //#endregion
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 8c3f093..f7f4f8e 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -76,7 +76,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName"" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -106,7 +106,7 @@
</button>
</div>
</div>
-
+
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -160,7 +160,7 @@
<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
</div>
</div>
-
+
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -377,7 +377,7 @@
get_checkManager();
});
-
+
//淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
@@ -432,8 +432,8 @@
, "HAddress": data.浜よ揣鍦扮偣
, "HInnerBillNo": data.杈呭姪瀛楁
, "HExRate": data.姹囩巼
- , "Box2": ""
- , "HRemark": data.琛ㄥご澶囨敞
+ , "Box2": ""
+ , "HRemark": data.琛ㄥご澶囨敞
, "HMaker": data.鍒跺崟浜�
, "HChecker": data.瀹℃牳浜�
, "HCloseMan": data.鍏抽棴浜�
@@ -474,19 +474,42 @@
//console.log(d.data);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(shijian);
- $("#HInterID").val(d.data[0].HInterID);
+ $("#HInterID").val();
}
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(hID);
- /* RoadBillSub(linterid);*/
+ RoadBillMain(linterid);
+ //RoadBillSub(linterid);
}
+ //鏃ユ湡鏍煎紡鍖�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
var sMainStr = JSON.stringify(data.field);
-
+
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -512,6 +535,7 @@
});
}
//#endregion
+
function get_checkEmp() {
layer.open({
@@ -601,7 +625,7 @@
, btn2: function (index, layero) { }
})
}
-
+
function get_checkDept() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -624,7 +648,7 @@
, btn2: function (index, layero) { }
})
}
-
+
function get_checkManager() {
layer.open({
type: 2//寮圭獥绫诲瀷
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index 651f1ef..f37f830 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -75,7 +75,7 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">涓荤</label>
<div class="layui-input-block">
@@ -91,6 +91,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="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>
</div>
@@ -162,12 +164,13 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 150 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��' ,width: 100}
, { field: 'HBillType', title: 'HBillType', hide: true }
, { field: 'HSupID', title: 'HSupID', width: 120, hide: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 150 }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 250 }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 }
, { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣' }
, { field: 'HCurID', title: 'HCurID', width: 120, hide: true }
, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜' }
@@ -217,7 +220,7 @@
, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-
+
]]
};
}
@@ -338,10 +341,48 @@
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
+ case 'btn-DeAudit':
+ DeAudit();
+ break;
};
});
-
+ function DeAudit(){
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1)
+ {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Cg_POInStockBill/DeAuditPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else
+ {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
--
Gitblit v1.9.1