From de522de9e842b16d7aac0865c2c9ae3d5dbba8d1 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 17 十月 2024 15:47:55 +0800
Subject: [PATCH] 出门确认单：新增表头字段 出厂地点HOutAddress
---
WebTM/views/WMS扫码模块/出门确认单_新/Xs_OutDoorBill_PDA.html | 9 +++++++++
WebTM/views/销售管理/出门确认单_新/Xs_OutDoorBill.html | 20 ++++++++++++++++++++
WebTM/views/销售管理/出门确认单_新/Xs_OutDoorBillList.html | 6 +++++-
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 12 ++++++------
4 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index a1d8466..7731322 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1999,7 +1999,7 @@
<publishTime>10/15/2024 16:23:38</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鍑洪棬纭鍗昣鏂�/Xs_OutDoorBill_PDA.html">
- <publishTime>10/16/2024 14:47:02</publishTime>
+ <publishTime>10/17/2024 14:50:33</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/濮斿鍏ュ簱/Kf_EntrustInBackBillList_PDA.html">
<publishTime>06/24/2024 17:18:42</publishTime>
@@ -5254,10 +5254,10 @@
<publishTime>10/11/2024 11:32:36</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
- <publishTime>10/16/2024 14:58:27</publishTime>
+ <publishTime>10/16/2024 17:42:07</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
- <publishTime>10/16/2024 14:58:27</publishTime>
+ <publishTime>10/16/2024 17:42:07</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillCheckQuery.html">
<publishTime>10/11/2024 11:32:36</publishTime>
@@ -6304,7 +6304,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA_QiaoYi.html">
- <publishTime>09/14/2023 13:59:10</publishTime>
+ <publishTime>10/17/2024 11:37:54</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Gy_ProcessBatchReport.html">
<publishTime>01/21/2024 09:19:01</publishTime>
@@ -6781,10 +6781,10 @@
<publishTime>08/23/2024 15:33:37</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍑洪棬纭鍗昣鏂�/Xs_OutDoorBill.html">
- <publishTime>10/16/2024 15:44:36</publishTime>
+ <publishTime>10/17/2024 14:57:10</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍑洪棬纭鍗昣鏂�/Xs_OutDoorBillList.html">
- <publishTime>10/14/2024 16:50:20</publishTime>
+ <publishTime>10/17/2024 15:33:22</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Add_Edit_Xs_SeOutStockBillList.html">
<publishTime>10/11/2024 11:32:36</publishTime>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBill_PDA.html"
index b976120..cd4417e 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBill_PDA.html"
@@ -110,6 +110,14 @@
</div>
<div class="layui-row">
<div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍑洪棬鍦扮偣</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HOutAddress" id="HOutAddress" lay-verify="HOutAddress" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">琛ㄥご澶囨敞</label>
</div>
<div class="layui-col-xs9">
@@ -512,6 +520,7 @@
$("#HPhone").val(result.data[0].鑱旂郴鐢佃瘽);
$("#HOutReason").val(result.data[0].鍑洪棬鍘熷洜);
$("#HMaterName").val(result.data[0].瑁呰繍浣曠墿);
+ $("#HOutAddress").val(result.data[0].鍑洪棬鍦扮偣);
$("#HRemark").val(result.data[0].琛ㄥご澶囨敞);
$("#HStockOrgID").val(result.data[0].HStockOrgID);
$("#HStockOrgName").val(result.data[0].缁勭粐);
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBill.html"
index 6484ee6..c05c2ba 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBill.html"
@@ -122,6 +122,16 @@
<input type="text" class="layui-input" name="HCarNumber" id="HCarNumber">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍑哄巶鍦扮偣<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <select name="HOutAddress" id="HOutAddress" lay-filter="HOutAddress" style="width: 180px; ">
+ <option style="color:blue;" selected="selected" value=""></option>
+ <option style="color:blue;" value="鑰佸巶">鑰佸巶</option>
+ <option style="color:blue;" value="鏂板巶">鏂板巶</option>
+ </select>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline" style="display:none;">
@@ -876,6 +886,11 @@
return false;
}
+ if ($("#HOutAddress").val() == "") {
+ layer.msg("璇烽�夋嫨鍑哄巶鍦扮偣锛�");
+ return false;
+ }
+
//if ($("#HShipper").val() == "") {
// layer.msg("瑁呰繍浜轰笉鑳戒负绌�!");
// return false;
@@ -1046,6 +1061,7 @@
, "HPhone": data.鑱旂郴鐢佃瘽
, "HMaterName": data.瑁呰繍浣曠墿
, "HOutReason": data.鍑洪棬鍘熷洜
+ , "HOutAddress": data.鍑洪棬鍦扮偣
, "HRemark": data.琛ㄥご澶囨敞
, "HStockOrgID": data.HStockOrgID
@@ -1590,6 +1606,10 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
+ if (i >= dataCol.length) {
+ continue;
+ }
+
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBillList.html"
index 75dfebb..69ac9ff 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBillList.html"
@@ -497,7 +497,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 + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width:120 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
@@ -981,6 +981,10 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (i >= dataCol.length) {
+ continue;
+ }
+
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
--
Gitblit v1.9.1