From b9ead6457e85c513be1ef0bacb5b04fdc69b7df3 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 27 九月 2024 17:22:30 +0800
Subject: [PATCH] 乔一销售出库扫码：优化
---
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html | 79 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 37 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
index 0f6c489..aa1bc6e 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
@@ -305,6 +305,9 @@
var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var HInterID_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
+
+ var loadSubTableBar = 0; //鍔犺浇瀛愯〃鍒楃殑鏍囪锛屼负0鏃堕渶瑕佸姞杞藉垪鏁版嵁锛屼负1鏃朵笉闇�瑕佸姞杞藉垪鏁版嵁
+
//#endregion
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -1466,50 +1469,52 @@
data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in result.list) {
- //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
- data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
- //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
- var patrn = new RegExp(/^h/i);
- if (patrn.test(result.list[key].ColmCols)) {
- titleData[key] = result.list[key].ColmCols;
+ if (loadSubTableBar == 0) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
}
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- 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: 200 });
- break;
- default:
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ 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: 200 });
+ break;
+ default:
- if (data[i].name == '绫虫暟' || data[i].name == '婧愬崟绫虫暟' || data[i].name == '浠舵暟') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80, totalRow: true });
- }
- else if (data[i].name == '鐗╂枡浠ｇ爜' || data[i].name == '婧愬崟鍗曞彿') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
- }
- else if ( data[i].name == '鐗╂枡鍚嶇О') {
- col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 300 });
- }
- else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+ if (data[i].name == '绫虫暟' || data[i].name == '婧愬崟绫虫暟' || data[i].name == '浠舵暟') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80, totalRow: true });
+ }
+ else if (data[i].name == '鐗╂枡浠ｇ爜' || data[i].name == '婧愬崟鍗曞彿') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
+ }
+ else if (data[i].name == '鐗╂枡鍚嶇О') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 300 });
+ }
+ else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+ }
}
}
}
+ columns = col;
+ listOption.cols = [columns];
}
- columns = col;
- listOption.cols = [columns];
listOption.data = result.data.Materlist;
listOption.totalRow = true;
BarCodelistOption.data = result.data.BarCodelist;
--
Gitblit v1.9.1