Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-24 e27f9d475c8732b64dbc863640e25d5253d707f1

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html

@@ -15,9 +15,9 @@
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">管材名称：</label>
                <label class="col-sm-3 control-label">材料名称：</label>
                <div class="col-sm-8">
                    <input name="tubName" th:field="*{tubName}" class="form-control" type="text">
                    <input name="tubName" th:field="*{tubName}" class="form-control" type="text" placeholder="请填写材料名称" required>
                </div>
            </div>
<!--            <div class="form-group">    -->
@@ -34,7 +34,7 @@
                <div class="col-sm-8">
                    <div class="input-group date">
                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                        <input name="outboundDate" th:value="${#dates.format(tubLog.outboundDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                        <input id="outboundDateId" name="outboundDate" th:value="${#dates.format(tubLog.outboundDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                    </div>
                </div>
            </div>
@@ -43,14 +43,14 @@
                <div class="col-sm-8">
                    <div class="input-group date">
                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                        <input name="inboundDate" th:value="${#dates.format(tubLog.inboundDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                        <input id="inboundDateId" name="inboundDate" th:value="${#dates.format(tubLog.inboundDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                    </div>
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">经办人：</label>
                <div class="col-sm-8">
                    <input name="optUser" th:field="*{optUser}" class="form-control" type="text">
                    <input name="optUser" th:field="*{optUser}" class="form-control" type="text" required>
                </div>
            </div>
            <div class="form-group">    
@@ -62,13 +62,13 @@
            <div class="form-group">    
                <label class="col-sm-3 control-label">出入库数量：</label>
                <div class="col-sm-8">
                    <input name="number" th:field="*{number}" class="form-control" type="text">
                    <input name="number" th:field="*{number}" class="form-control" type="text" placeholder="请输入出入库数量，数字类型">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">数据单位：</label>
                <div class="col-sm-8">
                    <input name="unit" th:field="*{unit}" class="form-control" type="text">
                    <input name="unit" th:field="*{unit}" class="form-control" type="text" placeholder="例如：吨、件、个等">
                </div>
            </div>
            <div class="form-group">
@@ -90,6 +90,12 @@
        });

        function submitHandler() {
            let inboundDateValue = $("#inboundDateId").val();
            let outboundDateValue = $("#outboundDateId").val();
            if ($.common.isEmpty(inboundDateValue) && $.common.isEmpty(outboundDateValue)) {
                $.modal.alertWarning("出入库时间，请选择一条记录");
                return;
            }
            if ($.validate.form()) {
                $.operate.save(prefix + "/edit", $('#form-TubLog-edit').serialize());
            }