YYC
2023-07-05 24053f10929f66813281398bb92a3a76b6ea90c7
出库值仓
已修改5个文件
297 ■■■■■ 文件已修改
igds-web/src/main/resources/static/admin/inout/out-handle.js 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/out-register.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/in-register.html 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/out-handle.html 248 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/out-register.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/out-handle.js
@@ -191,6 +191,13 @@
    });
}
function flushPage() {
    layer.confirm('确定要刷新页面吗?', {icon: 3, title: '提示'}, function (index) {
        resetForm();
        layer.close(index);
    });
}
// 表单清空
function resetForm() {
    $("#form-data")[0].reset();
@@ -200,6 +207,7 @@
    $('#kccz-r-img3').removeAttr('src');
    form.render();
    recordData = null;
    $("#text-param").val(null);
}
// 更新数据信息
@@ -241,7 +249,7 @@
// 当前完成
function submit() {
    if (null == recordData) {
    if (!recordData) {
        layer.alert("没有数据可以提交!!!");
        return;
    }
@@ -262,7 +270,7 @@
    $.ajax({
        type: "POST",
        url: "../../basic/inout/inout-next-step",
        url: "../../basic/inout/submit-handle",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
igds-web/src/main/resources/static/admin/inout/out-register.js
@@ -101,9 +101,10 @@
            layer.close(index);
            var data = json.content;
            if (data === "not found") {
                layer.alert("没有获取到身份证信息!", {
                    offset: ['300px', '300px']
                });
                // layer.alert("没有获取到身份证信息!", {
                //     offset: ['300px', '300px']
                // });
                alertError("没有获取到身份证信息!");
                return;
            }
            // 临时赋值
@@ -252,15 +253,18 @@
function submit() {
    var data = form.val("form-data");
    if (!data.userName) {
        notify("承运人信息不能为空", null);
        // notify("承运人信息不能为空", null);
        alertError("承运人信息不能为空");
        return;
    }
    if (!data.plateNum) {
        notify("车牌号不能为空", null);
        alertError("车牌号不能为空");
        // notify("车牌号不能为空", null);
        return;
    }
    if (!data.intelCard && !data.userId) {
        notify("智慧卡号与身份证号不能同时为空", null);
        alertError("智慧卡号与身份证号不能同时为空");
        // notify("智慧卡号与身份证号不能同时为空", null);
        return;
    }
igds-web/src/main/resources/templates/admin/inout/in-register.html
@@ -230,7 +230,8 @@
                                <div class="rkbk-quick layui-text-center">
                                    <button id="button_readID" type="button"
                                        onclick="flushIdCard()"
                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证</button>
                                        class="rkbk-quick-btn layui-btn btn-blue">读取身份证
                                </button>
                                </div>
                            </div>
@@ -278,7 +279,8 @@
                                            <input type="radio" name="transType" value="1" title="汽车"
                                                checked> <input type="radio" name="transType"
                                                value="2" title="火车"> <input type="radio"
                                                name="transType" value="3" title="轮船"> <input
                                                                                            name="transType" value="3"
                                                                                            title="轮船"> <input
                                                type="radio" name="transType" value="9" title="其他">
                                        </div>
                                    </div>
@@ -300,11 +302,10 @@
                                        <span id="plateNum2">未识别</span>
                                        <p>车牌识别</p>
                                    </div>
                                     <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span class="kccz-r-pz"></span>
                                <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span
                                        class="kccz-r-pz"></span>
                                        <p>系统自动抓拍</p>
                                    </a>
                                </div>
                            </div>
                        </div>
igds-web/src/main/resources/templates/admin/inout/out-handle.html
@@ -30,11 +30,20 @@
            background: #eff4f6;
        }
        #text-param {
            font-size: 14px;
            color: red;
            padding-left: 10px;
        }
        .rk-step-wrap {
            padding: 0px;
            border-bottom: 0px;
            text-align: center;
        }
        .kccz-left-box2 {
            height: 560px;
        }
        .qyzj-btnbox {
@@ -49,12 +58,42 @@
            min-height: 38px;
            padding-top: 2px;
        }
        .kccz-con {
            margin: 15px 0;
        }
        .rkbk-search-btn {
            width: 100px;
            height: 30px;
            line-height: 30px;
            font-size: 16px;
        }
        .kccz-r-btnbox {
            width: 86px !important;
        }
        .kccz-r-btn {
            width: 86px !important;
        }
        .rkbk-search-input {
            background: #FFF !important;
        }
        .color-red {
            color: red !important;
        }
        .r-240 {
            right: 240px;
        }
        .r-120 {
            right: 120px;
        }
    </style>
</head>
@@ -71,6 +110,10 @@
                <button class="rkbk-quick-btn layui-btn btn-green btn-sm"
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i>值仓完成
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet btn-sm"
                        onclick="flushPage()">
                    <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>刷新页面
                </button>
            </div>
@@ -119,11 +162,20 @@
        <div class="kccz-con">
            <div class="kccz-left radius-6 fl bg-fff">
                <div class="kccz-left-box2 ">
                <div class="kccz-left-box2 radius-6">
                    <div class="rkbk-tit">
                        <i></i>
                        <h3>出库信息</h3>
                        <h3>出库信息<span id="text-param"></span></h3>
                        <div>
                            <input type="button" value="读智慧卡"
                                   class="rkbk-search-btn layui-btn r-240" onclick="flushICCard()">
                            <input type="button" value="读身份证"
                                   class="rkbk-search-btn layui-btn r-120" onclick="flushIdCard()">
                            <input type="button" value="手动查询"
                                   class="rkbk-search-btn layui-btn" onclick="flushData()">
                        </div>
                    </div>
                    <div class="kccz-data-form layui-row">
@@ -162,10 +214,10 @@
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">身份证号</label>
                                    <label class="layui-form-label color-red">承运人</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="userId" id="userId"
                                               placeholder="承运人身份证号" autocomplete="off" class="layui-input">
                                        <input type="text" name="userName" id="userName"
                                               placeholder="不可编辑" autocomplete="off" class="layui-input" disabled>
                                    </div>
                                </div>
@@ -174,48 +226,49 @@
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">车牌号</label>
                                    <label class="layui-form-label color-red">车牌号</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="plateNum" id="plateNum"
                                               autocomplete="off" class="layui-input">
                                               placeholder="自动带入/手动录入" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <div class="layui-col-xs4 kccz-data-btnbox">
                                        <input type="button" value="读身份证"
                                               class="rkbk-search-btn layui-btn"
                                               onclick="flushIdCard()">
                                    </div>
                                    <div class="layui-col-xs4 kccz-data-btnbox">
                                        <input type="button" value="读卡"
                                               class="rkbk-search-btn layui-btn"
                                               onclick="flushICCard()">
                                    </div>
                                    <div class="layui-col-xs4 kccz-data-btnbox">
                                        <input type="button" value="查&nbsp;&nbsp;询"
                                               class="rkbk-search-btn layui-btn" onclick="flushData()">
                                    </div>
                                </div>
                            </div>
                            <!--  <div class="layui-col-xs4">-->
                            <!--      <div class="layui-form-item">-->
                            <!--          <div class="layui-col-xs4 kccz-data-btnbox">-->
                            <!--              <input type="button" value="读身份证"-->
                            <!--                     class="rkbk-search-btn layui-btn"-->
                            <!--                     onclick="flushIdCard()">-->
                            <!--          </div>-->
                            <!--          <div class="layui-col-xs4 kccz-data-btnbox">-->
                            <!--              <input type="button" value="读智慧卡"-->
                            <!--                     class="rkbk-search-btn layui-btn"-->
                            <!--                     onclick="flushICCard()">-->
                            <!--          </div>-->
                            <!--          <div class="layui-col-xs4 kccz-data-btnbox">-->
                            <!--              <input type="button" value="手动查询"-->
                            <!--                     class="rkbk-search-btn layui-btn" onclick="flushData()">-->
                            <!--          </div>-->
                            <!--      </div>-->
                            <!--  </div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">智慧卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="intelCard" id="intelCard"
                                               placeholder="智慧卡号" autocomplete="off" class="layui-input">
                                               placeholder="自动带入/手动录入" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">空车称重</label>
                                    <label class="layui-form-label color-red">皮重(空车)</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="emptyWeight" autocomplete="off" placeholder="不可改"
                                               class="layui-input rkbk-search-input" disabled> <em
                                        <input type="text" name="emptyWeight" autocomplete="off" placeholder="不可编辑"
                                               class="layui-input rkbk-search-input" disabled>
                                        <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
@@ -223,9 +276,9 @@
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">满车称重</label>
                                    <label class="layui-form-label">毛重(满车)</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="fullWeight" autocomplete="off" placeholder="不可改"
                                        <input type="text" name="fullWeight" autocomplete="off" placeholder="不可编辑"
                                               class="layui-input rkbk-search-input" disabled> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
@@ -233,10 +286,10 @@
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">装卸仓库</label>
                                    <label class="layui-form-label color-red">装卸仓库</label>
                                    <div class="layui-input-block">
                                        <select name="depotId" id="depotId">
                                            <option value="">不可改</option>
                                            <option value="">不可编辑</option>
                                            <option th:each="depot,depotSet:${listDepot}"
                                                    th:value="${depot.id}" th:text="${depot.name}"></option>
                                        </select>
@@ -246,9 +299,9 @@
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">净&nbsp;&nbsp;&nbsp;&nbsp;重</label>
                                    <label class="layui-form-label">净毛重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="netWeight" autocomplete="off" placeholder="不可改"
                                        <input type="text" name="netWeight" autocomplete="off" placeholder="不可编辑"
                                               class="layui-input rkbk-search-input" disabled> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
@@ -256,28 +309,28 @@
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">杂质扣重</label>
                                    <div class="posi-r kccz-data-bfb fr">
                                        <input type="text" name="impurity" placeholder="不可改"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">%</em>
                                    </div>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input type="text" name="deImpurity" placeholder="不可改"
                                                   autocomplete="off" class="layui-input rkbk-search-input"
                                                   disabled> <em class="kccz-data-dw">KG</em>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!-- <div class="layui-col-xs4">-->
                            <!--     <div class="layui-form-item kccz-data-group-md">-->
                            <!--         <label class="layui-form-label">杂质扣重</label>-->
                            <!--         <div class="posi-r kccz-data-bfb fr">-->
                            <!--             <input type="text" name="impurity" placeholder="不可编辑"-->
                            <!--                    autocomplete="off" class="layui-input rkbk-search-input"-->
                            <!--                    disabled> <em class="kccz-data-dw">%</em>-->
                            <!--         </div>-->
                            <!--         <div class="layui-input-block">-->
                            <!--             <div class="posi-r">-->
                            <!--                 <input type="text" name="deImpurity" placeholder="不可编辑"-->
                            <!--                        autocomplete="off" class="layui-input rkbk-search-input"-->
                            <!--                        disabled> <em class="kccz-data-dw">KG</em>-->
                            <!--             </div>-->
                            <!--         </div>-->
                            <!--     </div>-->
                            <!-- </div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">往来单位</label>
                                    <label class="layui-form-label color-red">客户信息</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="customerName" placeholder="不可改"
                                        <input type="text" name="customerName" placeholder="不可编辑"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled>
                                    </div>
@@ -289,36 +342,36 @@
                                    <label class="layui-form-label">粮食等级</label>
                                    <div class="layui-input-block">
                                        <select name="foodLevel" id="foodLevel">
                                            <option value="">不可改</option>
                                            <option value="">不可编辑</option>
                                            <option th:each="dic,dicSet:${listFoodLevel}"
                                                    th:value="${dic.code}" th:text="${dic.name}"></option>
                                        </select>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item kccz-data-group-md">
                                    <label class="layui-form-label">水分增重</label>
                                    <div class="posi-r kccz-data-bfb fr">
                                        <input type="text" name="wet" placeholder="不可改"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">%</em>
                                    </div>
                                    <div class="layui-input-block">
                                        <div class="posi-r">
                                            <input type="text" name="deWet" placeholder="不可改"
                                                   autocomplete="off" class="layui-input rkbk-search-input"
                                                   disabled> <em class="kccz-data-dw">KG</em>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item kccz-data-group-md">-->
                            <!--        <label class="layui-form-label">水分增重</label>-->
                            <!--        <div class="posi-r kccz-data-bfb fr">-->
                            <!--            <input type="text" name="wet" placeholder="不可编辑"-->
                            <!--                   autocomplete="off" class="layui-input rkbk-search-input"-->
                            <!--                   disabled> <em class="kccz-data-dw">%</em>-->
                            <!--        </div>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <div class="posi-r">-->
                            <!--                <input type="text" name="deWet" placeholder="不可编辑"-->
                            <!--                       autocomplete="off" class="layui-input rkbk-search-input"-->
                            <!--                       disabled> <em class="kccz-data-dw">KG</em>-->
                            <!--            </div>-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">粮食品种</label>
                                    <div class="layui-input-block">
                                        <select name="foodVariety" id="foodVariety">
                                            <option value="">不可改</option>
                                            <option value="">不可编辑</option>
                                            <option th:each="dic,dicSet:${listFoodVariety}"
                                                    th:value="${dic.code}" th:text="${dic.name}"></option>
                                        </select>
@@ -330,7 +383,7 @@
                                <div class="layui-form-item">
                                    <label class="layui-form-label">其他扣重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deOther" autocomplete="off" placeholder="不可改"
                                        <input type="text" name="deOther" autocomplete="off" placeholder="不可编辑"
                                               class="layui-input rkbk-search-input" disabled> <em
                                            class="kccz-data-dw">KG</em>
                                    </div>
@@ -338,29 +391,27 @@
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">总扣重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="deSum" placeholder="不可改"
                                        <input type="text" name="deSum" placeholder="不可编辑"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">值仓开始</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="handleStart" id="handleStart"
                                               placeholder="年-月-日 时:分" autocomplete="off"
                                               class="layui-input bg-date">
                                    </div>
                                </div>
                            </div>
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item">-->
                            <!--        <label class="layui-form-label">值仓开始</label>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <input type="text" name="handleStart" id="handleStart"-->
                            <!--                   placeholder="年-月-日 时:分" autocomplete="off"-->
                            <!--                   class="layui-input bg-date">-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs4">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">现场扣重</label>
@@ -375,25 +426,34 @@
                                <div class="layui-form-item">
                                    <label class="layui-form-label">扣重后净重</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="settleWeight" placeholder="不可改"
                                        <input type="text" name="settleWeight" placeholder="不可编辑"
                                               autocomplete="off" class="layui-input rkbk-search-input"
                                               disabled> <em class="kccz-data-dw">KG</em>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs4">
                            <!--<div class="layui-col-xs4">-->
                            <!--    <div class="layui-form-item">-->
                            <!--        <label class="layui-form-label">值仓结束</label>-->
                            <!--        <div class="layui-input-block">-->
                            <!--            <input type="text" name="handleEnd" id="handleEnd"-->
                            <!--                   placeholder="年-月-日 时:分" autocomplete="off"-->
                            <!--                   class="layui-input bg-date">-->
                            <!--        </div>-->
                            <!--    </div>-->
                            <!--</div>-->
                            <div class="layui-col-xs12">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">值仓结束</label>
                                    <label class="layui-form-label">其他说明</label>
                                    <div class="layui-input-block">
                                        <input type="text" name="handleEnd" id="handleEnd"
                                               placeholder="年-月-日 时:分" autocomplete="off"
                                               class="layui-input bg-date">
                                        <input type="text" name="deOtherInfo" placeholder="其他扣重说明"
                                               class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-xs12">
                                <div class="layui-form-item">
                                    <label class="layui-form-label">备&nbsp;注</label>
                                    <label class="layui-form-label">备注说明</label>
                                    <div class="layui-input-block">
                                            <textarea name="remarks" placeholder="请输入内容"
                                                      class="layui-textarea"></textarea>
igds-web/src/main/resources/templates/admin/inout/out-register.html
@@ -94,10 +94,10 @@
                        onclick="submit()">
                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 完成登记
                </button>
                <button class="rkbk-quick-btn layui-btn btn-violet"
                        onclick="resetPlateNum()">
                    <i><img th:src="@{../../static/images/icon-che.png}"/></i>重置车牌识别
                </button>
                <!--                <button class="rkbk-quick-btn layui-btn btn-violet"-->
                <!--                        onclick="resetPlateNum()">-->
                <!--                    <i><img th:src="@{../../static/images/icon-che.png}"/></i>重置车牌识别-->
                <!--                </button>-->
            </div>
            <!--流程引导-->
@@ -298,7 +298,7 @@
                        <div class="kccz-r-con2">
                            <div class="kccz-r-vedio" id="kccz-r-video1"></div>
                            <div class="kccz-r-btnbox">
                                <div class="kccz-r-div">
                                <div class="kccz-r-div" style="width: 110px">
                                    <span id="plateNum2">未识别</span>
                                    <p>车牌识别</p>
                                </div>