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

chenhuan

2024-05-20 c6f79f5720c5d4a700b8b759a93393559409fd1c

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html

@@ -9,23 +9,17 @@
            <div class="form-group">    
                <label class="col-sm-3 control-label">出入库单子号：</label>
                <div class="col-sm-8">
                    <input name="code" class="form-control" type="text">
                    <input name="code" th:value="${code}"  class="form-control" type="text" disabled="disabled">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">项目名称：</label>
                <div class="col-sm-8">
                    <input name="projectName" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">设备名称：</label>
            <div class="form-group">
                <label class="col-sm-3 control-label">名称：</label>
                <div class="col-sm-8">
                    <input name="deviceName" class="form-control" type="text">
                </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">
                    <select name="type" class="form-control m-b" th:with="type=${@dict.getType('device_log_type')}">
                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -33,9 +27,15 @@
                </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="transactionDate" class="form-control" type="text">
                    <input name="inboundDate" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">出库时间：</label>
                <div class="col-sm-8">
                    <input name="outboundDate" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
@@ -45,7 +45,7 @@
                </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="applyUser" class="form-control" type="text">
                </div>
@@ -56,18 +56,29 @@
                    <input name="number" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">备注：</label>
                <div class="col-sm-8">
                    <textarea id="remark" name="remark" class="form-control"></textarea>
                </div>
            </div>
        </form>
    </div>
    <th:block th:include="include :: footer" />
    <script th:inline="javascript">
        var prefix = ctx + "geo/deviceLog"
        var projectId = [[${projectId}]];
        var code = [[${code}]];

        $("#form-deviceLog-add").validate({
            focusCleanup: true
        });

        function submitHandler() {
            if ($.validate.form()) {
                $.operate.save(prefix + "/add", $('#form-deviceLog-add').serialize());
                let formData = $('#form-deviceLog-add').serialize();
                let data = formData + "&projectId=" + projectId + "&code=" + code;
                $.operate.save(prefix + "/add", data);
            }
        }
    </script>