finish add pl

Helius

2021-04-16 4b76e1d370e1161dbb323ddff448d3c0ca3769ba

finish add pl

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java

@@ -879,6 +879,8 @@
        if (skipServiceOrderStep(Dictionary.SERVICE_OVER_BEGIN_END)) {
            projServices.setStartTime(new Date());
            projServices.setState(Dictionary.SERVICE_STATU_FWWC);
        } else {
            projServices.setState(Dictionary.SERVICE_STATU_PLWC);
        }
        // 释放床位资源
//        SysBedState checkBedState = sysBedStateDao.selectBySerIdAndBedId(projServices.getBedId(), projServices.getId());

 zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html

@@ -161,7 +161,6 @@
            alarmNum = row.alarmNum;
        }
        var storeNum = parseInt(value);
        console.log(alarmNum,storeNum);
        if (alarmNum > storeNum) {
            html = '<span class="label-danger" >&nbsp;&nbsp;' + value
                + '&nbsp;&nbsp;</span>';

 zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html

@@ -81,6 +81,10 @@
    var projIndex = 0;
    var myForm=MForm.initForm({
        invokeUrl:basePath+"/admin/projService/endPl",
        beforeSubmit : function() {
            var fieldArray = $("#dataform").serializeArray();
            console.log(fieldArray);
        },
        afterSubmit:function(){
            if (parent.myGrid) {
                parent.myGrid.serchData();
@@ -119,20 +123,27 @@
        if (rows) {
            var projInfo = plList[projIndex];
            var idSelect = "#"+projIndex;
            var allGroup = $(".group").length;
            console.log(idSelect);
            var groupLength = $(idSelect + " .group").length;
            for(var i = 0; i < rows.length; i++) {
                var row = rows[i];
                var nextIndex = groupLength + i + 1;
                var outItemIndex = allGroup + i;
                var html = '<tr class="group">'
                        + '<td>'+ nextIndex +'</td>'
                        + '<td>'+ row.goods.name +'</td>'
                        + '<td><span></span></td>'
                        + '<td ><input autocomplete="off"   class="form-control" style="width: 200px;float: left;"  type="text" name="amount" placeholder="实际用量" >'
                        + '<td ><input autocomplete="off"   class="form-control" style="width: 200px;float: left;"  type="text" name="outStoreItem['+ outItemIndex +'].amount" placeholder="实际用量" >'
                        + '<span style="line-height: 30px;margin-left: 10px;">'+ row.goods.measure +'</span></td>'
                        + '<td><input autocomplete="off"   type="hidden" name="skuId" value="'+ row.goods.id +'">'
                        + '<input autocomplete="off" type="text" name="remark"  class="form-control" placeholder="配料备注"></td></tr>';
                        + '<td><input autocomplete="off"   type="hidden" name="outStoreItem['+ outItemIndex +'].skuId" value="'+ row.goods.id +'">'
                        + '<input autocomplete="off" type="text" name="outStoreItem['+ outItemIndex +'].remark"  class="form-control" placeholder="配料备注"></td></tr>';

                $(idSelect).children(':last').after(html);
                if ($(idSelect).children(':last').length <= 0) {
                    $(idSelect).html(html);
                } else {
                    $(idSelect).children(':last').after(html);
                }
            }
        }
    }