From db34c41cbb3df2c21b57d10bbe83ea206d9428d6 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 29 十二月 2021 09:20:57 +0800
Subject: [PATCH] 安瑞 增加 物料编码显示
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html | 11
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html | 10
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 28 +
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 15
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 10
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html | 10
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBill.html | 336 ++++++++++++------------
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBill.html | 310 +++++++++++-----------
8 files changed, 382 insertions(+), 348 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index bce31dd..9b56bce 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -206,13 +206,13 @@
var type = params[params[2]];
//鍘熺敓鎴愭潯鐮佹柟娉�(閫佽揣鍗曢粯璁�)
var mainUrl = "GetHBarCodeShowBillMain"; //琛ㄥご鏁版嵁鍔犺浇ajax
- var subUrl = "GetHBarCodeShowBillSub";//琛ㄤ綋鏁版嵁鍔犺浇ajax
+ var subUrl = "GetHBarCodeShowBillSub";//琛ㄤ綋鏁版嵁鍔犺浇ajax h_v_SRM_POInStockBillSub_ForWeb2
var saveBarCode = "GetBarcodeSaveBillBox";//鏉＄爜鐢熸垚淇濆瓨鏂规硶ajax
var openTmpListType = "SRM_POInStockBillList"; //鏉＄爜鎵撳嵃鎸夐挳 寮瑰嚭鐣岄潰
//閲囪喘璁㈠崟鏉＄爜鐢熸垚瑙勫垯
if (type == 'SRM_POOrderBillList') {
mainUrl = 'GetHBarCodeShowBillMainBycg';
- subUrl = "GetHBarCodeShowBillSubBycg";
+ subUrl = "GetHBarCodeShowBillSubBycg"; //h_v_Cg_POOrderBillSub_ForWeb2
saveBarCode = "GetBarcodeSaveBillBoxBycg";
openTmpListType = 'SRM_POOrderBillList';
@@ -220,7 +220,7 @@
//濮斿璁㈠崟
else if (type == 'SRM_EntrustOrderBill') {
mainUrl = 'GetHBarCodeShowBillMainBywy';
- subUrl = "GetHBarCodeShowBillSubBywy";
+ subUrl = "GetHBarCodeShowBillSubBywy"; //h_v_srm_EntrustOrderBillSub_ForWeb2
saveBarCode = "GetBarcodeSaveBillBoxBycg";//璋冪敤閲囪喘鏁版嵁
openTmpListType = 'SRM_POOrderBillList';
}
@@ -430,7 +430,7 @@
});
table.render({
elem: '#subTable'
- , url: GetWEBURL() + 'GetHBarCodeShowBillSub3'
+ , url: GetWEBURL() + 'GetHBarCodeShowBillSub3' //h_v_Web_BarCodeBill_ForWeb1
, toolbar: '#toolbarDemo1'
, defaultToolbar: ['filter', 'exports']
, where: { sMsg: linterid }
@@ -569,9 +569,10 @@
, where: { sMsg: linterid, sMsg2: lentryid }
, cols: [[
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HMaterShortNumber', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
index c749e5d..0da8181 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
@@ -54,13 +54,19 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
@@ -358,6 +364,8 @@
sqlWhere += " and 鏉＄爜缂栧彿 like ^^%" + $("#HBarCode").val() + "%^^";
if ($("#HSourceBillNo").val() != "")
sqlWhere += " and 婧愬崟鍗曞彿 like ^^%" + $("#HSourceBillNo").val() + "%^^";
+ if ($("#HShortNumber").val() != "")
+ sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBill.html
index 09e9741..0a2a976 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBill.html
@@ -90,7 +90,7 @@
</div>
</div>
- </form>
+ </form>
</div>
<div class="layui-tab-item">
<form id="form2" class="layui-form layui-form-pane" action="">
@@ -173,28 +173,28 @@
</div>
</div>
- </form>
+ </form>
</div>
</div>
</div>
</div>
- <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-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="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <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-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="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
- </div>
- </script>
- <blockquote class="layui-elem-quote">閲囪喘璁㈠崟</blockquote>
-
- </div>
</div>
+ </script>
+ <blockquote class="layui-elem-quote">閲囪喘璁㈠崟</blockquote>
+
+ </div>
+ </div>
</div>
</div>
<!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
@@ -210,9 +210,9 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'table', 'form', 'element'], function () {
var table = layui.table
- , $ = layui.$
- , form = layui.form
- , element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
+ , $ = layui.$
+ , form = layui.form
+ , element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
@@ -221,105 +221,104 @@
var sMainSub = sMainStr + ';' + sSubStr;
layer.load(3)
$.ajax(
- {
- type: "POST",
- url: GetWEBURL()+"SaverPOOrder", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaverPOOrder", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
}
- else {
- layer.msg(data.Message, { icon: 5 });
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- f_alert("閿欒:" + err);
- }
- });
+ });
return false;
});
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
}
- return vars;
- }
- var params = getUrlVars();
- var linterid = params[params[0]];
- var lentryid = params[params[1]];
- RoadBillMain(linterid);
- RoadBillSub(linterid);
+ var params = getUrlVars();
+ var linterid = params[params[0]];
+ var lentryid = params[params[1]];
+ RoadBillMain(linterid);
+ RoadBillSub(linterid);
// debugger;
- function RoadBillMain(linterid)
- {
- $.ajax({
- url: GetWEBURL()+"GetEntrustOrderShowBillMain",
- type: "GET",
- data: { "sMsg": linterid },
- success: function (d) {
- console.log(d.data);
- //$("#HDate").val(d.)
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HDate").val(d.data[0].HDateForWeb);
- $("#HStatus").val(d.data[0].HStatus);
- $("#HSupID").val(d.data[0].HSupID);
- $("#HSupName").val(d.data[0].HSupName);
- $("#HEmpID").val(d.data[0].HEmpID);
- $("#HEmpName").val(d.data[0].HEmpName);
- $("#HManagerID").val(d.data[0].HManagerID);
- $("#HManagerName").val(d.data[0].HManagerName);
- $("#HMaker").val(d.data[0].HMaker);
- $("#HMakeDate").val(d.data[0].HMakeDate)
- $("#HChecker").val(d.data[0].HChecker);
- $("#HCheckDate").val(d.data[0].HCheckDate);
- $("#HUpDater").val(d.data[0].HUpDater);
- $("#HUpDateDate").val(d.data[0].HUpDateDate);
- $("#HConfirmMan").val(d.data[0].HConfirmMan);
- $("#HConfirmDate").val(d.data[0].HConfirmDate);
- $("#HBacker").val(d.data[0].HBacker);
- $("#HBackDate").val(d.data[0].HBackDate);
- $("#HBackRemark").val(d.data[0].HBackRemark);
+ function RoadBillMain(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "GetEntrustOrderShowBillMain", //H_v_SRM_EntrustOrderBillMain_ForWeb
+ type: "GET",
+ data: { "sMsg": linterid },
+ success: function (d) {
+ console.log(d.data);
+ //$("#HDate").val(d.)
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HRemark").val(d.data[0].HRemark);
+ $("#HDate").val(d.data[0].HDateForWeb);
+ $("#HStatus").val(d.data[0].HStatus);
+ $("#HSupID").val(d.data[0].HSupID);
+ $("#HSupName").val(d.data[0].HSupName);
+ $("#HEmpID").val(d.data[0].HEmpID);
+ $("#HEmpName").val(d.data[0].HEmpName);
+ $("#HManagerID").val(d.data[0].HManagerID);
+ $("#HManagerName").val(d.data[0].HManagerName);
+ $("#HMaker").val(d.data[0].HMaker);
+ $("#HMakeDate").val(d.data[0].HMakeDate)
+ $("#HChecker").val(d.data[0].HChecker);
+ $("#HCheckDate").val(d.data[0].HCheckDate);
+ $("#HUpDater").val(d.data[0].HUpDater);
+ $("#HUpDateDate").val(d.data[0].HUpDateDate);
+ $("#HConfirmMan").val(d.data[0].HConfirmMan);
+ $("#HConfirmDate").val(d.data[0].HConfirmDate);
+ $("#HBacker").val(d.data[0].HBacker);
+ $("#HBackDate").val(d.data[0].HBackDate);
+ $("#HBackRemark").val(d.data[0].HBackRemark);
+ }
+ });
}
- });
- }
///鍔犺浇鏄剧ず鏁版嵁
- function RoadBillSub(linterid) {
- $.ajax({
- type: "get",
- url: GetWEBURL()+"GetEntrustOrderShowBillSub",
- async: true,
- data: { sMsg: linterid },
- success: function (result) {
- ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
- table.reload('mainTable', {
- data: ajaxReturnData
- , height: 'full-10'
- , loading: false
- , done: function (index, res) {
+ function RoadBillSub(linterid) {
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "GetEntrustOrderShowBillSub",//[h_v_srm_EntrustOrderBillSub_ForWeb2]
+ async: true,
+ data: { sMsg: linterid },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
- }
- });
- },
- error: function (result) {
- console.log(result);
- //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
- }
- });
- }
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ }
-
+
//鐩戝惉鎻愪氦
@@ -335,44 +334,45 @@
layer.load(3)
table.render({
elem: '#mainTable'
- , url: GetWEBURL()+'GetEntrustOrderShowBillSub'
+ , url: GetWEBURL() + 'GetEntrustOrderShowBillSub'
, toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
, defaultToolbar: ['filter', 'exports']
- , where: { sMsg: linterid }
- ,cols: [[
- , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, sort: true, fixed: true , hide: true }
- , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 200 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
- , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
- , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HPrice', title: '鍗曚环', width: 100 }
- , { field: 'HMoney', title: '閲戦', width: 100 }
- , { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
- //, { field: 'HDate2', title: '纭浜よ揣鏃ユ湡', width: 150 }
- , { field: 'HPURCHASEORGID', title: '閲囪喘缁勭粐', width: 150 }
- , { field: 'HSTOCKINORGID', title: '鍏ュ簱缁勭粐', width: 150 }
- , { field: 'HINSTOCKOWNERID', title: '鍏ュ簱璐т富', width: 150 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200, hide: true }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
- , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200, hide: true }
- , { field: 'HSeOrderInterID', title: '閿�鍞鍗曚富鍐呯爜', width: 150, hide: true }
- , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 150, hide: true }
+ , where: { sMsg: linterid }
+ , cols: [[
+ , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, sort: true, fixed: true, hide: true }
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: 'HMaterShortNumber', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
+ , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
+ , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HPrice', title: '鍗曚环', width: 100 }
+ , { field: 'HMoney', title: '閲戦', width: 100 }
+ , { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
+ //, { field: 'HDate2', title: '纭浜よ揣鏃ユ湡', width: 150 }
+ , { field: 'HPURCHASEORGID', title: '閲囪喘缁勭粐', width: 150 }
+ , { field: 'HSTOCKINORGID', title: '鍏ュ簱缁勭粐', width: 150 }
+ , { field: 'HINSTOCKOWNERID', title: '鍏ュ簱璐т富', width: 150 }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200, hide: true }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200, hide: true }
+ , { field: 'HSeOrderInterID', title: '閿�鍞鍗曚富鍐呯爜', width: 150, hide: true }
+ , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 150, hide: true }
- ]]
- // , data: [linterid]
- //, page: true //鏄惁鏄剧ず鍒嗛〉
- //, limits: [10, 20, 50, 100]
- //, limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- //, height: 500
- , done: function () {
- layer.closeAll("loading");
- }
+ ]]
+ // , data: [linterid]
+ //, page: true //鏄惁鏄剧ず鍒嗛〉
+ //, limits: [10, 20, 50, 100]
+ //, limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ //, height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
});
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -385,27 +385,27 @@
window.open("../../views/WarM/HBarPlanPrint.html?linterid=" + linterid + "&Type=HEntrustOrderBill");
break;
- //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
+ //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
case 'btn-reload':
RoadBillMain(linterid);
RoadBillSub(linterid);
var demoReload = $('#mainTable');
//鎵ц閲嶈浇
table.reload('mainTable', {
- where: {
- key: {
- id: demoReload.val()
- }
- }
+ where: {
+ key: {
+ id: demoReload.val()
+ }
+ }
});
break;
case 'btn-confirm':
var HBillNo = $("#HBillNo").val()
if ($("#HStatus").val() == "鏈‘璁�") {
layer.confirm('鏄惁纭鍗曟嵁?', { icon: 3, title: '鎻愮ず' }, function (index) {
- $.ajax({
+ $.ajax({
type: "get",
- url: GetWEBURL()+"EntrustOrderAccept",
+ url: GetWEBURL() + "EntrustOrderAccept",
data: { "HInterID": linterid, "HBillNo": HBillNo, "HUser": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -442,7 +442,7 @@
HBackRemark = value.toString();
$.ajax({
type: "get",
- url: GetWEBURL()+"EntrustOrderRefuse",
+ url: GetWEBURL() + "EntrustOrderRefuse",
data: { "HInterID": linterid, "HBillNo": HBillNo, "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -465,7 +465,7 @@
}
break;
case 'btn-details':
-
+
case 'btn-exit':
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
@@ -479,7 +479,7 @@
// layer.load(3)
// $.ajax(
// {
- // type: "POST",
+ // type: "POST",
// url: GetWEBURL()+"SaverEntrustOrder", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
// async:true,
// data: { msg: sMainSub },
@@ -538,7 +538,7 @@
// return JSON.stringify(ajaxData).replace(/(")/g, "\\\"");
// // return false;
//});
-
+
//function f_SaveBefore() {
// //淇濆瓨鍓嶅鐞�(瀛楁鏍煎紡锛歩nt绫诲瀷涓嶈兘涓虹┖锛屾棩鏈熺被鍨嬬鍚堟牸寮忥紝bool绫诲瀷)
// if ($("#HInterID").val() == '') {
@@ -552,7 +552,7 @@
// var type = $(this).data('type');
// active[type] ? active[type].call(this) : '';
//});
- });
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
index 0f03e51..5886990 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
@@ -46,13 +46,19 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
@@ -542,6 +548,8 @@
sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
if ($("#HBillNo").val() != "")
sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
+ if ($("#HShortNumber").val() != "")
+ sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html
index d600c90..7184852 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill.html
@@ -297,15 +297,16 @@
, cols: [[
// , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100,, sort: true, fixed: true edit: 'text', hide: true }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, edit: 'text', hide: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HMaterShortNumber', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
, { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HPrice', title: '鍗曚环', width: 100 }
- , { field: 'HMoney', title: '閲戦', width: 100 }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true}
+ , { field: 'HMoney', title: '閲戦', width: 100, hide: true}
, { field: 'HWHName', title: '鏀舵枡浠撳簱', width: 100 }
, { field: 'HWHNumber', title: '鏀舵枡浠撳簱浠ｇ爜', width: 100, hide: true }
, { field: 'HWHID', title: '鏀舵枡浠撳簱ID', width: 100, hide: true }
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index 9a51257..2dda217 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -57,13 +57,19 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
@@ -100,15 +106,15 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鐘舵��</label>
- <div class="layui-input-block">
- <select name="HStatus" id="HStatus" lay-filter="">
- <option value="">鍏ㄩ儴</option>
- <option value="鏈墦鍗�" selected="">鏈墦鍗�</option>
- <option value="宸叉墦鍗�">宸叉墦鍗�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HStatus" id="HStatus" lay-filter="">
+ <option value="">鍏ㄩ儴</option>
+ <option value="鏈墦鍗�" selected="">鏈墦鍗�</option>
+ <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">閲囪喘缁勭粐</label>
@@ -497,6 +503,8 @@
sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
if ($("#HInnerBillNo").val() != "")
sqlWhere += " and 閫佽揣鍗曞彿 like ^^%" + $("#HInnerBillNo").val() + "%^^";
+ if ($("#HShortNumber").val() != "")
+ sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBill.html
index 153a054..de8389f 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBill.html
@@ -90,7 +90,7 @@
</div>
</div>
- </form>
+ </form>
</div>
<div class="layui-tab-item">
<form id="form2" class="layui-form layui-form-pane" action="">
@@ -173,28 +173,28 @@
</div>
</div>
- </form>
+ </form>
</div>
</div>
</div>
</div>
- <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-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="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <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-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="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
- </div>
- </script>
- <blockquote class="layui-elem-quote">閲囪喘璁㈠崟</blockquote>
-
- </div>
</div>
+ </script>
+ <blockquote class="layui-elem-quote">閲囪喘璁㈠崟</blockquote>
+
+ </div>
+ </div>
</div>
</div>
<!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
@@ -210,9 +210,9 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'table', 'form', 'element'], function () {
var table = layui.table
- , $ = layui.$
- , form = layui.form
- , element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
+ , $ = layui.$
+ , form = layui.form
+ , element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
@@ -221,105 +221,104 @@
var sMainSub = sMainStr + ';' + sSubStr;
layer.load(3)
$.ajax(
- {
- type: "POST",
- url: GetWEBURL()+"SaverPOOrder", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaverPOOrder", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
}
- else {
- layer.msg(data.Message, { icon: 5 });
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- f_alert("閿欒:" + err);
- }
- });
+ });
return false;
});
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
}
- return vars;
- }
- var params = getUrlVars();
- var linterid = params[params[0]];
- var lentryid = params[params[1]];
- RoadBillMain(linterid);
- RoadBillSub(linterid);
+ var params = getUrlVars();
+ var linterid = params[params[0]];
+ var lentryid = params[params[1]];
+ RoadBillMain(linterid);
+ RoadBillSub(linterid);
// debugger;
- function RoadBillMain(linterid)
- {
- $.ajax({
- url: GetWEBURL()+"GetPOOrderShowBillMain",
- type: "GET",
- data: { "sMsg": linterid },
- success: function (d) {
- console.log(d.data);
- //$("#HDate").val(d.)
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HDate").val(d.data[0].HDateForWeb);
- $("#HStatus").val(d.data[0].HStatus);
- $("#HSupID").val(d.data[0].HSupID);
- $("#HSupName").val(d.data[0].HSupName);
- $("#HEmpID").val(d.data[0].HEmpID);
- $("#HEmpName").val(d.data[0].HEmpName);
- $("#HManagerID").val(d.data[0].HManagerID);
- $("#HManagerName").val(d.data[0].HManagerName);
- $("#HMaker").val(d.data[0].HMaker);
- $("#HMakeDate").val(d.data[0].HMakeDate)
- $("#HChecker").val(d.data[0].HChecker);
- $("#HCheckDate").val(d.data[0].HCheckDate);
- $("#HUpDater").val(d.data[0].HUpDater);
- $("#HUpDateDate").val(d.data[0].HUpDateDate);
- $("#HConfirmMan").val(d.data[0].HConfirmMan);
- $("#HConfirmDate").val(d.data[0].HConfirmDate);
- $("#HBacker").val(d.data[0].HBacker);
- $("#HBackDate").val(d.data[0].HBackDate);
- $("#HBackRemark").val(d.data[0].HBackRemark);
+ function RoadBillMain(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "GetPOOrderShowBillMain",
+ type: "GET",
+ data: { "sMsg": linterid },
+ success: function (d) {
+ console.log(d.data);
+ //$("#HDate").val(d.)
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HRemark").val(d.data[0].HRemark);
+ $("#HDate").val(d.data[0].HDateForWeb);
+ $("#HStatus").val(d.data[0].HStatus);
+ $("#HSupID").val(d.data[0].HSupID);
+ $("#HSupName").val(d.data[0].HSupName);
+ $("#HEmpID").val(d.data[0].HEmpID);
+ $("#HEmpName").val(d.data[0].HEmpName);
+ $("#HManagerID").val(d.data[0].HManagerID);
+ $("#HManagerName").val(d.data[0].HManagerName);
+ $("#HMaker").val(d.data[0].HMaker);
+ $("#HMakeDate").val(d.data[0].HMakeDate)
+ $("#HChecker").val(d.data[0].HChecker);
+ $("#HCheckDate").val(d.data[0].HCheckDate);
+ $("#HUpDater").val(d.data[0].HUpDater);
+ $("#HUpDateDate").val(d.data[0].HUpDateDate);
+ $("#HConfirmMan").val(d.data[0].HConfirmMan);
+ $("#HConfirmDate").val(d.data[0].HConfirmDate);
+ $("#HBacker").val(d.data[0].HBacker);
+ $("#HBackDate").val(d.data[0].HBackDate);
+ $("#HBackRemark").val(d.data[0].HBackRemark);
+ }
+ });
}
- });
- }
///鍔犺浇鏄剧ず鏁版嵁
- function RoadBillSub(linterid) {
- $.ajax({
- type: "get",
- url: GetWEBURL()+"GetPOOrderShowBillSub",
- async: true,
- data: { sMsg: linterid },
- success: function (result) {
- ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
- table.reload('mainTable', {
- data: ajaxReturnData
- , height: 'full-10'
- , loading: false
- , done: function (index, res) {
+ function RoadBillSub(linterid) {
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "GetPOOrderShowBillSub",
+ async: true,
+ data: { sMsg: linterid },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
- }
- });
- },
- error: function (result) {
- console.log(result);
- //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
- }
- });
- }
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ }
-
+
//鐩戝惉鎻愪氦
@@ -335,44 +334,45 @@
layer.load(3)
table.render({
elem: '#mainTable'
- , url: GetWEBURL()+'GetPOOrderShowBillSub'
+ , url: GetWEBURL() + 'GetPOOrderShowBillSub' //H_v_SRM_POOrderBillSub_ForWeb
, toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
, defaultToolbar: ['filter', 'exports']
- , where: { sMsg: linterid }
- ,cols: [[
- , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, sort: true, fixed: true , hide: true }
- , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 200 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
- , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
- , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HPrice', title: '鍗曚环', width: 100 }
- , { field: 'HMoney', title: '閲戦', width: 100 }
- , { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
- //, { field: 'HDate2', title: '纭浜よ揣鏃ユ湡', width: 150 }
- , { field: 'HREQUIREORGID', title: '闇�姹傜粍缁�', width: 150 }
- , { field: 'HSTOCKORGID', title: '鏀舵枡缁勭粐', width: 150 }
- , { field: 'HSETTLEORGID', title: '缁撶畻缁勭粐', width: 150 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200, hide: true }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
- , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200, hide: true }
- , { field: 'HSeOrderInterID', title: '閿�鍞鍗曚富鍐呯爜', width: 150, hide: true }
- , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 150, hide: true }
+ , where: { sMsg: linterid }
+ , cols: [[
+ , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, sort: true, fixed: true, hide: true }
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ , { field: 'HMaterShortNumber', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 120 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
+ , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
+ , { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HPrice', title: '鍗曚环', width: 100 }
+ , { field: 'HMoney', title: '閲戦', width: 100 }
+ , { field: 'HDate', title: '瑕佹眰浜よ揣鏃ユ湡', width: 150 }
+ //, { field: 'HDate2', title: '纭浜よ揣鏃ユ湡', width: 150 }
+ , { field: 'HREQUIREORGID', title: '闇�姹傜粍缁�', width: 150 }
+ , { field: 'HSTOCKORGID', title: '鏀舵枡缁勭粐', width: 150 }
+ , { field: 'HSETTLEORGID', title: '缁撶畻缁勭粐', width: 150 }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200, hide: true }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
+ , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200, hide: true }
+ , { field: 'HSeOrderInterID', title: '閿�鍞鍗曚富鍐呯爜', width: 150, hide: true }
+ , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 150, hide: true }
- ]]
- // , data: [linterid]
- //, page: true //鏄惁鏄剧ず鍒嗛〉
- //, limits: [10, 20, 50, 100]
- //, limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- //, height: 500
- , done: function () {
- layer.closeAll("loading");
- }
+ ]]
+ // , data: [linterid]
+ //, page: true //鏄惁鏄剧ず鍒嗛〉
+ //, limits: [10, 20, 50, 100]
+ //, limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ //, height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
});
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -385,7 +385,7 @@
window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid + "&Type=HPOOrderBill");
break;
- //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
+ //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
case 'btn-reload':
RoadBillMain(linterid);
RoadBillSub(linterid);
@@ -394,9 +394,9 @@
var HBillNo = $("#HBillNo").val()
if ($("#HStatus").val() == "鏈‘璁�") {
layer.confirm('鏄惁纭鍗曟嵁?', { icon: 3, title: '鎻愮ず' }, function (index) {
- $.ajax({
+ $.ajax({
type: "get",
- url: GetWEBURL()+"POOrderAccept",
+ url: GetWEBURL() + "POOrderAccept",
data: { "HInterID": linterid, "HBillNo": HBillNo, "HUser": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -433,7 +433,7 @@
HBackRemark = value.toString();
$.ajax({
type: "get",
- url: GetWEBURL()+"POOrderRefuse",
+ url: GetWEBURL() + "POOrderRefuse",
data: { "HInterID": linterid, "HBillNo": HBillNo, "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -457,7 +457,7 @@
}
break;
case 'btn-details':
-
+
case 'btn-exit':
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
@@ -470,26 +470,26 @@
//jiuajax浠庢湇鍔″櫒鑾峰彇
layer.load(3)
$.ajax(
- {
- type: "POST",
- url: GetWEBURL()+"SaverPOOrder", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async:true,
- data: { msg: sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaverPOOrder", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { msg: sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ }
+ else {
+ // $("#verifycode").click();
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
}
- else {
- // $("#verifycode").click();
- layer.msg(data.Message, { icon: 5 });
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- f_alert("閿欒:" + err);
- }
- });
+ });
}
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -530,7 +530,7 @@
// return JSON.stringify(ajaxData).replace(/(")/g, "\\\"");
// // return false;
//});
-
+
//function f_SaveBefore() {
// //淇濆瓨鍓嶅鐞�(瀛楁鏍煎紡锛歩nt绫诲瀷涓嶈兘涓虹┖锛屾棩鏈熺被鍨嬬鍚堟牸寮忥紝bool绫诲瀷)
// if ($("#HInterID").val() == '') {
@@ -544,7 +544,7 @@
// var type = $(this).data('type');
// active[type] ? active[type].call(this) : '';
//});
- });
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index cb61616..bda5c42 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -47,13 +47,19 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
@@ -587,6 +593,8 @@
sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
if ($("#HBillNo").val() != "")
sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
+ if ($("#HShortNumber").val() != "")
+ sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
--
Gitblit v1.9.1