优化

懒羊羊

2023-11-14 036dcdcec6235d82b008f5c736d27a0d1f90d4a2

优化

 guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/controller/SalesOrderController.java

@@ -107,6 +107,17 @@
    }

    /**
     * ä¸‹å‘详情页面
     *
     * @author ruimin
     * @Date 2023-08-26
     */
    @RequestMapping("/distributeDetails")
    public String distributeDetails() {
        return PREFIX + "/bulletBox/distributeDetails.html";
    }

    /**
     * æ–°å¢žæŽ¥å£
     *
     * @author ruimin

 guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/distributeDetails.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@

layui.use(['table'], function () {
    var $ = layui.jquery;
    var table = layui.table;

    /**
     * ç‰©æ–™ä¿¡æ¯ç®¡ç†
     */
    var MaterialInfo = {
        tableId: "materialInfoTable"
    };

    var salesOrderCode = parent.salesOrderCode;
    console.log(salesOrderCode)

    $('#serch').click(function(){
        var queryData = {};
        queryData['salesOrderCode'] = salesOrderCode;
        table.reload(MaterialInfo.tableId, {
            where: queryData, page: {curr: 1}
        });
    });
    /**
     * ç¼ºæ–™æŠ¥è­¦åˆå§‹åŒ–表格的列
     */
    MaterialInfo.initColumn = function () {
        return [[
            {field: 'id', hide: true, title: '主键id'},
            {field: 'salesOrderCode', sort: true, title: '订单编号',width: 160},
            {field: 'productCode', sort: true, title: '产品编号',width: 160},
            {field: 'productName', sort: true, title: '产品名称',width: 160},
            {field: 'lineCode', sort: true, title: '产线编码',width: 120},
            {field: 'planNumber', sort: true, title: '计划数量',width: 120},
            {field: 'customerNo', sort: true, title: '客户编号',width: 120},
            {field: 'cargoNo', sort: true, title: '货号',width: 160},
            {field: 'planStartTime', sort: true, title: '计划开始时间',width: 160},
            {field: 'planEndTime', sort: true, title: '计划结束时间',width: 160},
            {field: 'deliveryTime', sort: true, title: '交货时间',width: 160},
            {field: 'createUser', sort: true, title: '创建用户',width: 160},
            {field: 'createTime', sort: true, title: '创建时间',width: 160},
        ]];
    };

    table =  $.extend(table, {config: {checkName: 'checked'}});

    var queryData = {};
    queryData['salesOrderCode'] = salesOrderCode;
    var tableResult = table.render({
        elem: '#' + MaterialInfo.tableId,
        url: Feng.ctxPath + '/salesOrderChild/list',
        page: true,
        where:queryData,
        cellMinWidth: 80,
        cols: MaterialInfo.initColumn()
    });
    $('#reset').click(function(){
        clearType();
        Msg = "";
        window.localStorage.clear();
    });

    function clearType(){
        parent.materialType="";
    }

});

 guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/productListing.js

ÎļþÒÑɾ³ý

 guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js

@@ -20,7 +20,7 @@
        return [[
            {type: 'checkbox'},
            {field: 'id', hide: true, title: '主键id'},
            {field: 'salesOrderCode', sort: true, title: '订单编号',width: 160},
            {field: 'salesOrderCode', sort: true, title: '订单编号',width: 160, templet: '#scoreTpl'},
            {field: 'customerNo', sort: true, title: '客户编号',width: 120},
            {field: 'cargoNo', sort: true, title: '货号',width: 120},
            {field: 'productCode', sort: true, title: '产品编号',width: 160},
@@ -113,12 +113,6 @@
            Feng.error("已拆分下发订单禁止重复拆分");
            return;
        }
        // if (checkRows.data.state !== "1") {
        //     Feng.error("已拆分下发订单禁止重复拆分");
        //     return;
        // }
        // window.location.href = Feng.ctxPath + '/salesOrder/split?id=' + checkRows.data[0].id

    });

    /**
@@ -135,6 +129,18 @@
    */
    SalesOrder.jumpEditPage = function (data) {
        window.location.href = Feng.ctxPath + '/salesOrder/edit?id=' + data.id
    };

    SalesOrder.distributeDetails = function (data) {
        layer.open({
            type: 2,
            area: ['1000px', '600px'],
            title: '拆分详情',
            content: Feng.ctxPath + '/salesOrder/distributeDetails',
            success: function (layero, index) {
                window.salesOrderCode = data;
            },
        });
    };

    /**
@@ -154,7 +160,6 @@
     */
    SalesOrder.distribute = function (data) {
        layer.alert(data);

    };

    /**
@@ -233,6 +238,8 @@
            SalesOrder.jumpEditPage(data);
        } else if (layEvent === 'delete') {
            SalesOrder.onDeleteItem(data);
        } else if (layEvent === 'clickScore') {
            SalesOrder.distributeDetails(data.salesOrderCode);
        }
    });
});

 guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js

@@ -11,10 +11,11 @@
    };

    var materialType = parent.materialType;
    console.log(materialType)

    $('#serch').click(function(){
        var queryData = {};
        queryData['typeZ'] = materialType;
        queryData['typeL'] = materialType;
        queryData['materialName'] = $("#materialName").val();
        queryData['materialCode'] = $("#materialCode").val();
        table.reload(MaterialInfo.tableId, {

 guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder.js

@@ -45,7 +45,6 @@
            {field: 'updateUser', sort: true, title: '更改用户',width: 120},
            {field: 'updateTime', sort: true, title: '更改时间',width: 160},
            {field: 'remark', sort: true, title: '备注',width: 160},
            // {fixed: 'right',width: 125, minWidth: 125, align: 'center', toolbar: '#tableBar', title: '操作'}
        ]];
    };


 guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/distributeDetails.html

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
@layout("/common/_form.html",{js:["/assets/modular/pm/salesOrder/bulletBox/distributeDetails.js"]}){
    <div class="layui-fluid" style="padding-bottom: 75px;">
        <div class="layui-card">
            <div class="layui-card-body">
                <table class="layui-table" id="materialInfoTable" lay-filter="materialInfoTable"></table>
            </div>
        </div>
    </div>

<div class="form-group-bottom text-center">
    <button type="reset" id="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;关闭&emsp;</button>
</div>
@}

 guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/productListing.html

ÎļþÒÑɾ³ý

 guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/salesOrder.html

@@ -84,8 +84,21 @@
    </div>
</div>

<!--<script type="text/html" id="tableBar">-->
<!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>-->
<!--    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>-->
<!--</script>-->
<script type="text/html" id="tableBar">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
    {{#  if(d.state == 1){ }}
    <button class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</button>
    <button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</button>
    {{#  } else { }}
    <button class="layui-btn layui-btn-primary layui-btn-xs" disabled="true" lay-event="edit">修改</button>
    <button class="layui-btn layui-btn-danger layui-btn-xs" disabled="true" lay-event="delete">删除</button>
    {{#  } }}
</script>

<script type="text/html" id="scoreTpl">
    <div lay-event="clickScore" style="color: #01AAED;">{{ d.salesOrderCode }}</div>
</script>
@}