1.以下基础资料 测试并完善功能; 供应商,职员,物料,客户,班组 (测试必录项目,新增,修改,删除,审核,反审核 等功能,有图片预览的 完善图片预览以及上传功能)
2.客户 增加字段 领用人 HMateOutEmp varchar(100) 生产班组 增加 字段 劳务单位 HCompName varchar(200)
3个文件已修改
96 ■■■■ 已修改文件
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group_Add_Edit.html
@@ -71,7 +71,12 @@
                                                <input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">劳务单位</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HCompName" lay-verify="HCompName" id="HCompName">
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs8 layui-inline">
                                                <label class="layui-form-label" style="width: 12.5%;">备注</label>
@@ -294,6 +299,7 @@
                                , "HDeptID": data.HDeptID
                                , "HHelpCode": data.助记码
                                , "HBarCodeForBase": data.条码编号
                                ,"HCompName":data.劳务单位
                                , "HProcID": data.HProcID
                                , "HProcName": data.工序
                                , "HStopflag": data.禁用标记
WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier_Edit.html
@@ -46,20 +46,20 @@
                            <div class="layui-inline">
                                <label class="layui-form-label">创建组织</label>
                                <div class="layui-input-inline" style="margin-right: 0px;width: 100px;">
                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="宁波四维尔" readonly="readonly" style="width: 134%;">
                                    <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input" >
                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="" readonly="readonly" style="width: 134%;">
                                    <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="0" autocomplete="off" class="layui-input" >
                                </div>
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID_BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label">使用组织</label>
                                <div class="layui-input-inline" style="margin-right: 0px; width: 100px;">
                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="宁波四维尔" readonly="readonly" style="width: 134%;">
                                    <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="" readonly="readonly" style="width: 134%;">
                                    <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="0" autocomplete="off" class="layui-input">
                                </div>
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID_BT" style=" margin-left: 36px; width: 42px; padding: 0 10px;">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                            </div>
@@ -577,6 +577,14 @@
                window.location.reload();
                $("#HCreator").val(sessionStorage["HUserName"]);//创建人
            });
            //创建组织
            form.on('submit(HCreateOrgID_BT)', function () {
                HCreateOrgID_BT();
            });
            //使用组织
            form.on('submit(HUseOrgID_BT)', function () {
                HUseOrgID_BT();
            });
            //#endregion
@@ -603,6 +611,10 @@
                    },
                    success: function (d) {
                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
                        $("#HCreateOrgID").val(d.data[0].HCREATEORGID);
                        $("#HCreateOrg").val(d.data[0].创建组织);
                        $("#HUseOrgID").val(d.data[0].HUSEORGID);
                        $("#HUseOrg").val(d.data[0].使用组织);
                        $("#HNumber").val(d.data[0].编码);
                        $("#HHelpCode").val(d.data[0].助记码);
                        $("#HShortName").val(d.data[0].简称);
@@ -631,7 +643,7 @@
                        $("#HRemark").val(d.data[0].备注);
                        $("#HUpDater").val(sessionStorage["HUserName"]);//修改人
                        $("input[name='HStopflag']").prop("checked", d.data[0].禁用标志);//true:选中 false:不选中
                        $('#HMaterClass').find("option[value='" + data[0].供货材料类别 + "']").attr("selected", true);
                        $('#HMaterClass').find("option[value='" + d.data[0].供货材料类别 + "']").attr("selected", true);
                        form.render('select');
                        layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话
@@ -698,6 +710,57 @@
                    return true;
                }
            }
            //获取创建组织
            function HCreateOrgID_BT() {
                //获取创建组织列
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '组织列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Xt_ORGANIZATIONSList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HCreateOrg").val(checkStatus.data[0].组织名称);
                        $("#HCreateOrgID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //获取使用组织
            function HUseOrgID_BT() {
                //获取使用组织列
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '组织列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Xt_ORGANIZATIONSList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HUseOrg").val(checkStatus.data[0].组织名称);
                        $("#HUseOrgID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
        });
WebTM/views/»ù´¡×ÊÁÏ/ÏúÊÛ»ù´¡×ÊÁÏ/Gy_Customer_Edit.html
@@ -90,9 +90,15 @@
                                                        <input type="text" name="HRemark" id="HRemark" lay-verify="" autocomplete="off" class="layui-input">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">领用人</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="HMateOutEmp" id="HMateOutEmp" lay-verify="" autocomplete="off" class="layui-input">
                                                    </div>
                                                </div>
                                                <div class="layui-row">
                                                    <div class="layui-col-xs8 layui-inline">
                                                        <label class="layui-form-label" >创建组织*</label>
                                                        <label class="layui-form-label">创建组织*</label>
                                                        <div class="layui-input-inline" style="margin-bottom: -15px;">
                                                            <div class="layui-form">
                                                                <div class="layui-form-item" style="width: 265%;">
@@ -106,7 +112,7 @@
                                                </div>
                                                <div class="layui-row">
                                                    <div class="layui-col-xs8 layui-inline">
                                                        <label class="layui-form-label" >使用组织*</label>
                                                        <label class="layui-form-label">使用组织*</label>
                                                        <div class="layui-input-inline" style="margin-bottom: -15px;">
                                                            <div class="layui-form">
                                                                <div class="layui-form-item" style="width: 265%;">
@@ -790,6 +796,7 @@
                        $("input[name='HStopflag']").prop("checked", d.data[0].禁用标志);//true:选中 false:不选中
                        layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话
                        $("#HRemark").val(d.data[0].备注);
                        $("#HMateOutEmp").val(d.data[0].领用人);
                        $("#HUpDater").val(sessionStorage["HUserName"]);//修改人
                        $("#HSSName").val(d.data[0].结算方式);
                        $("#HSSID").val(d.data[0].结算方式ID);