duhe
2024-10-17 de522de9e842b16d7aac0865c2c9ae3d5dbba8d1
出门确认单:新增表头字段 出厂地点HOutAddress
4个文件已修改
47 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/出门确认单_新/Xs_OutDoorBill_PDA.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/出门确认单_新/Xs_OutDoorBill.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/出门确认单_新/Xs_OutDoorBillList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
WebTM/views/WMSɨÂëÄ£¿é/³öÃÅÈ·Èϵ¥_ÐÂ/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].组织);
WebTM/views/ÏúÊÛ¹ÜÀí/³öÃÅÈ·Èϵ¥_ÐÂ/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) {
WebTM/views/ÏúÊÛ¹ÜÀí/³öÃÅÈ·Èϵ¥_ÐÂ/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) {