yusijie
2024-10-15 85e7ae1c5451778043682c749ef60e39b1ca6b30
出站汇报单/生产订单列表分页查询修改;流转卡添加字段
3个文件已修改
48 ■■■■ 已修改文件
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -1139,8 +1139,8 @@
                                , data: data1.data
                                , height: 'full-120'
                                //, page: true
                                //, limits: [50, 500, 5000, 50000]
                                //, limit: 500
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html
@@ -1717,7 +1717,7 @@
                        default:
                    }
                }
                sWhere += "  and HBillSubType<>'SUB'";
                sWhere += "  and HBillSubType<>''SUB''";
                //sWhere = sWhere.replace(/'/g, "''");
                
@@ -1954,6 +1954,28 @@
                                    soulTable.render(this);
                                }
                            }
                            //判断是否有查看工价权限
                            $.ajax({
                                type: "get",
                                url: GetWEBURL() + "/Web/CheckProcPrice",
                                async: false,
                                data: { "UserName": sessionStorage["HUserName"] },
                                success: function (result) {
                                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                    } else {
                                        //无权限
                                        for (let i = 0; i < option.cols[0].length; i++) {
                                            if (option.cols[0][i].field == '工序工价') {
                                                option.cols[0][i].hide = true; //隐藏工价字段
                                            }
                                        }
                                    }
                                    layer.closeAll("loading");
                                }
                            })
                            ins = table.render(option);
                            laypage.render(optionPage);
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html
@@ -1055,7 +1055,8 @@
                    "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
                    "HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                    "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
                    "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
                }];
                table.render(option);
            }
@@ -1108,7 +1109,8 @@
                                "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
                                "HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                                "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                                "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                                "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
                                "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
                            }];
                            table.render(option);
                        }
@@ -1188,7 +1190,8 @@
                    , { field: 'HSupFlag', title: '是否委外', templet: '#HSupFlag' }
                    , { field: 'HQty', title: '流转卡数量', totalRow: true, edit: 'text', width:120 }
                    , { field: 'HSNCtrl', title: 'SN过站控制', templet: "#HSNCtrl", width: 120  }
                    , { field: 'HRoutingBillMainID', title: '工艺路线ID', hide: true }
                    , { field: 'HRoutingBillEntryID', title: '工艺路线子ID', hide: true }
                    //, { field: 'HWorkRemark', title: '加工说明', edit: 'text' }
                    //, { field: 'HDeptID', title: '部门ID', hide: true }
                    //, { field: 'HDeptNumber', title: '部门代码', edit: 'text', event: "HDeptCheck" }
@@ -1250,7 +1253,8 @@
                    "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
                    "HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                    "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
                    "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -1915,7 +1919,7 @@
                                "HQty": HLZQty, "HSNCtrl": data[i].SN过站控制 == 0 ? "false" : "true", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                                "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                                "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].工艺参数, "HPicNum": data[i].图纸编号, "HProcCheckNote": data[i].本工序确认记录,
                                "HRelationQty_OutBad": "0"
                                "HRelationQty_OutBad": "0", "HRoutingBillMainID": data[i].hmainid, "HRoutingBillEntryID": data[i].hsubid
                            });
                        }
                        option.data = Tablerow;
@@ -2253,7 +2257,8 @@
                    "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
                    "HQty": 0, "HSNCtrl": "false", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                    "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
                    "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
                }];
                table.render(option);
            }
@@ -2788,7 +2793,8 @@
                                "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
                                "HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                                "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                                "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                                "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
                                "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
                            }];
                            table.render(option);
                        }