From 5f6b11a987bd0282385d3a276e070bdcbb3882f3 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 05 十二月 2024 08:37:32 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 32
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 26
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 115 +-
WebTM/views/采购管理/付款单/YF_PayMentBillList.html | 79 +
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 8
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html | 4
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html | 19
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html | 2
WebTM/views/质量管理/质量报表/QC_ErrMsgBackBillList.html | 27
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 14
WebTM/views/采购管理/应付单/Cg_PayableBillList.html | 74 +
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 4
WebTM/views/采购管理/收料通知单/Cg_POInStockBillQuery.html | 16
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 32
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide.html | 3
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 77 +
WebTM/views/采购管理/应付单/Cg_PayableBillQuery.html | 16
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 14
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillQuery.html | 16
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 16
WebTM/views/销售管理/应收单/Xs_ReceivableBillQuery.html | 15
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_InspectInstruMent.html | 253 ++++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 35
WebTM/views/销售管理/销售订单/Xs_SeOrderBillQuery.html | 16
WebTM/views/领料发货/销售出库/Kf_SellOutBillQuery.html | 16
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 4
WebTM/WebTM.csproj.user | 2
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 115 +
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 513 ++++++---
WebTM/views/采购管理/付款单/YF_PayMentBillQuery.html | 16
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 11
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 8
WebTM/views/验收入库/外购入库/Kf_POStockInBillListQuery.html | 16
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 75 +
WebTM/layuiadmin/SetColumn.js | 21
/dev/null | 0
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html | 16
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 998 +++++++------------
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 84 +
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 116 +-
WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html | 74 +
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 8
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 28
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 8
WebTM/WebTM.csproj | 3
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 73 +
46 files changed, 1,951 insertions(+), 1,167 deletions(-)
diff --git "a/WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01\347\203\230\346\226\231-A2_20240112_\350\202\226\346\260\264\346\270\205.pdf" "b/WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01\347\203\230\346\226\231-A2_20240112_\350\202\226\346\260\264\346\270\205.pdf"
deleted file mode 100644
index 065d116..0000000
--- "a/WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01\347\203\230\346\226\231-A2_20240112_\350\202\226\346\260\264\346\270\205.pdf"
+++ /dev/null
Binary files differ
diff --git "a/WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02\346\263\250\345\241\221-A5_20240423_\345\221\250\350\212\263.pdf" "b/WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02\346\263\250\345\241\221-A5_20240423_\345\221\250\350\212\263.pdf"
deleted file mode 100644
index 5407b93..0000000
--- "a/WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02\346\263\250\345\241\221-A5_20240423_\345\221\250\350\212\263.pdf"
+++ /dev/null
Binary files differ
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 361a4a9..58db323 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -97,6 +97,7 @@
<Content Include="layuiadmin\ckou.js" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\grwebapp.js" />
+ <Content Include="layuiadmin\SetColumn.js" />
<Content Include="layuiadmin\modules\tableFilter2.js" />
<Content Include="layuiadmin\PlateBinding.js" />
<Content Include="layuiadmin\PageTitle.js" />
@@ -2094,6 +2095,8 @@
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkReportWeekBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBillList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_ProjectClass.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_CustomerProInfoBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBill.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 1daf955..8233a56 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
new file mode 100644
index 0000000..a2031e4
--- /dev/null
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -0,0 +1,21 @@
+锘�//#region 璁剧疆琛ㄦ牸椤靛ぇ灏忓垵濮�
+function DisPlay_HideColumn_GetPageSize(HModName, user,optionPage) {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": user },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ if (data1.data[0].HPageSize > 0) {
+ optionPage.limit = data1.data[0].HPageSize;
+ }
+
+ } else {
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+}
+ //#endregion
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
index c79b07e..e886c51 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
@@ -27,22 +27,27 @@
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-
+
<h1 style="text-align:center;"><b>妫�楠屼华鍣�</b></h1>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">闄勪欢淇℃伅</li>
+ </ul>
<div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input type="text" class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
<input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HName" id="HName" autocomplete="off">
+ <input type="text" class="layui-input" name="HName" id="HName" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -86,6 +91,31 @@
</div>
</div>
</div>
+
+ <!--闄勪欢淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-upload">
+ <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+ <div class="layui-upload-list">
+ <table class="layui-table" lay-filter="fileTable">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>鍥剧墖</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList" class="ProImgByList">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
</div>
</div>
@@ -115,13 +145,14 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'upload','element'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , upload = layui.upload
, laydate = layui.laydate
, element = layui.element;
//#endregion
@@ -189,7 +220,7 @@
Pub_Close(1);
}
});
-
+
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -213,11 +244,40 @@
function set_AddFNew() {
$("#HItemID").val("0");
$("#HNumber").val("");
+
+ // 鐩戝惉鎸夐挳鐐瑰嚮浜嬩欢锛岃Е鍙戞枃浠惰緭鍏ユ鐨勭偣鍑讳簨浠�
+ document.getElementById('testList').addEventListener('click', function () {
+ // 瑙﹀彂鏂囦欢杈撳叆妗嗙殑鐐瑰嚮浜嬩欢
+ document.getElementById('HNumber').click();
+ if ($("#HNumber").val() == "" || $("#HNumber").val() == null || $("#HNumber").val() == undefined) {
+ layer.msg('璇峰厛杈撳叆鐗╂枡浠ｇ爜绛変俊鎭悗鍦ㄤ笂浼犳枃浠讹紒', { time: 3 * 1000, icon: 3 });
+ }
+ });
+
+ // 鐩戝惉鏂囦欢杈撳叆妗嗙殑change浜嬩欢
+ document.getElementById('HNumber').addEventListener('change', function () {
+ var inputHNumber = document.getElementById('HNumber');
+ var hNumberValue = inputHNumber.value.trim(); // 鑾峰彇鏂囨湰妗嗙殑鐗╂枡浠ｇ爜鍊煎苟鍘婚櫎鍓嶅悗绌烘牸
+
+ if (hNumberValue == '') {
+ // 鐗╂枡浠ｇ爜涓虹┖锛岀粰鍑烘彁绀哄苟娓呴櫎宸查�夋嫨鐨勬枃浠�
+ layer.msg("鐗╂枡浠ｇ爜涓虹┖,鏃犳硶杩涜鏂囦欢涓婁紶");
+ this.value = '';
+ } else {
+ // 鐗╂枡浠ｇ爜涓嶄负绌猴紝璋冪敤鏂囦欢涓婁紶鏂规硶骞朵紶鍏ユ枃浠跺垪琛ㄥ拰鐗╂枡浠ｇ爜
+ PicUpload();
+ }
+ });
+
+
}
//缂栬緫
function set_EditFromGrid() {
$("#HItemID").val(linterid);
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
+ getFile();
}
//缂栬緫鍔犺浇琛ㄥご
function set_EditForm(linterid) {
@@ -225,6 +285,7 @@
$.ajax({
url: GetWEBURL() + "GetGy_InspectInstruMentDetail",
type: "GET",
+ async: false,
data: {
"HID": linterid
},
@@ -249,13 +310,13 @@
}
});
}
-
- //
+
+ //寮规鎻愮ず淇℃伅
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
}
- //鑾峰彇鐧诲綍椤电粍缁囧垪
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
function Organ() {
var Organization = '';
$.ajax({
@@ -294,9 +355,185 @@
return true;
}
+ //#region 鏂囦欢涓婁紶
+ function PicUpload() {
+ //澶氬浘鐗囦笂浼�
+ //澶氭枃浠跺垪琛ㄧず渚�
+ var ProImgByList = $('#ProImgByList')
+ , uploadListIns = upload.render({
+ elem: '#testList'
+ , url: GetWEBURL() + "/Gy_InspectInstruMent_UploadFile"
+ , accept: 'file'
+ , multiple: true
+ , auto: false
+ //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+ , data: { "HBillNo": $("#HNumber").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+ , choose: function (obj) {
+ var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+ //璇诲彇鏈湴鏂囦欢
+ obj.preview(function (index, file, result) {
+ var tr = $(['<tr id="upload-' + index + '">'
+ , '<td>' + file.name + '</td>'
+ , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + result + '" alt="' + file.name + '">' + '</td>'
+ , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+ , '<td>绛夊緟涓婁紶</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+
+ //鍗曚釜閲嶄紶
+ tr.find('.demo-reload').on('click', function () {
+ obj.upload(index, file);
+ return false;
+ });
+
+ //鍒犻櫎
+ tr.find('.demo-delete').on('click', function () {
+ delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+ tr.remove();
+ uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+ });
+
+ ProImgByList.append(tr);
+
+ });
+ }
+ , done: function (res, index, upload) {
+ if (res.code == 1) { //涓婁紶鎴愬姛
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(3).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+ tds.eq(4).html(''); //娓呯┖鎿嶄綔
+
+ return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+ }
+ this.error(index, upload);
+ }
+ , error: function (index, upload) {
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+ tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+ }
+ });
+ }
+ //#endregion
+
+ //#region 缂栬緫鏃�,鑾峰彇宸蹭笂浼犵殑鏂囦欢鍒楄〃
+ function getFile() {
+ var ProImgByList = $('#ProImgByList')
+ $.ajax({
+ url: GetWEBURL() + '/Gy_InspectInstruMent_Filelist',
+ type: "GET",
+ data: { "HBillNo": $("#HNumber").val() },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var index = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ var tr = $(['<tr id="upload-' + i + '">'
+ , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
+ , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
+ , '<td>' + data1.data[i].HFileName + '</td>'
+ , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg' + i + '" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + data1.data[i].HFilePath + '" alt="' + data1.data[i].HFileName + '">' + '</td>'
+ , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
+ , '<td style="color: #5FB878;">涓婁紶鎴愬姛</td>'
+ , '<td style="display:none">' + data1.data[i].url + '</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>涓嬭浇</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+ $('#ProImgByList').append(tr);
+ }
+
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#endregion
});
+ function previewImg(obj) {
+ var img = new Image();
+ img.src = obj.src;
+ var height = img.height * 1.2; //鑾峰彇鍥剧墖楂樺害
+ var width = img.width * 1.2; //鑾峰彇鍥剧墖瀹藉害
+ var imgHtml = "<img src='" + obj.src + "' width='100%' height='100%'/>";
+ //寮瑰嚭灞�
+ layer.open({
+ type: 1,
+ shade: 0.8,
+ offset: 'auto',
+ area: ['80%', '80%'],
+ shadeClose: true,
+ scrollbar: false,
+ title: "鍥剧墖棰勮", //涓嶆樉绀烘爣棰�
+ content: imgHtml, //鎹曡幏鐨勫厓绱狅紝娉ㄦ剰锛氭渶濂借鎸囧畾鐨勫厓绱犺瀛樻斁鍦╞ody鏈�澶栧眰锛屽惁鍒欏彲鑳借鍏跺畠鐨勭浉瀵瑰厓绱犳墍褰卞搷
+ cancel: function () {
+ //layer.msg('鎹曡幏灏辨槸浠庨〉闈㈠凡缁忓瓨鍦ㄧ殑鍏冪礌涓婏紝鍖呰９layer鐨勭粨鏋�', { time: 5000, icon: 6 });
+ }
+ });
+ }
+
+ //#region 涓嬭浇宸蹭笂浼犵殑鏂囦欢
+ function dowload(r) {
+ //寰楀埌褰撳墠鎵�鍦ㄨ
+ var rows = r.parentNode.parentNode.rowIndex;
+ //寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
+ var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(6)").html();
+
+ var a = document.createElement('a');
+ a.href = url;
+ a.download = url.split('/').pop(); // 鏇挎崲涓哄疄闄呮枃浠跺悕
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
+ }
+ //#endregion
+
+ //#region 鍒犻櫎宸蹭笂浼犵殑鏂囦欢
+ function toManager(r) {
+ //寰楀埌褰撳墠鎵�鍦ㄨ
+ var rows = r.parentNode.parentNode.rowIndex;
+ //寰楀埌鎵�鍦ㄨ鐨勭涓�鍒楃殑鍐呭:涓婚敭ID
+ var HItemID = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(0)").html();
+ //寰楀埌鎵�鍦ㄨ鐨勭浜屽垪鐨勫唴瀹�:鍗曟嵁鍙�
+ var HSourceBillNo = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(1)").html();
+ //寰楀埌鎵�鍦ㄨ鐨勭涓夊垪鐨勫唴瀹�:鏂囦欢鍚嶇О
+ var HFileName = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(2)").html();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+
+ //鍒犻櫎宸蹭笂浼犳枃浠�
+ $.ajax({
+ url: GetWEBURL() + '/Gy_InspectInstruMent_DeleteFilelist',
+ type: "GET",
+ data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.alert(data1.Message, { icon: 1 });
+ $("#ProImgByList tr").eq((rows - 1)).remove();
+ }
+ else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ //#endregion
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
index e5e9da4..ea27363 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
@@ -269,7 +269,8 @@
$("#HColumnWidth").val(data1.data[0].HColumnWidth);
//榛樿鍒嗛〉
$("#HPageSize").val(data1.data[0].HPageSize);
-
+ //鏄惁鎺掑簭
+ $("#HSortFlag").val(data1.data[0].HSortFlag);
//琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
var dataCols = dataCol[i].split('|');
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
index 59eae84..0c6e010 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
@@ -334,7 +334,9 @@
$("#HColumnWidth").val(data1.data[0].HColumnWidth);
//榛樿鍒嗛〉
$("#HPageSize").val(data1.data[0].HPageSize);
-
+ //鏄惁鎺掑簭
+ $("#HSortFlag").val(data1.data[0].HSortFlag);
+
//琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
var dataCols = dataCol[i].split('|');
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 46a0e40..764b124 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -1170,7 +1170,7 @@
// 灏嗘洿鏂板悗鐨勫�艰缃洖杈撳叆妗�
$("#HDescription").val(updatedValue);
} else if (OperationType == 4) {
- $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber));
+ $("#HDescription").val(generateString(Datetime, Person, $("#HSourceName").val(), HICMOBillNo, HType, EquipNumber));
}
}
@@ -1587,6 +1587,8 @@
$("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ set_EquipFile($("#HSourceName").val());
+ $("#HDescription").val(generateString(Datetime, Person, $("#HSourceName").val(), HICMOBillNo, HType, EquipNumber));
}
, cancel: function (index, layero) {
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
index c821fe8..9931c75 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
@@ -537,7 +537,7 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " =='' ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
case 'long':
case 'Int32':
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index 61a9c0c..cc9ce71 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -1013,7 +1013,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
@@ -1192,6 +1192,27 @@
});
}
+ var data = obj.data;
+ if (obj.event == '妫�楠屼华鍣ㄤ唬鐮�') {
+ var HNumber = data.妫�楠屼华鍣ㄤ唬鐮�;
+ var linterid = data.HInspectInstruMentID;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妫�楠屼华鍣�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_InspectInstruMent.html?OperationType=3&linterid=' + linterid + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
if (event.key == "F7") {
@@ -1259,6 +1280,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+ ,妫�楠屼华鍣ㄤ唬鐮�: checkStatus.data[0].妫�楠屼华鍣ㄤ唬鐮�
, HInspectInstruMentID: checkStatus.data[0].HItemID
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1579,7 +1601,7 @@
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣ㄤ唬鐮�": data[i].妫�楠屼华鍣ㄤ唬鐮�, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
"HUnit": data[i].妫�楠屽崟浣�, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
@@ -1904,7 +1926,7 @@
//瀛愯〃 璧嬪��
rowdata.push(
{
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁� == null ? 0 : data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁� == null ? 0 : data[i].鎷掔粷鏁�,
@@ -2286,7 +2308,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
@@ -2306,6 +2328,8 @@
, { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�' }
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , {field: '妫�楠屼华鍣ㄤ唬鐮�', title: '妫�楠屼华鍣ㄤ唬鐮�', totalRow: true, templet: function (d) {
+ return '<span style="color: blue;" lay-event="妫�楠屼华鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';}, style: 'cursor: pointer;'}
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index ca4ac99..6e3afd5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -986,7 +986,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣ㄤ唬鐮�": "","妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
@@ -1182,6 +1182,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
+ 妫�楠屼华鍣ㄤ唬鐮�: checkStatus.data[0].妫�楠屼华鍣ㄤ唬鐮�,
妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
, HInspectInstruMentID: checkStatus.data[0].HItemID
});
@@ -1540,7 +1541,7 @@
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣ㄤ唬鐮�": data[i].妫�楠屼华鍣ㄤ唬鐮�,"妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
"HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
@@ -1945,7 +1946,7 @@
//"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
//}
{
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
@@ -2240,7 +2241,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣ㄤ唬鐮�": "","妫�楠屼华鍣�": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
@@ -2260,6 +2261,11 @@
, { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�' }
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , {
+ field: '妫�楠屼华鍣ㄤ唬鐮�', title: '妫�楠屼华鍣ㄤ唬鐮�', totalRow: true, templet: function (d) {
+ return '<span style="color: blue;" lay-event="妫�楠屼华鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';
+ }, style: 'cursor: pointer;'
+ }
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrMsgBackBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrMsgBackBillList.html"
index c988659..ad20865 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrMsgBackBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ErrMsgBackBillList.html"
@@ -522,14 +522,33 @@
function get_Export() {
var data = option.data
data.forEach((item) => {
- // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
- if (item.璇︾粏鍐呭.length > 0) { // 鍋囪瀛楁鍚嶄负field
- item.璇︾粏鍐呭 = item.璇︾粏鍐呭.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+
+ // 鏍煎紡鍖栨棩鏈熷瓧娈�
+ if (itemobj === '鍒跺崟鏃ユ湡' || itemobj === '鏃ユ湡' || itemobj === '绛惧埌鏃堕棿' || itemobj === '澶勭悊鏃堕棿' || itemobj === '楠屾敹鏃堕棿') { // 鏍规嵁浣犵殑瀛楁鍚嶆潵鍒ゆ柇
+ let date = new Date(item[itemobj]);
+ if (!isNaN(date.getTime())) { // 鍒ゆ柇鏄惁鏄湁鏁堢殑鏃ユ湡
+ item[itemobj] = date.toISOString().slice(0, 10) + ' ' + date.toTimeString().slice(0, 5); // 鏍煎紡鍖栦负 YYYY-MM-DD HH:mm
+ } else {
+ item[itemobj] = ""; // 濡傛灉涓嶆槸鏈夋晥鏃ユ湡锛屾竻绌鸿鍊�
+ }
+ }
+
+ // 澶勭悊鍏蜂綋瀛楁鐨勬浛鎹�
+ if (itemobj === '璇︾粏鍐呭' || itemobj === '鎶勯�佷汉' || itemobj === '瑙勬牸鍨嬪彿') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
}
});
table.exportFile(ins.config.id, data, "xls");
}
- //#endregion
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
index c436455..cccfcb2 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
@@ -126,6 +126,7 @@
<li>娉�</li>
<li>鐜�</li>
<li>娴�</li>
+ <li>淇�</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -151,6 +152,10 @@
<div class="layui-tab-item">
<!--娴�-->
<table class="layui-hide" id="mainTable_Measure" lay-filter="mainTable_Measure"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--淇�-->
+ <table class="layui-hide" id="mainTable_Message" lay-filter="mainTable_Message"></table>
</div>
</div>
</div>
@@ -225,6 +230,7 @@
var option_Method = ""; //娉�
var option_Environments = ""; //鐜�
var option_Measure = ""; //娴�
+ var option_Message = ""; //淇�
var option_HB_SN = ""; //榛戠櫧鏍�
var ins;
//#endregion
@@ -334,6 +340,8 @@
set_InitGrid_Environments();
//鍒濆鍖栨祴鍒楄〃
set_InitGrid_Measure();
+ //鍒濆鍖栦俊鍒楄〃
+ set_InitGrid_Message();
//鍒濆鍖栭粦鐧芥爣鍒楄〃
set_InitGrid_HB_SN();
//鏌ヨ
@@ -500,6 +508,20 @@
};
}
+ //鍒濆鍖栦俊鍒楄〃
+ function set_InitGrid_Message() {
+ option_Man = {
+ elem: '#mainTable_Message'
+ , toolbar: '#toolbarDemo2'
+ , totalRow: true
+ , height: 600
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ , data: []
+ };
+ }
+
//鍒濆鍖栭粦鐧芥爣鍒楄〃
function set_InitGrid_HB_SN() {
option_HB_SN = {
@@ -548,6 +570,13 @@
}, style: 'cursor: pointer;'
});
}
+ else if (data[j].name == '宸ュ簭') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '宸ュ簭', templet: function (d) {
+ return '<span style="color: blue;">' + d.宸ュ簭 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
else {
switch (data[j].Type) {
//int
@@ -572,7 +601,7 @@
, cellMinWidth: 90
}
table.render(option);
-
+ //浜�
option_Man = {
elem: '#mainTable_Man'
, toolbar: '#toolbarDemo2'
@@ -582,7 +611,7 @@
, cellMinWidth: 90
}
table.render(option_Man);
-
+ //鏈�
option_Machine = {
elem: '#mainTable_Machine'
, toolbar: '#toolbarDemo2'
@@ -592,7 +621,7 @@
, cellMinWidth: 90
}
table.render(option_Machine);
-
+ //鏂�
option_Material = {
elem: '#mainTable_Material'
, toolbar: '#toolbarDemo2'
@@ -602,7 +631,7 @@
, cellMinWidth: 90
}
table.render(option_Material);
-
+ //娉�
option_Method = {
elem: '#mainTable_Method'
, toolbar: '#toolbarDemo2'
@@ -612,7 +641,7 @@
, cellMinWidth: 90
}
table.render(option_Method);
-
+ //鐜�
option_Environments = {
elem: '#mainTable_Environments'
, toolbar: '#toolbarDemo2'
@@ -622,7 +651,7 @@
, cellMinWidth: 90
}
table.render(option_Environments);
-
+ //娴�
option_Measure = {
elem: '#mainTable_Measure'
, toolbar: '#toolbarDemo2'
@@ -632,6 +661,16 @@
, cellMinWidth: 90
}
table.render(option_Measure);
+ //淇�
+ option_Message = {
+ elem: '#mainTable_Message'
+ , toolbar: '#toolbarDemo2'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Message);
$("#HMaterNumber").val(data1.data.h_p_QC_FiveMenOneRingList[0].鐗╂枡浠ｇ爜);
$("#HMaterName").val(data1.data.h_p_QC_FiveMenOneRingList[0].鐗╂枡鍚嶇О);
@@ -740,8 +779,8 @@
success: function (data1) {
if (data1.count == 1) {
var linterid = data1.data[0].hmainid;
- var SNs = "";
- getTable_Right(linterid, SNs);
+ var SNs = ""; var HProcID = "";
+ getTable_Right(linterid, HProcID, SNs);
layer.close(ajaxLoad);
} else {
@@ -815,12 +854,18 @@
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
var linterid;
+ var HProcID;
var SNs = $("#SN").val();
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '娴佽浆鍗�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
linterid = data.娴佽浆鍗d;
- getTable_Right(linterid, SNs);
- }
+ HProcID = data.宸ュ簭id;
+ getTable_Right(linterid, HProcID, SNs);
+ } else if (obj.event == '宸ュ簭') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ linterid = data.娴佽浆鍗d;
+ HProcID = data.宸ュ簭id;
+ getTable_Right(linterid, HProcID, SNs);
+ }
});
//#endregion
@@ -878,118 +923,7 @@
//浜�
table.on('tool(mainTable_Man)', function (obj) {
var data = obj.data;
- if (obj.event == '鍗曟嵁鍙�') {
- if (data.鍗曟嵁绫诲瀷=="姹囨姤鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅鍑虹珯鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (data.鍗曟嵁绫诲瀷 == "宸ュ簭杩涚珯鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅杩涚珯鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (data.鍗曟嵁绫诲瀷 == "鍙栨牱鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅鍙栨牱鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璐ㄩ噺绠＄悊/妫�楠屽彇鏍疯繕鏍峰崟/QC_Add_TakeSampleCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (data.鍗曟嵁绫诲瀷 == "寮�宸ュ崟") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅寮�宸ュ崟'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (data.鍗曟嵁绫诲瀷 == "鍋滃伐鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅鍙栨牱鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (data.鍗曟嵁绫诲瀷 == "瀹屽伐鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅鍙栨牱鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- }
-
- } else if (obj.event == '鑱屽憳') {
+ if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
var HProcID = data.宸ュ簭id;
layer.open({
@@ -1000,7 +934,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID +''
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
, resize: false,
end: function () {
}
@@ -1008,7 +942,6 @@
}
})
}
-
});
//鏈�
@@ -1198,22 +1131,24 @@
table.on('tool(mainTable_Material)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
- var linterid = data.鍗曟嵁涓籭d;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅涓婃枡闃查敊鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
+ if (data.鍗曟嵁绫诲瀷=="涓婃枡闃查敊") {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅涓婃枡闃查敊鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
var HProcID = data.宸ュ簭id;
@@ -1240,23 +1175,24 @@
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
var linterid = data.鍗曟嵁涓籭d;
- if (data.鍗曟嵁绫诲瀷 == "宸ュ簭娴佽浆鍗�") {
+ if (data.鍗曟嵁绫诲瀷 == "浜у搧宸ヨ壓鍙傛暟") {
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鏌ョ湅璁惧宸ヨ壓鍙傛暟鐐规'
+ , title: '鏌ョ湅浜у搧宸ヨ壓鍙傛暟娓呭崟'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType=3772'
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_MaterialTechParamBillMain.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType='
, resize: false,
end: function () {
}
, cancel: function () {
}
})
- } else if (data.鍗曟嵁绫诲瀷 == "宸ヨ壓鍙傛暟鐐规鍗�") {
+ }
+ else if (data.鍗曟嵁绫诲瀷 == "宸ヨ壓鍙傛暟鐐规鍗�") {
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1272,7 +1208,26 @@
, cancel: function () {
}
})
- }
+ }
+ else if (data.鍗曟嵁绫诲瀷 == "浣滀笟鎸囧涔�") {
+ var HProcID = data.宸ュ簭id;
+ var HMaterID = data.鐗╂枡id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅浣滀笟鎸囧涔�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
var HProcID = data.宸ュ簭id;
@@ -1285,25 +1240,6 @@
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (obj.event == '妯″叿鍚嶇О') {
- var linterid = data.妯″叿id;
- var HNumber = data.妯″叿缂栫爜;
- var HName = data.妯″叿鍚嶇О;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅妯″叿灞ュ巻'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName + ''
, resize: false,
end: function () {
}
@@ -1329,47 +1265,70 @@
, cancel: function () {
}
})
- } else if (obj.event == '宸ュ簭鍚嶇О') {
- if (data.鍗曟嵁绫诲瀷 == "宸ュ簭娴佽浆鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HProcID = data.宸ュ簭id;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅璁惧灞ュ巻'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + ''
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- }
- else {
+ } else if (obj.event == '宸ヨ壓鍙傛暟') {
+ if (data.鍗曟嵁绫诲瀷 == "浜у搧宸ヨ壓鍙傛暟") {
var linterid = data.娴佽浆鍗d;
var HProcID = data.宸ュ簭id;
+ var HTeachName = data.宸ヨ壓鍙傛暟;
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鏌ョ湅璁惧灞ュ巻'
+ , title: '鏌ョ湅璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥�'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + ''
+ , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + '&HTeachName=' + HTeachName + ''
, resize: false,
end: function () {
}
, cancel: function () {
}
})
- }
- }
+ }
+ }
+ });
+
+ //鐜�
+ table.on('tool(mainTable_Environments)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鐜妫�娴嬪崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '鑱屽憳') {
+ var HName = data.鑱屽憳;
+ var HProcID = data.宸ュ簭id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
});
//娴�
@@ -1500,15 +1459,151 @@
}
});
+ //淇�
+ table.on('tool(mainTable_Message)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ if (data.鍗曟嵁绫诲瀷 == "姹囨姤鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅姹囨姤鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "宸ュ簭杩涚珯鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅杩涚珯鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "鍙栨牱鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/妫�楠屽彇鏍疯繕鏍峰崟/QC_Add_TakeSampleCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "寮�宸ュ崟") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅寮�宸ュ崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "鍋滃伐鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "瀹屽伐鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
+ } else if (obj.event == '鑱屽憳') {
+ var HName = data.鑱屽憳;
+ var HProcID = data.宸ュ簭id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
+ });
+
//#endregion
//#region 娴佽浆鍗＄偣鍑绘煡璇� 浜烘満鏂欐硶鐜�
- function getTable_Right(linterid,SNs) {
+ function getTable_Right(linterid,HProcID,SNs) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right',
type: "GET",
- data: { "linterid": linterid, "SNs": SNs, "user": sessionStorage["HUserName"] },
+ data: { "linterid": linterid, "HProcID": HProcID, "SNs": SNs, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var Listcol = [];
@@ -1552,10 +1647,24 @@
}, style: 'cursor: pointer;'
});
}
- else if (data[j].name == '宸ュ簭鍚嶇О') {//娣诲姞瓒呴摼鎺�
+ else if (data[j].name == '宸ヨ壓鍙傛暟') {//娣诲姞瓒呴摼鎺�
col.push({
- field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '宸ュ簭鍚嶇О', templet: function (d) {
- return '<span style="color: blue;">' + d.宸ュ簭鍚嶇О + '</span>'
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '宸ヨ壓鍙傛暟', templet: function (d) {
+ return '<span style="color: blue;">' + d.宸ヨ壓鍙傛暟 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '娴佽浆鍗�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '娴佽浆鍗�', templet: function (d) {
+ return '<span style="color: blue;">' + d.娴佽浆鍗� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '宸ュ簭') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '宸ュ簭', templet: function (d) {
+ return '<span style="color: blue;">' + d.宸ュ簭 + '</span>'
}, style: 'cursor: pointer;'
});
}
@@ -1644,13 +1753,25 @@
, page: false
}
table.render(option_Measure);
+ //淇�
+ option_Message = {
+ elem: '#mainTable_Message'
+ , toolbar: '#toolbarDemo2'
+ , cols: [Listcol[6]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query6
+ , height: 'full-80'
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , page: false
+ }
+ table.render(option_Message);
if (SNs =="") {
//宸︿晶琛ㄦ牸
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , cols: [Listcol[6]]
- , data: data1.data.h_p_QC_FiveMenOneRingList_Query6
+ , cols: [Listcol[7]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query7
, height: 'full-80'
, cellMinWidth: 90
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html"
index 404b18b..d87122b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html"
@@ -157,17 +157,20 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var HMater; //鐗╂枡
+ var HProc; //宸ュ簭
+ var HEquId; //璁惧
+ var HTeachName; //宸ヨ壓鍙傛暟
var HModName = "SB_TechnologyParameterList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["骞�", "鏈�", "宸ュ簭"];
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var HProcID = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HProcID = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇 宸ュ簭
+ HTeachName = decodeURI(params[params[3]]); //浠庡弬鏁颁腑鑾峰彇 宸ヨ壓鍙傛暟
var ins; //鐢ㄤ簬瀵煎嚭excel
- var HMater; //鐗╂枡
- var HProc; //宸ュ簭
- var HEquId; //璁惧
+
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -244,7 +247,10 @@
set_InitGrid1(); //鍒濆鍖栬〃鏍�
if (OperationType == 3) {
Get_SB_EquipICMOTechParamBill(linterid, HProcID);//鑾峰彇娴佽浆鍗�,宸ュ簭,璁惧,鐗╂枡,寮�濮嬬粨鏉熸椂闂�
- Get_TechParam();//鑾峰彇褰撳墠娴佽浆鍗�,鐗╂枡,宸ュ簭,璁惧 瀵瑰簲鐨勪骇鍝佸伐鑹哄弬鏁版竻鍗�
+ $("#HTechParamName").val(HTeachName);
+ $("#HEquipType").val("璁惧閲囬泦");
+ form.render('select');
+ Get_TechParam();//鑾峰彇褰撳墠娴佽浆鍗�,鐗╂枡,宸ュ簭,璁惧 瀵瑰簲鐨勪骇鍝佸伐鑹哄弬鏁版竻鍗�
get_FastQuery();
//鍔犺浇鎶樼嚎鍥�
set_Graphics();
@@ -793,11 +799,12 @@
HMater = $("#HMaterID").val();
HProc = $("#HProcID").val();
HEquId = $("#HEquipID").val();
+ HTeachName = $("#HTechParamName").val() == "" ? "":$("#HTechParamName").val();
$.ajax({
url: GetWEBURL() + "/QC_CustomerAppealReport/Get_TechParamList",
type: "GET",
async: false,
- data: { "HMaterID": HMater, "HProID": HProc, "HEquId": HEquId,"user": sessionStorage["HUserName"] },
+ data: { "HMaterID": HMater, "HProID": HProc, "HEquId": HEquId, "HTeachName": HTeachName,"user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
var data = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 9ca65e7..7afa6ca 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1043,7 +1043,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0","妫�楠屼华鍣ㄤ唬鐮�":"", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
@@ -1222,6 +1222,27 @@
});
}
+ var data = obj.data;
+ if (obj.event == '妫�楠屼华鍣ㄤ唬鐮�') {
+ var HNumber = data.妫�楠屼华鍣ㄤ唬鐮�;
+ var linterid= data.HInspectInstruMentID;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妫�楠屼华鍣�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_InspectInstruMent.html?OperationType=3&linterid=' + linterid + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
if (event.key == "F7") {
@@ -1288,7 +1309,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- 妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+ 妫�楠屼华鍣ㄤ唬鐮�: checkStatus.data[0].妫�楠屼华鍣ㄤ唬鐮�
+ ,妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
, HInspectInstruMentID: checkStatus.data[0].HItemID
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1592,7 +1614,7 @@
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣ㄤ唬鐮�": data[i].妫�楠屼华鍣ㄤ唬鐮�,"妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
"HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
@@ -1954,7 +1976,7 @@
//瀛愯〃 璧嬪��
rowdata.push(
{
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊� , "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
@@ -2293,7 +2315,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0","妫�楠屼华鍣ㄤ唬鐮�":"", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
@@ -2313,6 +2335,8 @@
, { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�'}
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , { field: '妫�楠屼华鍣ㄤ唬鐮�', title: '妫�楠屼华鍣ㄤ唬鐮�', totalRow: true ,templet: function (d) {
+ return '<span style="color: blue;" lay-event="妫�楠屼华鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';}, style: 'cursor: pointer;'}
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
@@ -2414,6 +2438,7 @@
table.render(option_Value);
}
+
//琛岄�夋嫨澶勭悊锛堢粨璁猴級
form.on('select(HResult)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 83863b1..847c3a2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -2362,14 +2362,19 @@
})
}
- //涓嬭浇鏂囦欢
+ //涓嬭浇鏂囦欢
function dowload(r) {
//寰楀埌褰撳墠鎵�鍦ㄨ
var rows = r.parentNode.parentNode.rowIndex;
//寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(5)").html();
- /*window.location.href = url;*/
- window.open(url)
+
+ var a = document.createElement('a');
+ a.href = url;
+ a.download = url.split('/').pop(); // 鏇挎崲涓哄疄闄呮枃浠跺悕
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
}
//杩斿洖娴佹按鍙�
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/MES_StationInBill_PDA.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/MES_StationInBill_PDA.html"
index 4faeb20..f25d264 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/MES_StationInBill_PDA.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/MES_StationInBill_PDA.html"
@@ -359,11 +359,34 @@
</div>
</div>
</div>
+ <!--闄勪欢淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;min-height:calc(50vh);">
+ <div class="layui-upload">
+ <button type="button" class="layui-btn" id="testList"><i class="layui-icon">顧�</i>閫夋嫨鏂囦欢</button>
+ <div class="layui-upload-list">
+ <table class="layui-table">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
<li>鍒跺崟淇℃伅</li>
<li>涓婃枡闃查敊</li>
+ <li>闄勪欢淇℃伅</li>
</ul>
</div>
</div>
@@ -793,7 +816,6 @@
// $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
// $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
//}
- //PicUpload();
layer.close(index);
}
, error: function () {
@@ -916,7 +938,7 @@
, uploadListIns = upload.render({
elem: '#testList'
- , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
+ , url: GetWEBURL() + "/Cj_StationInBill/UploadFile1"
, accept: 'file'
, multiple: true
, auto: false
@@ -976,7 +998,7 @@
if (HBillNo != null || HBillNo != undefined) {
var ProImgByList = $('#ProImgByList')
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
+ url: GetWEBURL() + '/Cj_StationInBill/Filelist',
type: "GET",
data: { "HBillNo": HBillNo },
success: function (data1) {
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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
index 252b3ee..a4bff63 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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
@@ -378,11 +378,34 @@
</tbody>
</table>
</div>
+ <!--闄勪欢淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;min-height:calc(50vh);">
+ <div class="layui-upload">
+ <button type="button" class="layui-btn" id="testList"><i class="layui-icon">顧�</i>閫夋嫨鏂囦欢</button>
+ <div class="layui-upload-list">
+ <table class="layui-table">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
<li>鍒跺崟淇℃伅</li>
+ <li>闄勪欢淇℃伅</li>
</ul>
</div>
</div>
@@ -542,6 +565,7 @@
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ PicUpload();
}
});
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
@@ -619,7 +643,7 @@
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
}
- PicUpload();
+ //PicUpload();
layer.close(index);
} else {
layer.close(index);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 65c2fee..7c46455 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -762,7 +762,7 @@
, uploadListIns = upload.render({
elem: '#testList'
- , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
+ , url: GetWEBURL() + "/Cj_StationInBill/UploadFile1"
, accept: 'file'
, multiple: true
, auto: false
@@ -822,7 +822,7 @@
if (HBillNo != null || HBillNo != undefined) {
var ProImgByList = $('#ProImgByList')
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
+ url: GetWEBURL() + '/Cj_StationInBill/Filelist',
type: "GET",
data: { "HBillNo": HBillNo },
success: function (data1) {
@@ -1500,7 +1500,7 @@
//鍒犻櫎宸蹭笂浼犳枃浠�
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/DeleteFilelist',
+ url: GetWEBURL() + '/Cj_StationInBill/DeleteFilelist',
type: "GET",
data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
success: function (data1) {
@@ -1524,10 +1524,16 @@
var rows = r.parentNode.parentNode.rowIndex;
//寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(5)").html();
- /*window.location.href = url;*/
- window.open(url)
+
+ var a = document.createElement('a');
+ a.href = url;
+ a.download = url.split('/').pop(); // 鏇挎崲涓哄疄闄呮枃浠跺悕
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
}
+
//杩斿洖鐢熶骇鐝粍
function GetProductionTeamValue(obj) {
$("#HGroupName").val(obj[0].鐝粍);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index a1c5fee..0216901 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -76,14 +76,28 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="width:900px;">
+ <div class="layui-inline" style="width:670px;">
<label class="layui-form-label">涓氬姟鍗曚綅<label style="color:red"> * </label></label>
- <div class="layui-input-inline" style="width:750px;">
+ <div class="layui-input-inline" style="width:525px;">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float: left; width: 475px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+
</div>
</div>
</div>
@@ -1071,6 +1085,9 @@
, "HAccSupID": dataArray[0].HSupID
, "HAccSupName": dataArray[0].渚涘簲鍟�
, "HSumMoney": dataArray[0].閲戦
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃 璧嬪��
@@ -1203,6 +1220,9 @@
, "HAccSupID": dataArray[0].HSupID
, "HAccSupName": dataArray[0].渚涘簲鍟�
, "HSumMoney": dataArray[0].閲戦
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃 璧嬪��
@@ -1519,6 +1539,9 @@
, "HAccDate": formatDate(data.璐㈠姟鏃ユ湡)
, "HCreditRating_Now": data.HCreditRating_Now
, "HInvoiceBillNo": data.鍙戠エ缂栧彿 ? "" : data.鍙戠エ缂栧彿
+ , "HProjectID": data.HProjectID
+ , "HProjectName": data.椤圭洰鍚嶇О
+ , "HProjectNumber": data.椤圭洰浠ｇ爜
, "HBigMoney": data.澶у啓閲戦
, "HReason": data.浠樻浜嬬敱
, "HMaker": data.鍒跺崟浜�
@@ -1647,6 +1670,9 @@
, "HAccSupID": dataArray[0].HSupID
, "HAccSupName": dataArray[0].渚涘簲鍟�
, "HSumMoney": dataArray[0].閲戦
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃 璧嬪��
var rowdata = [];
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
index f073f0a..d2712dd 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
@@ -16,7 +16,7 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -35,6 +35,12 @@
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input ForFilteringSchemes" 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 ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -201,8 +207,6 @@
var sWhere = "";
var HModName = "YF_PayMentBillList";
var HBillType = "2103";
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2103";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -337,6 +341,32 @@
})
//#endregion
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
+ //#endregion
+
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
+
+
//#region 鍙屽嚮杩涘叆缂栬緫
table.on('rowDouble(mainTable)', function (obj) {
//閫変腑楂樹寒 鍙屽嚮琛�
@@ -369,21 +399,17 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
//#endregion
@@ -428,6 +454,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(1);
//Organ();
@@ -464,8 +492,6 @@
//棣栨涓嶆墽琛�
if (!first) {
//do something
- page = obj.curr;
- size = obj.limit;
get_FastQuery();
}
}
@@ -594,9 +620,9 @@
url: GetWEBURL() + '/YF_PayMentBill/page',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -668,6 +694,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
//浠绘剰瀛楁杩囨护
@@ -751,6 +778,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -763,6 +793,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
+ $("#HProjectNumber").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0"); $("#ColContent1").val("");
@@ -1196,8 +1227,11 @@
var titleData = ["hmainid", "HAccSupID", "HBankID", "hssid", "hcurid", "HDeptID", "HManagerID", "hempid", "hsubid", "HMaterID", "hunitid", "hsupid","HBillType","HOrgID","鐗╂枡浠ｇ爜","璁￠噺鍗曚綅浠ｇ爜","涓氬姟鍛樹唬鐮�","涓氬姟鍗曚綅浠ｇ爜","缁撶畻鍗曚綅浠ｇ爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
-
+
for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol.length <= i) {
+ break;
+ }
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
@@ -1253,6 +1287,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
index a755952..0307dac 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
@@ -1464,6 +1464,22 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index f7c12bb..4bf2fba 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -1642,8 +1642,8 @@
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID"}//f7
, { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text'}
- , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
- , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, event: "HPrice", style: 'background-color:#efefef4d;' }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, edit: 'text' }
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
, { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
@@ -1760,52 +1760,12 @@
table.render(optionEntry);
}
function set_InitGridHaveSource() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , limit: 500
- , height: 500
- , loading: false
- , cols: [[ //瀛愯〃
- { type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100 }
- , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
- , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
- , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
- , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
- , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
- , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
- , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
- , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
- , { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-
- , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
-
- , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-
- , { field: 'HSeOrderTaxPrice', title: '璁㈠崟鍚◣鍗曚环', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
- ]]
+ //閫変腑婧愬崟鍚庢暟閲忎笉鍙紪杈�
+ for (var i = 0; i < option.cols[0].length; i++) {
+ if (option.cols[0][i]["field"] == "HQty") {
+ option.cols[0][i]["edit"] = false;
+ }
+
}
}
//#endregion
@@ -1871,7 +1831,7 @@
, HlineTotalBB: HlineTotalBB
, HMoneyBB: HMoneyBB
});
- table.render(option);
+ //table.render(option);
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -1921,7 +1881,7 @@
, HlineTotalBB: HlineTotalBB
, HMoneyBB: HMoneyBB
});
- table.render(option);
+ //table.render(option);
break;
case "HTaxRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -1975,7 +1935,7 @@
, HlineTotalBB: HlineTotalBB
, HMoneyBB: HMoneyBB
});
- table.render(option);
+ //table.render(option);
break;
case "HDiscountRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -2019,7 +1979,7 @@
, HDiscountRate: HDiscountRate
, HRelTaxPrice: HRelTaxPrice
});
- table.render(option);
+ //table.render(option);
break;
case "HTaxPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -2070,7 +2030,57 @@
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
, HMoneyBB: HMoneyBB
});
- table.render(option);
+ //table.render(option);
+ break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0 ||obj.data.HQty == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ table.render(option);
+ layer.msg("閲戦鎴栨暟閲忚杈撳叆澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1; //閲戦=鏁伴噺*鍗曚环
+ var HPrice = HMoney / HQty;
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+ HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ , HTaxMoney: HTaxMoney
+ , HlineTotal: HlineTotal
+ , HTaxPrice, HTaxPrice
+ , HRelTaxPrice: HRelTaxPrice
+ , HlineTotalBB: HlineTotalBB
+ , HMoneyBB: HMoneyBB
+ });
+ //table.render(option);
break;
default:
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index 1248439..8247ac4 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -21,6 +21,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -39,6 +40,12 @@
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input ForFilteringSchemes" 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 ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -206,8 +213,6 @@
var option = [];
var sWhere = "";
var HModName = "Cg_PayableBillList";
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1114";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -336,6 +341,30 @@
})
//#endregion
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
+ //#endregion
+
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#region 鍙屽嚮杩涘叆缂栬緫
table.on('rowDouble(mainTable)', function (obj) {
//閫変腑楂樹寒 鍙屽嚮琛�
@@ -367,21 +396,16 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(2);
- }
+ optionPage.curr = 1;
+ get_FastQuery(2);
});
//#endregion
@@ -427,6 +451,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(1);
//Organ();
@@ -463,8 +489,6 @@
//棣栨涓嶆墽琛�
if (!first) {
//do something
- page = obj.curr;
- size = obj.limit;
get_FastQuery();
}
}
@@ -574,9 +598,9 @@
url: GetWEBURL() + '/Cg_PayableBill/page',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -647,6 +671,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
//浠绘剰瀛楁杩囨护
@@ -733,6 +758,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
sWhere += addSWhereByOpenType();
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
@@ -747,6 +775,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
+ $("#HProjectNumber").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -1189,8 +1218,10 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var titleData = ["hmainid", "HSSID", "HSupID", "HPSStyleID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "鐗╂枡浠ｇ爜", "HSourceInterID", "HSourceEntryID", "HSourceBillNo", "HSourceBillType", "HRelationQty", "HRelationMoney", "HPOOrderInterID", "HPOOrderEntryID", "HPOOrderBillNo", "HSeOrderTaxPrice", "HSeOrderInterID", "HSeOrderEntryID", "HSeOrderBillNo"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
-
for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol.length <= i) {
+ break;
+ }
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
@@ -1246,6 +1277,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
index b1f41a9..e1b9a33 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
@@ -1448,6 +1448,22 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
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 4cdee25..01e7b9a 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"
@@ -644,7 +644,7 @@
, HMoney: HMoney
, HTaxMoney: HTaxMoney
});
- table.render(option)
+ //table.render(option)
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -681,7 +681,7 @@
, HTaxMoney: HTaxMoney
, HTaxPrice, HTaxPrice
});
- table.render(option)
+ //table.render(option)
break;
case "HTaxRate": //绋庣巼
//鏁版嵁鏍煎紡鏍￠獙
@@ -721,7 +721,7 @@
, HTaxMoney: HTaxMoney
, HTaxPrice: HTaxPrice
});
- table.render(option)
+ //table.render(option)
break;
case "HDiscountRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -762,7 +762,7 @@
, HTaxPrice: HTaxPrice
, HDiscountRate: HDiscountRate
});
- table.render(option);
+ //table.render(option);
break;
case "HTaxPrice": //鍚◣鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -800,7 +800,7 @@
, HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
, HTaxPrice: Number(HTaxPrice.toFixed(HPriceDec)) //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
});
- table.render(option)
+ //table.render(option)
break;
case "HMoney": //閲戦
//鏁版嵁鏍煎紡鏍￠獙
@@ -840,7 +840,7 @@
, HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
, HTaxPrice: Number(HTaxPrice.toFixed(HPriceDec)) //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
});
- table.render(option)
+ //table.render(option)
break;
default:
}
@@ -2514,7 +2514,7 @@
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
- if (rowIndex === '0') {
+ if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
obj.del();//婧愮爜鍒犻櫎琛屾槸璧嬪��={}
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 193684b..50cd70a 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"
@@ -19,6 +19,7 @@
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -61,6 +62,12 @@
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -259,8 +266,6 @@
var sWhere = "";
var option = [];
var HModName = "Cg_POInStockBillList";
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1103";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -294,21 +299,17 @@
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option, 2);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option, 2);
+
});
//#endregion
@@ -330,6 +331,33 @@
$('#HDate1').prop('disabled', false);
}
});
+
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
+ //#endregion
+
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1103";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
@@ -382,6 +410,8 @@
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery(1)
@@ -495,8 +525,6 @@
//棣栨涓嶆墽琛�
if (!first) {
//do something
- page = obj.curr;
- size = obj.limit;
get_FastQuery();
}
}
@@ -588,9 +616,9 @@
$.ajax({
url: GetWEBURL() + '/Cg_POInStockBill/page',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -1256,6 +1284,7 @@
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HSupID = $("#HSupID").val();
var HDeptID = $("#HDeptID").val();
var HMangerID = $("#HMangerID").val();
@@ -1348,6 +1377,10 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
if (HSupID) {
sWhere += " and 渚涘簲鍟� like '%" + HSupID + "%'";
}
@@ -1370,6 +1403,7 @@
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");//
+ $("#HProjectNumber").val("");
$("#HSupID").val("");
$("#HDeptID").val("");
$("#HMangerID").val("");
@@ -1696,6 +1730,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
}
}
table.render(option);
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_POInStockBillQuery.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_POInStockBillQuery.html"
index 116578f..41a8d96 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_POInStockBillQuery.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_POInStockBillQuery.html"
@@ -1519,6 +1519,22 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index ee0ead5..965bfb5 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -697,7 +697,7 @@
, HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotal
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
});
- table.render(option)
+ //table.render(option)
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -745,7 +745,7 @@
, HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
});
- table.render(option)
+ //table.render(option)
break;
case "HTaxRate": //绋庣巼
//鏁版嵁鏍煎紡鏍￠獙
@@ -795,7 +795,7 @@
, HRelTaxPrice: HRelTaxPrice
, HlineTotalBB: HlineTotalBB
});
- table.render(option)
+ //table.render(option)
break;
case "HDiscountRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -886,7 +886,7 @@
, HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
});
- table.render(option)
+ //table.render(option)
break;
default:
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index eafa438..99215e7 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -20,6 +20,7 @@
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/modules//tableFilter2.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -80,6 +81,14 @@
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ </div>
+ </div>
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -110,18 +119,18 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">涓氬姟鍛�</label>
- <div class="layui-input-block" style="width:190px;">
- <select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
- <option value="">鍏ㄩ儴</option>
- <option value="鏉庣編闇�">鏉庣編闇�</option>
- <option value="寰愬阀涔�">寰愬阀涔�</option>
- <option value="鏃舵枃浠�">鏃舵枃浠�</option>
- <option value="姹熸闃�">姹熸闃�</option>
- <option value="鏄撴柊绾�">鏄撴柊绾�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label">涓氬姟鍛�</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
+ <option value="">鍏ㄩ儴</option>
+ <option value="鏉庣編闇�">鏉庣編闇�</option>
+ <option value="寰愬阀涔�">寰愬阀涔�</option>
+ <option value="鏃舵枃浠�">鏃舵枃浠�</option>
+ <option value="姹熸闃�">姹熸闃�</option>
+ <option value="鏄撴柊绾�">鏄撴柊绾�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗忓悓鐘舵��</label>
<div class="layui-input-block">
@@ -133,11 +142,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵��</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
- </div>
- </div>-->
+ <label class="layui-form-label">鍙嶉鐘舵��</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
@@ -327,7 +336,6 @@
var currRowIndex = 0; //鐢ㄤ簬瀹氫綅瀛愮獥鍙ｅ綋鍓嶉�変腑鐨勮
var childData = null; //鐢ㄤ簬鑾峰彇瀛愮獥鍙ｈ繑鍥炵殑鏁版嵁
//#endregion
-
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -350,9 +358,7 @@
var option = [];
var Name = "MouldProdInHouseCellWidth";
var HModName = "Cg_POOrderBillList";
- var HBillType = "1102";
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
+ var HBillType = "1102";
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1102";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -508,11 +514,9 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
table.on('tool(mainTable)' , function (obj) {
@@ -586,11 +590,9 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option, 2);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option, 2);
+
});
//琛ㄥご淇℃伅閮ㄩ棬寮圭獥
@@ -647,6 +649,33 @@
} else {
$('#HBeginDate').prop('disabled', false);
$('#HEndDate').prop('disabled', false);
+ }
+ });
+
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var set_HideButton_ID = "toolbarDemo_ButtonSet"; //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+ var HBillType = "1102";
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
+
+ //#region
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
}
});
//#endregion
@@ -851,8 +880,10 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"],optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery(table, option,1)
+ get_FastQuery(table, option, 1)
//鍔犺浇涓氬姟鍛�
//get_HEmpName();
//闅愯棌鍕鹃�夊瓧娈�
@@ -1006,8 +1037,6 @@
//棣栨涓嶆墽琛�
if (!first) {
//do something
- page = obj.curr;
- size = obj.limit;
get_FastQuery();
}
}
@@ -1123,9 +1152,9 @@
$.ajax({
url: GetWEBURL() + '/Cg_POOrderBill/page',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -2279,6 +2308,7 @@
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HEmpName = $("#HEmpName").val();
var HMaterNumber = $("#HMaterNumber").val();
var HMaterShortNumber = $("#HMaterShortNumber").val();
@@ -2393,6 +2423,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
if (HMaterShortNumber) {
sWhere += " and 鐗╂枡缂栫爜 like '%" + HMaterShortNumber + "%'";
}
@@ -2441,6 +2474,7 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$('#HStatus').find("option[value='-1']").attr("selected", true);
$("#HBillNo").val("");
+ $("#HProjectNumber").val("");
$("#HEmpName").val("");
$("#HMaterNumber").val("");
$("#HOldMaterNumber").val("");
@@ -2633,6 +2667,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
}
}
table.render(option);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
index 76e1570..63d5caa 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
@@ -1513,6 +1513,22 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index 8414f39..7a51e3d 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -734,7 +734,7 @@
, HPrice: HPrice
, HMoney: HMoney
});
- table.render(option);
+ //table.render(option);
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -764,7 +764,7 @@
, HPrice: HPrice
, HMoney: HMoney
});
- table.render(option);
+ //table.render(option);
break;
default:
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 958bc8c..003cb32 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -19,6 +19,7 @@
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -69,6 +70,13 @@
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -257,8 +265,6 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
var HModName = "Xs_SeOutStockBill";
var HBillType = "1402";
@@ -298,21 +304,27 @@
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
+ });
+ //#endregion
+
+
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
}
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
});
//#endregion
@@ -357,6 +369,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(table, option);
DisPlay_HideColumn();
@@ -467,8 +481,6 @@
if (!first) {
//do something
console.log(obj)
- page = obj.curr;
- size = obj.limit;
get_FastQuery(table, option);
}
}
@@ -596,9 +608,9 @@
url: GetWEBURL() + '/Xs_SeOutStockBill/list_byPage',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -858,6 +870,7 @@
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HCusID = $("#HCusID").val();
var HDeptID = $("#HDeptID").val();
var HMangerID = $("#HMangerID").val();
@@ -946,6 +959,10 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰缂栫爜 like '%" + HProjectNumber + "%'";
+ }
+
if (HCusID) {
sWhere += " and 瀹㈡埛 like '%" + HCusID + "%'";
}
@@ -967,6 +984,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");//
+ $("#HProjectNumber").val("");
$("#HCusID").val("");
$("#HDeptID").val("");
$("#HMangerID").val("");
@@ -1056,6 +1074,22 @@
}
});
})
+ //#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
//#endregion
@@ -1443,7 +1477,7 @@
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
+ for (var i = 1; i < option.cols[0].length ; i++) {
colName += option.cols[0][i]["field"] + ",";
}
@@ -1483,7 +1517,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length -1; i++) {
if (dataCol.length <= i) {
break;
}
@@ -1543,6 +1577,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html"
index ff47c60..9200f68 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html"
@@ -1521,6 +1521,22 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index dc20378..a06f20a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -66,7 +66,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁缂栧彿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" >
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" value="0">
</div>
</div>
@@ -83,9 +83,9 @@
<!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
</select>
<!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
- <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
- <option style="color:blue;" value="1205">閿�鍞嚭搴撳崟</option>
- </select>-->
+ <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
+ <option style="color:blue;" value="1205">閿�鍞嚭搴撳崟</option>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -102,7 +102,6 @@
</div>
</div>
<div class="layui-row">
-
<div class="layui-inline">
<label class="layui-form-label">閿�鍞儴闂�</label>
<div class="layui-input-inline">
@@ -129,18 +128,27 @@
<input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曚环绫诲瀷</label>
<div class="layui-input-inline">
<select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
- <option value="鍘荤◣浠�" selected="selected">鍘荤◣浠�</option>
- <option value="缁撶畻浠�">缁撶畻浠�</option>
+ <option value="鍘荤◣浠�">鍘荤◣浠�</option>
+ <option value="缁撶畻浠�" selected="selected">缁撶畻浠�</option>
<option value="鍚◣浠�">鍚◣浠�</option>
</select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProjectName" id="HProjectName" class="layui-input" lay-filter="HProjectName" value="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float:left;width:150px;">
</div>
</div>
</div>
@@ -152,7 +160,7 @@
</div>
</div>
</div>
-
+
<!--闅愯棌瀛楁-->
<div class="layui-row" style="display:none;">
@@ -178,7 +186,7 @@
</div>
</div>
- <!--鍩烘湰淇℃伅-->
+ <!--鍏跺畠淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item" style="padding-top: 10px;">
@@ -647,113 +655,61 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
+ , "HProjectName": (dataArray[0].椤圭洰鍚嶇О)
});
-
- if ($("#HPriceType").val() == "鍘荤◣浠�") {
- //瀛愯〃鎴愭湰浠稥ntry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- var HPrice = dataArray[i].HNoTaxCost; //鎴愭湰浠�
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HExRate = $("#HExRate").val(); //姹囩巼
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- var HMoneyBB = HMoney * HExRate;
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
- , "HMoney": dealDoubleToFixed(HMoney, 2)
- , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
- , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
- } else {
//瀛愯〃Entry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- var HPrice = dataArray[i].鍗曚环; //鍗曚环
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HExRate = $("#HExRate").val(); //姹囩巼
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- var HMoneyBB = HMoney * HExRate;
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
- , "HMoney": dealDoubleToFixed(HMoney, 2)
- , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
- , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
- , "HRemark": ""
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
}
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -792,106 +748,60 @@
, "HEmpName": dataArray[0].涓氬姟鍛�
, "HCusID": dataArray[0].HSupID
, "HCusName": dataArray[0].瀹㈡埛
- , "HCurID": dataArray[0].涓昏〃甯佸埆id
- , "HCurName": dataArray[0].涓昏〃甯佸埆
- , "HExRate": dataArray[0].涓昏〃姹囩巼
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
, "HSSID": "0"
, "HSSName": ""
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
});
- if ($("#HPriceType").val() == "鍘荤◣浠�") {
- //瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].宸插叧鑱旀暟閲�; //鏁伴噺
-
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].hmaterid
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].绋庣巼, 2) //
- , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
+ //瀛愯〃 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].hmaterid
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].hunitid
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
+ , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
}
- else {
- //瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].hmaterid
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
- , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
- }
-
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -917,6 +827,7 @@
}
table.render(option);
+ changeHPrice();
layer.close(ajaxLoad);
layer.msg("鏌ヨ鎴愬姛", { time: 1 * 1000, icon: 1 });
} else {
@@ -1096,7 +1007,7 @@
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
, HMoneyBB: HMoneyBB
});
- table.render(option);
+ //table.render(option);
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -1150,7 +1061,7 @@
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
, HMoneyBB: HMoneyBB
});
- table.render(option);
+ //table.render(option);
break;
case "HTaxRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -1204,7 +1115,7 @@
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
, HMoneyBB: HMoneyBB
});
- table.render(option);
+ //table.render(option);
break;
case "HDiscountRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -1299,7 +1210,61 @@
, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
, HMoneyBB: HMoneyBB
});
- table.render(option)
+ //table.render(option)
+ break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0 || obj.data.HQty == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ table.render(option);
+
+ layer.msg("鏁伴噺鎴栭噾棰濊杈撳叆澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1; //閲戦=鏁伴噺*鍗曚环
+ var HPrice = HMoney / HQty; //鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+ HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ , HMoneyBB: HMoneyBB
+ });
+ //table.render(option);
break;
default:
}
@@ -1310,7 +1275,10 @@
// 鐩戝惉涓嬫媺妗嗛�夋嫨
form.on('select(HPriceType)', function (data) {
console.log(data.value); // 寰楀埌琚�変腑鐨勫��
- // 鎵ц鐩稿叧鎿嶄綔
+ changeHPrice();
+ });
+ //鏍规嵁涓嬫媺妗嗙殑鍊艰缃墿鏂欏崟浠风瓑淇℃伅
+ function changeHPrice() {
//#region 瀛愯〃 鏁版嵁妫�楠�
for (var i = 0; i < option.data.length; i++) {
if (option.data[i]["HMaterID"] == "0") {
@@ -1319,7 +1287,7 @@
} else {
var HPrice = option.data[i]["HPrice"];
var HMaterID = option.data[i]["HMaterID"];
- var HType = data.value.toString();
+ var HType = $("#HPriceType").val();
//鑾峰彇鐗╂枡瀵瑰簲鍗曚环绫诲瀷鐨勫崟浠�
$.ajax({
url: GetWEBURL() + "/Xs_ReceivableBill/getPriceByType",
@@ -1360,14 +1328,14 @@
option.data[i]["HRelTaxPrice"] = Number(HRelTaxPrice.toFixed(HPriceDec));
option.data[i]["HlineTotalBB"] = Number(HlineTotalBB.toFixed(HMoneyDec));
}
-
+
}
table.render(option);
//#endregion
- });
+ }
//#endregion
-
+
//#endregion
//#endregion
@@ -1702,7 +1670,7 @@
{
setInitBySellOutBill(checkStatus);
}
-
+ changeHPrice();
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1764,6 +1732,7 @@
}
}
getSeletMainInfo(sMainWhere);
+ changeHPrice();
layer.close(index);//鍏抽棴寮圭獥
}
});
@@ -1803,113 +1772,62 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
});
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
- if ($("#HPriceType").val() == "鍘荤◣浠�") {
- //瀛愯〃鎴愭湰浠稥ntry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- var HPrice = dataArray[i].HNoTaxCost; //鎴愭湰浠�
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HExRate = $("#HExRate").val(); //姹囩巼
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- var HMoneyBB = HMoney * HExRate;
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
- , "HMoney": dealDoubleToFixed(HMoney, 2)
- , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
- , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
- , "HRemark": ""
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
- } else {
- //瀛愯〃Entry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- var HPrice = dataArray[i].鍗曚环; //鍗曚环
- var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
- var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
- var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
- var HExRate = $("#HExRate").val(); //姹囩巼
- var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
- var HMoneyBB = HMoney * HExRate;
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
- , "HMoney": dealDoubleToFixed(HMoney, 2)
- , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
- , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
}
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -1946,11 +1864,11 @@
return;
}
});
-
} else if ($("#BillType").val() == "1205") {
$.ajax({
url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList',
type: "GET",
+ async: false,
data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -1976,98 +1894,53 @@
, "HSSName": ""
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
});
- if ($("#HPriceType").val() == "鍘荤◣浠�") {
//瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 * 1 - dataArray[i].宸插叧鑱旀暟閲� * 1; //鏁伴噺
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].绋庣巼, 2) //
- , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺*1 - dataArray[i].宸插叧鑱旀暟閲�; //鏁伴噺
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].hunitid
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
+ , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
}
- else {
- //瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(HQty, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
- , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
- }
-
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -2090,7 +1963,7 @@
set_InitGridHaveSource();
option.data = rowdataEntry;
haveSource = true;
- table.render(option);
+ table.render(option)
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -2130,13 +2003,13 @@
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID"}//f7
, { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text', event: "HQty" }
- , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, event: "HPrice", style: 'background-color:#efefef4d;' }
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
, { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
, { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, edit: 'text' }
, { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
@@ -2247,52 +2120,11 @@
table.render(optionEntry);
}
function set_InitGridHaveSource() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , limit: 500
- , height: 500
- , loading: false
- , cols: [[ //瀛愯〃
- { type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100 }
- , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
- , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
- , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
- , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
- , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
- , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
- , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
- , { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-
- , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
-
- , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-
- , { field: 'HSeOrderTaxPrice', title: '璁㈠崟鍚◣鍗曚环', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
- ]]
+ //閫変腑婧愬崟鍚庢暟閲忎笉鍙紪杈�
+ for (var i = 0; i < option.cols[0].length; i++) {
+ if (option.cols[0][i]["field"] == "HQty") {
+ option.cols[0][i]["edit"] = false;
+ }
}
}
//#endregion
@@ -2340,6 +2172,8 @@
, "HRemark": data.琛ㄥご澶囨敞
, "HExplanation": data.鎽樿
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HProjectID": (data.HProjectID == null ? 0 : data.HProjectID)
+ , "HProjectName": data.椤圭洰鍚嶇О
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
@@ -3442,96 +3276,54 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
});
- if ($("#HPriceType").val() == "鎴愭湰浠�") {
- //瀛愯〃鎴愭湰浠稥ntry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': "0" //
+ , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , 'HMoneyBB': dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': "0" //
- , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
- , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
- } else {
- //瀛愯〃Entry 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].HMaterID
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].HUnitID
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': "0" //
- , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
- , 'HMoneyBB': dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].浠风◣鍚堣, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].浠风◣鍚堣 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , "HSeOrderInterID": dataArray[i].hmainid
- , "HSeOrderEntryID": dataArray[i].hsubid
- , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
- }
- );
- }
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
}
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
@@ -3590,7 +3382,6 @@
return;
}
}
-
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HMainSourceInterID": "0"
, "HMainSourceEntryID": "0"
@@ -3612,96 +3403,55 @@
, "HSSName": ""
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
+
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectID": dataArray[0].HProjectID == null ? "0" : dataArray[0].HProjectID
});
- if ($("#HPriceType").val() == "鍘荤◣浠�") {
- //瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].hmaterid
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': "0" //
- , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
- }
- else {
- //瀛愯〃 璧嬪��
- var rowdataEntry = [];
- for (var i = 0; i < dataArray.length; i++) {
- rowdataEntry.push(
- {
- "HMaterID": dataArray[i].hmaterid
- , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
- , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
- , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
- , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "1" //
- , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HTaxRate": dataArray[i].绋庣巼
- , 'HTaxMoney': "0" //
- , "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
- , 'HMoneyBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
- , 'HlineTotal': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环, 2)
- , 'HlineTotalBB': dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
- , "HRemark": ""
-
- , "HSourceInterID": dataArray[i].hmainid
- , "HSourceEntryID": dataArray[i].hsubid
- , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": dataArray[i].HBillType
- , "HRelationQty": "0"
- , "HRelationMoney": "0"
-
- , 'HPOOrderInterID': "0"
- , 'HPOOrderEntryID': "0"
- , 'HPOOrderBillNo': ""
-
- , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
- , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
- , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
- }
- );
- }
- }
+ //瀛愯〃 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 * 1 - dataArray[i].鍏宠仈鏁伴噺;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].hmaterid
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].hunitid
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': "0" //
+ , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
+ }
+
optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
index b5001aa..ab5dc15 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
@@ -21,6 +21,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -39,6 +40,12 @@
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input ForFilteringSchemes" 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 ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -207,9 +214,7 @@
var Organization = sessionStorage["Organization"];
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
-
+ var optionPage = [];
var sWhere = "";
var HModName = "Xs_ReceivableBillList";
@@ -344,6 +349,31 @@
})
//#endregion
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
+ //#endregion
+
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
+
//#region 鍙屽嚮杩涘叆缂栬緫
table.on('rowDouble(mainTable)', function (obj) {
//閫変腑楂樹寒 鍙屽嚮琛�
@@ -376,22 +406,17 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
-
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(2);
- }
+ optionPage.curr = 1;
+ get_FastQuery(2);
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(2);
- }
+ optionPage.curr = 1;
+ get_FastQuery(2);
+
});
//#endregion
@@ -437,6 +462,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(1);
//Organ();
@@ -619,9 +646,9 @@
url: GetWEBURL() + '/Xs_ReceivableBill/list_byPage',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var totalArray = ["", ""];
@@ -697,6 +724,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
//浠绘剰瀛楁杩囨护
@@ -782,7 +810,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
-
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
sWhere += addSWhereByOpenType();
@@ -799,6 +829,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
+ $("#HProjectNumber").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -1284,6 +1315,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html"
index 6f50f2d..f2f54a3 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html"
@@ -1446,6 +1446,21 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index a1a9bc2..970d1c6 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -910,7 +910,7 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
@@ -993,7 +993,7 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
@@ -1047,7 +1047,7 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
@@ -1131,7 +1131,7 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 5ecd884..d5f35ff 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -18,7 +18,7 @@
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -61,6 +61,13 @@
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -262,8 +269,6 @@
var Organization = sessionStorage["Organization"];
var sWhere = "";
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
var HModName = "Xs_SeOrderBillList";
var HBillType = "1401";
@@ -310,10 +315,16 @@
form.on('submit(btnSearch)', function (data) {
//鏍囪褰撳墠鏁版嵁涓� 鏌ヨ鏁版嵁
get_needClose_Bar = 0;
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
+ });
+ //#endregion
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
}
});
//#endregion
@@ -323,11 +334,9 @@
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
});
//#endregion
@@ -467,45 +476,20 @@
});
//#endregion
- //#region 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(mainTable)', function (obj) {
- //// 鑾峰彇鎺掑簭瀛楁鍜岀被鍨�
- //var field = obj.field;
- //var type = obj.type;
- ////璁板綍杩囨护鏉′欢
- //var temp = sWhere_Bak;
-
- ////涓鸿繃婊ゆ潯浠跺鍔犳帓搴�
- //sWhere_Bak += " order by " + field + " " + (type == "null" ? "" : type) + " ";
-
- ////鑾峰彇鎺掑簭鍚庣殑鏁版嵁骞堕噸鏂版覆鏌�
- //var ajaxLoad = layer.load();
- //$.ajax({
- // url: GetWEBURL() + '/Xs_SeOrderBill/sortList',
- // async: false,
- // type: "GET",
- // data: { "sWhere": sWhere_Bak, "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() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
- // ColFilter();
- // }
- // } else {
- // layer.close(ajaxLoad);
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(ajaxLoad);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- //});
-
- //sWhere_Bak = temp;
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
});
//#endregion
@@ -615,7 +599,8 @@
//鏌ヨ
//get_FastQuery();
//get_Display(" and 1=0 ");
-
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
get_DisplayPage(" and 1=0 ");
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -756,8 +741,6 @@
if (!first) {
//do something
console.log(obj)
- page = obj.curr;
- size = obj.limit;
if (get_needClose_Bar == 0) {
get_FastQuery();
@@ -960,9 +943,9 @@
$.ajax({
url: GetWEBURL() + '/Xs_SeOrderBill/list_ByPage',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -1051,6 +1034,7 @@
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HCusID = $("#HCusID").val();
var HMaterNumber = $("#HMaterNumber").val();
var HMaterName = $("#HMaterName").val();
@@ -1142,6 +1126,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like ''%" + HBillNo + "%''";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰缂栫爜 like ''%" + HProjectNumber + "%''";
+ }
if (HCusID) {
sWhere += " and 瀹㈡埛 like ''%" + HCusID + "%''";
}
@@ -1179,6 +1166,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");//
+ $("#HProjectNumber").val("");
$("#HCusID").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
@@ -1738,7 +1726,7 @@
if (get_needClose_Bar == 0) {
//璁剧疆椤垫暟涓�1
- page = 1;
+ optionPage.curr = 1;
}
//鏍囪褰撳墠鏁版嵁涓� 寰呭叧闂」
@@ -1753,9 +1741,9 @@
url: GetWEBURL() + '/Xs_SeOrderBill/sortList__ByPage',
async: false,
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.count != 0) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -2355,6 +2343,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html"
index 9ed6c49..eb53047 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html"
@@ -1517,6 +1517,22 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 2ed1c33..2324cd1 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -1337,7 +1337,7 @@
, HMoney: HMoney
, HTaxMoney: HTaxMoney
});
- table.render(option);
+ ///table.render(option);
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -1381,7 +1381,7 @@
, HMoney: HMoney
, HTaxMoney: HTaxMoney
});
- table.render(option);
+ //table.render(option);
break;
case "HTaxRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -1425,7 +1425,7 @@
, HMoney: HMoney
, HTaxMoney: HTaxMoney
});
- table.render(option);
+ //table.render(option);
break;
case "HTaxPrice": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -1467,7 +1467,7 @@
, HTaxMoney: HTaxMoney
});
- table.render(option)
+ //table.render(option)
break;
default:
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index 74feb37..550bb0e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -17,7 +17,7 @@
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -60,6 +60,12 @@
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -243,8 +249,6 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
var HModName = "Kf_SellOutBillList";
var HBillType = "1205";
@@ -283,22 +287,24 @@
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
-
-
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
+ });
+ //#endregion
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
}
});
//#endregion
@@ -432,6 +438,23 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
+
//#region 鍙屽嚮杩涘叆缂栬緫
table.on('rowDouble(mainTable)', function (obj) {
//閫変腑楂樹寒 鍙屽嚮琛�
@@ -509,6 +532,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(table, option);
DisPlay_HideColumn();
@@ -600,8 +625,6 @@
if (!first) {
//do something
console.log(obj)
- page = obj.curr;
- size = obj.limit;
get_FastQuery(table, option);
}
}
@@ -768,9 +791,9 @@
url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList_byPage',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -875,6 +898,7 @@
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HCusID = $("#HCusID").val();
var HMaterNumber = $("#HMaterNumber").val();
var HMaterName = $("#HMaterName").val();
@@ -960,6 +984,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰缂栫爜 like '%" + HProjectNumber + "%'";
+ }
if (HCusID) {
sWhere += " and 瀹㈡埛 like '%" + HCusID + "%'";
}
@@ -989,6 +1016,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");//
+ $("#HProjectNumber").val("");
$("#HCusID").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
@@ -1829,6 +1857,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html"
index aeec93e..1ad8765 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html"
@@ -1472,6 +1472,22 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 5b2dfc0..70dd92d 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -845,7 +845,7 @@
, HTaxPrice: HTaxPrice
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -887,7 +887,7 @@
, HTaxPrice: HTaxPrice
, HlineTotal: HlineTotal
});
- table.render(option)
+ //table.render(option)
break;
case "HMoney": //閲戦
//鏁版嵁鏍煎紡鏍￠獙
@@ -929,7 +929,7 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
break;
case "HTaxRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -1014,7 +1014,7 @@
, HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
, HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
});
- table.render(option)
+ //table.render(option)
break;
default:
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 210c9b8..cd0797c 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -19,7 +19,7 @@
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -70,6 +70,12 @@
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -252,8 +258,7 @@
var sWhere = "";
var option = [];
var HModName = "Kf_POStockInBillList";
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
+
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1201";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -285,21 +290,17 @@
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option, 2);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option, 2);
+
});
//#endregion
@@ -321,6 +322,33 @@
$('#HEndDate').prop('disabled', false);
}
});
+
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
+ //#endregion
+
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1201";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//鑾峰彇缁勭粐
Organ();
@@ -344,6 +372,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery(table, option,2);
@@ -442,8 +472,6 @@
//棣栨涓嶆墽琛�
if (!first) {
//do something
- page = obj.curr;
- size = obj.limit;
get_FastQuery();
}
}
@@ -567,9 +595,9 @@
url: GetWEBURL() + '/Kf_POStockInBill/page',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -802,6 +830,7 @@
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HSupID = $("#HSupID").val();
var HDeptID = $("#HDeptID").val();
var HMangerID = $("#HMangerID").val();
@@ -896,6 +925,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
if (HSupID) {
sWhere += " and 渚涘簲鍟� like '%" + HSupID + "%'";
}
@@ -921,6 +953,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");//
+ $("#HProjectNumber").val("");
$("#HSupID").val("");
$("#HDeptID").val("");
$("#HMangerID").val("");
@@ -1447,7 +1480,7 @@
function get_HideColumn() {
var colName = "";
var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["field"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
@@ -1493,8 +1526,10 @@
var titleData = ["hmainid", "hsupid", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hmaterid", "hunitid","hwhid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol.length <= i) {
+ break;
+ }
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
@@ -1556,6 +1591,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
table.render(option);
} else {
table.render(option);
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html"
index 3266523..c5f0f58 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html"
@@ -1580,6 +1580,22 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
--
Gitblit v1.9.1