Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-06-29 651dfb24aa82ea28e6348907bc02dc8c84a6e13f

 igds-web/src/main/resources/templates/admin/inout/in-sample.html

@@ -20,34 +20,20 @@
            width: 100%;
        }

        #layui-table-page1 {
            text-align: right !important;
        }

        .display-none {
            display: none;
        }

        #layui-table-page1 {
            text-align: right !important;
        }
        .control-btn {
            height: 35px;
            line-height: 30px;
            background-color: #f67d06;
        }

        .tip-red {
            text-align: right;
            padding-left: 40px;
            font-size: 16px;
            color: red;
            font-weight: bold;
        }

        thead span {
            font-weight: bold
        }

        #label1, #label4, #label5 {
            color: red;
        }

        .layui-select-disabled .layui-disabled {
@@ -109,6 +95,9 @@

        .input_ba {
            background: #e7eaec !important;
        }
        .layui-table-body {
            height: 450px;
        }
    </style>

@@ -188,21 +177,17 @@
        <div class="qyzj-con radius-6">
            <div class="qyzj-con-top layui-row">
                <form class="layui-form" action="" id="form-param" lay-filter="form-param">

                    <div class="layui-form-item display-none">
                        <label class="layui-form-label">隐藏-类型</label>
                        <div class="layui-input-block">
                            <input type="text" name="type" th:value="${type}" autocomplete="off"
                                   class="layui-input rkbk-search-input">
                        </div>
                            <input type="text" name="type" th:value="${type}">
                    </div>

                    <div class="layui-form-item display-none">
                        <label class="layui-form-label">隐藏-流程</label>
                        <div class="layui-input-block">
                            <input type="text" name="progress" th:value="${progress}" autocomplete="off"
                                   class="layui-input rkbk-search-input">
                        </div>
                            <input type="text" name="progress" th:value="${progress}">
                    </div>
                    <div class="layui-form-item display-none">
                        <input type="text" name="companyId" th:value="${companyId}">
                    </div>
                    <div class="layui-form-item display-none">
                        <input type="text" name="deptId" th:value="${deptId}">
                    </div>

                    <div class="layui-col-xs3">
@@ -310,30 +295,24 @@
    var type = [[${type}]];
    //userId
    var userId = [[${loginUser.username}]];

    var sampleUser = [[${loginUser.cname}]];

    var companyId = [[${loginUser.companyId}]];
    //品种
    var listFoodVariety = [[${listFoodVariety}]];
    var startTime = [[${startTime}]];
    var endTime = [[${endTime}]];
    //扦样机信息
    var checkDto = [[${checkDto}]];

    //所属分库
    var deptId = [[${deptId}]];
    //库区名称
    var deptName = [[${deptName}]];

    var inoutProgress = [[${inoutProgress}]];

</script>


<script th:src="@{../../static/plugins/layui/layui.js}"></script>
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/in-sample.js}"></script>

<script type="text/html" id="barControl">
@@ -341,7 +320,7 @@
</script>
</body>

<!-- 化验信息，包括基本信息和化验结果 -->
<!-- 扦样信息 -->
<div class="layui-tab-content" id="checkDetail" style="display: none;">
    <!-- 表单基本信息 -->
    <div style="height: 100%; width: 55%; float: left">