懒羊羊
2023-10-10 cd500a4dab1bf530072ff6da83b907eebb48108a
配方修改
已修改7个文件
125 ■■■■ 文件已修改
guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_add.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_edit.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_add.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_edit.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo.js
@@ -27,6 +27,7 @@
                }
            },
            {field: 'formulaName', sort: true, title: '配方名称'},
            {field: 'productCode', sort: true, title: '产品编号'},
            {field: 'status', sort: true, title: '状态(字典)'},
            {field: 'remark', sort: true, title: '备注'},
            {field: 'createUser', sort: true, title: '创建用户'},
@@ -45,6 +46,7 @@
        queryData['formulaCode'] = $('#formulaCode').val();
        queryData['formulaName'] = $('#formulaName').val();
        queryData['productCode'] = $('#productCode').val();
        table.reload(FormulaInfo.tableId, {
            where: queryData, page: {curr: 1}
guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_add.js
@@ -8,6 +8,7 @@
        formulaName: "",
        status: "",
        spareField1: "",
        productCode: "",
        spareField2: "",
        remark: "",
        createUser: "",
guns-vip-main/src/main/webapp/assets/modular/bs/formulaInfo/formulaInfo_edit.js
@@ -9,6 +9,7 @@
        status: "",
        spareField1: "",
        spareField2: "",
        productCode: "",
        remark: "",
        createUser: "",
        createTime: "",
guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js
@@ -7,6 +7,29 @@
    var form = layui.form;
    var element = layui.element;
    /**
     * 配方配置子信息管理
     */
    var FormulaChildInfo = {
        tableId: "formulaChildInfoTable"
    };
    $('#imgs').attr("src", "http://localhost:8081/img/9f2f070828381f30fdf1be0da9014c086f06f0ad.jpg");
    /**
     * 初始化表格的列
     */
    FormulaChildInfo.initColumn = function () {
        return [[
            {field: 'id', hide: true, title: 'id'},
            {type:"numbers" ,title:'工步',width:40},
            {field: 'operationSteps', sort: true, title: '操作内容'},
            {field: 'techRequirement', sort: true, title: '技术要求'},
            {field: 'operationType', sort: true, title: '类型'},
        ]];
    };
    initLineInfo();
    var ajax = new $ax(Feng.ctxPath + "/workOrder/list?state=3");
@@ -22,6 +45,37 @@
    $('#recipeCode').text(msg.recipeCode);
    var radioElement = $('#sex1');
    var queryData = {};
    queryData['formulaCode'] = msg.recipeCode;
    // 渲染表格
    table.render({
        elem: '#' + FormulaChildInfo.tableId,
        url: Feng.ctxPath + '/formulaChildInfo/list',
        page: false,
        // height: "full-158",
        height: 460,
        cellMinWidth: 100,
        where: queryData,
        cols: FormulaChildInfo.initColumn(),
        done: function (res, curr, count) {
            console.log(res);
            //得到当前页码
            console.log(curr);
            //得到数据总量
            console.log(count);
            // 根据条件判断加背景色
            $.each(res.data, function (index, item) {
                console.log(item)
                console.log(item.spareField1)
                if (item.spareField1 === "3") {
                    // 法1
                    $("#formulaChildInfoTable").next().find('tbody tr[data-index="' + index +
                        '"]').css("background-color", "#00ff66");
                }
            });
        }
    });
    function initLineInfo(){
        $.ajax({
            type: "POST",
guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_add.html
@@ -21,23 +21,17 @@
                        </div>
                    </div>
                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">状态(字典)<span style="color: red;">*</span></label>
                        <label class="layui-form-label">产品编号<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input id="status" name="status" placeholder="请输入状态(字典)" type="text" class="layui-input" lay-verify="required" required/>
                            <input id="productCode" name="productCode" placeholder="请输入产品编号" type="text" class="layui-input" lay-verify="required" required/>
                        </div>
                    </div>
                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">预留字段1<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input id="spareField1" name="spareField1" placeholder="请输入预留字段1" type="text" class="layui-input" lay-verify="required" required/>
                        </div>
                    </div>
                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">预留字段2<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input id="spareField2" name="spareField2" placeholder="请输入预留字段2" type="text" class="layui-input" lay-verify="required" required/>
                        </div>
                    </div>
<!--                    <div class="layui-inline layui-col-md12">-->
<!--                        <label class="layui-form-label">状态(字典)<span style="color: red;">*</span></label>-->
<!--                        <div class="layui-input-block">-->
<!--                            <input id="status" name="status" placeholder="请输入状态(字典)" type="text" class="layui-input" lay-verify="required" required/>-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">备注<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
guns-vip-main/src/main/webapp/pages/modular/bs/formulaInfo/formulaInfo_edit.html
@@ -21,23 +21,17 @@
                        </div>
                    </div>
                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">状态(字典)<span style="color: red;">*</span></label>
                        <label class="layui-form-label">产品编号<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input id="status" name="status" placeholder="请输入状态(字典)" type="text" class="layui-input" lay-verify="required" required/>
                            <input id="productCode" name="productCode" placeholder="请输入产品编号" type="text" class="layui-input" lay-verify="required" required/>
                        </div>
                    </div>
                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">预留字段1<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input id="spareField1" name="spareField1" placeholder="请输入预留字段1" type="text" class="layui-input" lay-verify="required" required/>
                        </div>
                    </div>
                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">预留字段2<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input id="spareField2" name="spareField2" placeholder="请输入预留字段2" type="text" class="layui-input" lay-verify="required" required/>
                        </div>
                    </div>
<!--                    <div class="layui-inline layui-col-md12">-->
<!--                        <label class="layui-form-label">状态(字典)<span style="color: red;">*</span></label>-->
<!--                        <div class="layui-input-block">-->
<!--                            <input id="status" name="status" placeholder="请输入状态(字典)" type="text" class="layui-input" lay-verify="required" required/>-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">备注<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html
@@ -101,7 +101,7 @@
                </div>
            </div>
        </div>
        <div class="layui-col-sm9 layui-col-md9 layui-col-lg9">
        <div class="layui-col-sm6 layui-col-md6 layui-col-lg6">
            <div class="layui-card" style="height: 605px">
                <div class="layui-card-header" style="font-weight: bold">
                    <i class="layui-icon layui-icon-rate-solid"></i>操作栏
@@ -117,9 +117,11 @@
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                点击该Tab的任一标题,观察地址栏变化,再刷新页面。选项卡将会自动定位到上一次切换的项
                                <table class="layui-table" id="formulaChildInfoTable" lay-filter="formulaChildInfoTable"></table>
                            </div>
                            <div class="layui-tab-item">内容2</div>
                            <div class="layui-tab-item">
                                内容3
                            </div>
                            <div class="layui-tab-item">内容3</div>
                            <div class="layui-tab-item">内容4</div>
                            <div class="layui-tab-item">内容5</div>
@@ -128,9 +130,20 @@
                </div>
            </div>
        </div>
    </div>
        <div class="layui-col-sm3 layui-col-md3 layui-col-lg3">
            <div class="layui-card" style="height: 605px">
                <div class="layui-card-header" style="font-weight: bold">
                    <i class="layui-icon layui-icon-rate-solid"></i>图片
                </div>
                <div class="layui-card-body">
                    <img id="imgs" width="320px" height="270px">
                </div>
            </div>
        </div>
</div>
<style>
<!--    <img id="imgs" width="400px" height="380px">-->
    <style>
    .orderInfo {
        margin-bottom: 5px;  /* 设置换行后的下边距 */
    }