Merge remote-tracking branch 'origin/master'

vince

2023-07-20 e4609e7ea92f3939802fafc15fd784213ed00b5f

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

@@ -166,7 +166,7 @@
                        </span>
                        <p>满车称重</p>
                    </li>
                    <li id="progress-hand" class="">
                    <li id="progress-hand" class="active">
                        <span class="rk-step-span">
                            <img th:src="@{../../static/images/icon-xiehuo.png}"/>
                        </span>
@@ -500,6 +500,7 @@
                </div>
                <!--kccz-r-item end-->
            </div>

        </div>
        <!--kccz-con end-->

@@ -520,7 +521,7 @@
    var bizType = [[${bizType}]];
    //userId
    var userId = [[${loginUser.username}]];
    var  curUser = [[${loginUser.cname}]];
    var curUser = [[${loginUser.cname}]];
    //出入库类型
    var type = [[${type}]];
    var companyId = [[${loginUser.companyId}]];