SunLiang
/
DAYE_RDMS_CCFLOW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复被委托人无法审批，修复发起审批后撤回无法再次发起审批问题

Browse Source
master
孙亮 4 months ago
parent f5c0aafc8f
commit 6397bd05a1
6 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File

60
CCFlow/CCFlow/DataUser/JSLibData/MyFlowPublic.js
Unescape Escape View File

@ -118,7 +118,7 @@ function beforeSend() {
var zlydbh = $("#TB_ZLYDBH").val(); var zlydbh = $("#TB_ZLYDBH").val();
if (jsbzxybh !== undefined && jsbzxybh !== null) { if (jsbzxybh !== undefined && jsbzxybh !== null) {
if (zlydbh !== undefined && zlydbh !== null) { if (zlydbh !== undefined && zlydbh !== null) {
var JSXYSP = "SELECT JSBZXYBH,ZLYDBH FROM Frm_JiShuXieYiShenPi WHERE JSBZXYBH='" + jsbzxybh.trim() + "' AND ZLYDBH='" + zlydbh.trim() + "' AND WFState = '2'"; var JSXYSP = "SELECT JSBZXYBH,ZLYDBH FROM Frm_JiShuXieYiShenPi WHERE JSBZXYBH='" + jsbzxybh.trim() + "'AND OID !=" + workid + " AND ZLYDBH='" + zlydbh.trim() + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(JSXYSP); var isHave = DBAccess.RunSQLReturnTable(JSXYSP);
if (isHave.length > 0) { if (isHave.length > 0) {
alert("该技术协议编号:“" + jsbzxybh.trim() + "”与质量要点编号:“" + zlydbh.trim() + "”已经发起审批。"); alert("该技术协议编号:“" + jsbzxybh.trim() + "”与质量要点编号:“" + zlydbh.trim() + "”已经发起审批。");
@ -126,7 +126,7 @@ function beforeSend() {
} }
} }
else { else {
var JSXYSP = "SELECT JSBZXYBH,ZLYDBH FROM Frm_JiShuXieYiShenPi WHERE JSBZXYBH='" + jsbzxybh.trim() + "' AND WFState = '2'"; var JSXYSP = "SELECT JSBZXYBH,ZLYDBH FROM Frm_JiShuXieYiShenPi WHERE JSBZXYBH='" + jsbzxybh.trim() + "' AND OID !=" + workid + " AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(JSXYSP); var isHave = DBAccess.RunSQLReturnTable(JSXYSP);
if (isHave.length > 0) { if (isHave.length > 0) {
alert("该技术协议编号:“" + jsbzxybh.trim() + "”已经发起审批。"); alert("该技术协议编号:“" + jsbzxybh.trim() + "”已经发起审批。");
@ -136,7 +136,7 @@ function beforeSend() {
} }
else { else {
if (zlydbh !== undefined && zlydbh !== null) { if (zlydbh !== undefined && zlydbh !== null) {
var JSXYSP = "SELECT JSBZXYBH,ZLYDBH FROM Frm_JiShuXieYiShenPi WHERE ZLYDBH='" + zlydbh.trim() + "' AND WFState = '2'"; var JSXYSP = "SELECT JSBZXYBH,ZLYDBH FROM Frm_JiShuXieYiShenPi WHERE ZLYDBH='" + zlydbh.trim() + "' AND OID !=" + workid + " AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(JSXYSP); var isHave = DBAccess.RunSQLReturnTable(JSXYSP);
if (isHave.length > 0) { if (isHave.length > 0) {
alert("该质量要点编号:“" + zlydbh.trim() + "”已经发起审批。"); alert("该质量要点编号:“" + zlydbh.trim() + "”已经发起审批。");
@ -277,7 +277,7 @@ function beforeSend() {
var bh = ccfrom["TB_PC_NO"].value; var bh = ccfrom["TB_PC_NO"].value;
//大棒轧钢工艺卡 //大棒轧钢工艺卡
if (fk_flow == '004') { if (fk_flow == '004' && nodeID == '401') {
var JSXYSP = "SELECT PC_NO FROM Frm_DBZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'"; var JSXYSP = "SELECT PC_NO FROM Frm_DBZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(JSXYSP); var isHave = DBAccess.RunSQLReturnTable(JSXYSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -289,7 +289,7 @@ function beforeSend() {
} }
//219钢管厂轧管工艺卡 //219钢管厂轧管工艺卡
if (fk_flow == '013') { if (fk_flow == '013' && nodeID == '1301') {
var GYKSP = "SELECT PC_NO FROM Frm_F219GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM Frm_F219GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -298,7 +298,7 @@ function beforeSend() {
} }
} }
//460钢管厂轧管工艺卡 //460钢管厂轧管工艺卡
if (fk_flow == '015') { if (fk_flow == '015' && nodeID == '1501') {
var GYKSP = "SELECT PC_NO FROM Frm_F460GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM Frm_F460GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -307,7 +307,7 @@ function beforeSend() {
} }
} }
//170钢管厂热处理工艺卡 //170钢管厂热处理工艺卡
if (fk_flow == '014') { if (fk_flow == '014' && nodeID == '1401') {
var GYKSP = "SELECT PC_NO FROM Frm_F170GGCRCLGYK WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM Frm_F170GGCRCLGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -316,7 +316,7 @@ function beforeSend() {
} }
} }
//170钢管厂轧管工艺卡 //170钢管厂轧管工艺卡
if (fk_flow == '010') { if (fk_flow == '010' && nodeID == '1001') {
var GYKSP = "SELECT PC_NO FROM Frm_F170GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM Frm_F170GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -325,7 +325,7 @@ function beforeSend() {
} }
} }
//扁棒厂轧钢工艺卡 //扁棒厂轧钢工艺卡
if (fk_flow == '038') { if (fk_flow == '038' && nodeID == '3801') {
var GYKSP = "SELECT PC_NO FROM FB_STEEL_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM FB_STEEL_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -334,7 +334,7 @@ function beforeSend() {
} }
} }
//小棒厂热处理（调质)工艺卡 //小棒厂热处理（调质)工艺卡
if (fk_flow == '032') { if (fk_flow == '032' && nodeID == '3201') {
var GYKSP = "SELECT PC_NO FROM SS_TEMPER_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM SS_TEMPER_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -343,7 +343,7 @@ function beforeSend() {
} }
} }
//大棒厂轧钢工艺卡 //大棒厂轧钢工艺卡
if (fk_flow == '004') { if (fk_flow == '004' && nodeID == '401') {
var GYKSP = "SELECT PC_NO FROM Frm_DBZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM Frm_DBZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -352,7 +352,7 @@ function beforeSend() {
} }
} }
//中棒厂轧钢工艺卡 //中棒厂轧钢工艺卡
if (fk_flow == '019') { if (fk_flow == '019' && nodeID == '1901') {
var GYKSP = "SELECT PC_NO FROM Frm_ZBCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM Frm_ZBCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -361,7 +361,7 @@ function beforeSend() {
} }
} }
//小棒厂轧钢工艺卡 //小棒厂轧钢工艺卡
if (fk_flow == '020') { if (fk_flow == '020' && nodeID == '2001') {
var GYKSP = "SELECT PC_NO FROM Frm_XBCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM Frm_XBCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -370,7 +370,7 @@ function beforeSend() {
} }
} }
//小棒厂热处理工艺卡 //小棒厂热处理工艺卡
if (fk_flow == '031') { if (fk_flow == '031' && nodeID == '3101') {
var GYKSP = "SELECT PC_NO FROM SS_HEATT_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM SS_HEATT_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -379,7 +379,7 @@ function beforeSend() {
} }
} }
//特冶厂真空自耗炼钢工艺卡 //特冶厂真空自耗炼钢工艺卡
if (fk_flow == '047') { if (fk_flow == '047' && nodeID == '4701') {
var GYKSP = "SELECT PC_NO FROM SSP_VIM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM SSP_VIM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -388,7 +388,7 @@ function beforeSend() {
} }
} }
//特冶厂电渣炼钢工艺卡 //特冶厂电渣炼钢工艺卡
if (fk_flow == '044') { if (fk_flow == '044' && nodeID == '4401') {
var GYKSP = "SELECT PC_NO FROM SSP_ES_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM SSP_ES_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -397,7 +397,7 @@ function beforeSend() {
} }
} }
//特冶厂真空感应炼钢工艺卡 //特冶厂真空感应炼钢工艺卡
if (fk_flow == '048') { if (fk_flow == '048' && nodeID == '4801') {
var GYKSP = "SELECT PC_NO FROM SSP_VI_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM SSP_VI_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -406,7 +406,7 @@ function beforeSend() {
} }
} }
//电炉厂连铸炼钢工艺卡 //电炉厂连铸炼钢工艺卡
if (fk_flow == '028') { if (fk_flow == '028' && nodeID == '2801') {
var GYKSP = "SELECT PC_NO FROM EFF_CCS_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM EFF_CCS_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -415,7 +415,7 @@ function beforeSend() {
} }
} }
//电炉厂自耗母材炼钢工艺卡 //电炉厂自耗母材炼钢工艺卡
if (fk_flow == '046') { if (fk_flow == '046' && nodeID == '4601') {
var GYKSP = "SELECT PC_NO FROM SSP_CBM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM SSP_CBM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -424,7 +424,7 @@ function beforeSend() {
} }
} }
//电炉厂电渣母材炼钢工艺卡 //电炉厂电渣母材炼钢工艺卡
if (fk_flow == '045') { if (fk_flow == '045' && nodeID == '4501') {
var GYKSP = "SELECT PC_NO FROM SSP_EBM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM SSP_EBM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -433,7 +433,7 @@ function beforeSend() {
} }
} }
//电炉厂模铸炼钢工艺卡 //电炉厂模铸炼钢工艺卡
if (fk_flow == '043') { if (fk_flow == '043' && nodeID == '4301') {
var GYKSP = "SELECT PC_NO FROM EFF_DCS_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM EFF_DCS_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -442,7 +442,7 @@ function beforeSend() {
} }
} }
//电炉系列连铸工艺卡 //电炉系列连铸工艺卡
if (fk_flow == '050') { if (fk_flow == '050' && nodeID == '5001') {
var GYKSP = "SELECT PC_NO FROM EFF_CC_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM EFF_CC_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -451,7 +451,7 @@ function beforeSend() {
} }
} }
//电炉厂钢锭炼钢工艺卡 //电炉厂钢锭炼钢工艺卡
if (fk_flow == '023') { if (fk_flow == '023' && nodeID == '2301') {
var GYKSP = "SELECT PC_NO FROM SSP_SIR_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM SSP_SIR_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -460,7 +460,7 @@ function beforeSend() {
} }
} }
//转炉厂炼钢工艺卡 //转炉厂炼钢工艺卡
if (fk_flow == '025') { if (fk_flow == '025' && nodeID == '2501') {
var GYKSP = "SELECT PC_NO FROM CP_SM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM CP_SM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -469,7 +469,7 @@ function beforeSend() {
} }
} }
//转炉系列连铸工艺卡 //转炉系列连铸工艺卡
if (fk_flow == '049') { if (fk_flow == '049' && nodeID == '4901') {
var GYKSP = "SELECT PC_NO FROM CS_CC_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM CS_CC_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -478,7 +478,7 @@ function beforeSend() {
} }
} }
//锻造厂锻造工艺卡 //锻造厂锻造工艺卡
if (fk_flow == '024') { if (fk_flow == '024' && nodeID == '2401') {
var GYKSP = "SELECT PC_NO FROM TF_FORGING_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM TF_FORGING_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -487,7 +487,7 @@ function beforeSend() {
} }
} }
//锻造厂热处理工艺卡 //锻造厂热处理工艺卡
if (fk_flow == '033') { if (fk_flow == '033' && nodeID == '3301') {
var GYKSP = "SELECT PC_NO FROM TF_HEATT_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM TF_HEATT_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -496,7 +496,7 @@ function beforeSend() {
} }
} }
//锻造厂调质工艺卡 //锻造厂调质工艺卡
if (fk_flow == '040') { if (fk_flow == '040' && nodeID == '4001') {
var GYKSP = "SELECT PC_NO FROM TF_TEMPER_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM TF_TEMPER_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -505,7 +505,7 @@ function beforeSend() {
} }
} }
//锻造厂固溶时效工艺卡 //锻造厂固溶时效工艺卡
if (fk_flow == '041') { if (fk_flow == '041' && nodeID == '4101') {
var GYKSP = "SELECT PC_NO FROM TF_SA_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM TF_SA_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {
@ -514,7 +514,7 @@ function beforeSend() {
} }
} }
//锻造厂固溶球化退火工艺卡 //锻造厂固溶球化退火工艺卡
if (fk_flow == '062') { if (fk_flow == '062' && nodeID == '6201') {
var GYKSP = "SELECT PC_NO FROM TF_SSA_PC WHERE PC_NO='" + bh + "' AND WFState = '2'"; var GYKSP = "SELECT PC_NO FROM TF_SSA_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP); var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) { if (isHave.length > 0) {

24
CCFlow/CCFlow/WF/CCForm/Ath.js
Unescape Escape View File

@ -640,11 +640,27 @@ function GetSortLenth_FromDB(sort, dbs) {
//文件数据流 //文件数据流
function GetFileStream(mypk, FK_FrmAttachment) { function GetFileStream(mypk, FK_FrmAttachment) {
var Url = ""; var Url = "";
//if (plant == "CCFlow") {
// Url = basePath + "/WF/Comm/ProcessRequest?DoType=HttpHandler&DoMethod=AttachmentUpload_Down&HttpHandlerName=BP.WF.HttpHandler.WF_CCForm&WorkID=" + GetQueryString("WorkID") + "&FK_Node=" + GetQueryString("FK_Node") + "&MyPK=" + mypk;
//} else {
// //按照数据流模式下载。
// Url = basePath + "/WF/Ath/downLoad.do?MyPK=" + mypk + "&FK_FrmAttachment=" + FK_FrmAttachment;
//}
var nodeID = GetQueryString("FK_Node");
var workID = GetQueryString("WorkID");
if (plant == "CCFlow") { if (plant == "CCFlow") {
Url = basePath + "/WF/Comm/ProcessRequest?DoType=HttpHandler&DoMethod=AttachmentUpload_Down&HttpHandlerName=BP.WF.HttpHandler.WF_CCForm&WorkID=" + GetQueryString("WorkID") + "&FK_Node=" + GetQueryString("FK_Node") + "&MyPK=" + mypk; var handler = new HttpHandler("BP.WF.HttpHandler.WF_CCForm");
} else { handler.AddPara("WorkID", workID);
//按照数据流模式下载。 handler.AddPara("FK_Node", nodeID);
Url = basePath + "/WF/Ath/downLoad.do?MyPK=" + mypk + "&FK_FrmAttachment=" + FK_FrmAttachment; handler.AddPara("MyPK", mypk);
var fileUrl = handler.DoMethodReturnString("AttachmentUpload_Down");
if (typeof fileUrl === "string" && fileUrl.indexOf("/DataUser/") != -1 && fileUrl.indexOf("url@") == 0) {
var url = fileUrl.replace("url@", "");
//window.open(window.location.origin + url);
return url;
}
SetHref(basePath + "/WF/Comm/ProcessRequest?DoType=HttpHandler&DoMethod=AttachmentUpload_Down&HttpHandlerName=BP.WF.HttpHandler.WF_CCForm&WorkID=" + workID + "&FK_Node=" + nodeID + "&MyPK=" + mypk);
return;
} }
return Url; return Url;

12
CCFlow/CCFlow/WF/CCForm/ChapterFrmView.htm
Unescape Escape View File

@ -114,10 +114,10 @@
var iframes = $(thisForm).find("iframe"); var iframes = $(thisForm).find("iframe");
for (var j = 0; j < iframes.length; j++) { for (var j = 0; j < iframes.length; j++) {
$(iframes[j]).load(function () { //$(iframes[j]).load(function () {
var mainheight = $(this).contents().find("body").height(); // var mainheight = $(this).contents().find("body").height() + 15;
$(this).height(mainheight); // $(this).height(mainheight);
}); //});
} }
loadData(group, 1); loadData(group, 1);
return; return;
@ -246,8 +246,8 @@
htm += '</div>'; htm += '</div>';
} else if (list[i].CtrlType == "Ath") { } else if (list[i].CtrlType == "Ath") {
var url = basePath + "/WF/CCForm/Ath.htm?1=1&AthPK=" + list[i].CtrlID + "&OID=" + oid + "&FK_MapData=" + frmID + "&FK_Node=" + GetQueryString("FK_Node") + "&IsReadonly=1"; var url = basePath + "/WF/CCForm/Ath.htm?1=1&AthPK=" + list[i].CtrlID + "&OID=" + oid + "&FK_MapData=" + frmID + "&FK_Node=" + GetQueryString("FK_Node") + "&IsReadonly=1";
htm += '<div class="layui-form">'; htm += '<div class="layui-form" style="height:45vh">';
htm += '<iframe id="' + list[i].OID + '" src="' + url + '" frameborder="0" style="width: 100%;height:auto;" scrolling="no" ></iframe>'; htm += '<iframe id="' + list[i].OID + '" src="' + url + '" frameborder="0" style="width: 100%;height:100%;" scrolling="no" ></iframe>';
htm += '</div>'; htm += '</div>';
} else if (list[i].CtrlType == "ChapterFrmLinkFrm") { } else if (list[i].CtrlType == "ChapterFrmLinkFrm") {
var url = basePath + "/WF/CCForm/Frm.htm?IsReadonly=1&FrmID=" + list[i].CtrlID + "&OID=" + oid + "&FK_MapData=" + list[i].CtrlID + "&FK_Node=" + GetQueryString("FK_Node"); var url = basePath + "/WF/CCForm/Frm.htm?IsReadonly=1&FrmID=" + list[i].CtrlID + "&OID=" + oid + "&FK_MapData=" + list[i].CtrlID + "&FK_Node=" + GetQueryString("FK_Node");

4
CCFlow/CCFlow/WF/CCForm/JS/FileUpload/css/fileUpload.css
Unescape Escape View File

@ -141,8 +141,8 @@
} }
.image-item { .image-item {
width: 75px !important; width: 400px !important;
height: 75px; height: 400px;
background-image: url(./iconfont-tianjia.png); background-image: url(./iconfont-tianjia.png);
background-size: 100% 100%; background-size: 100% 100%;
display: inline-block; display: inline-block;

3
CCFlow/CCFlow/WF/Scripts/layui/style/admin.css
Unescape Escape View File

@ -624,7 +624,8 @@ html {
.layui-fluid { .layui-fluid {
padding: 15px; padding: 15px;
/*background:pink;*/ /*background:pink;*/
height:100vh; /* height: 100vh;
*/ height: auto;
box-sizing: border-box; box-sizing: border-box;
} }

2
CCFlow/Components/BP.WF/WF/WorkNode.cs
Unescape Escape View File

@ -5617,7 +5617,7 @@ namespace BP.WF
} }
if ((userNo == null && userNo == "" )|| (gwl.EmpNo.Equals(WebUser.No) == false)) if ((userNo == null && userNo == "" )&& (gwl.EmpNo.Equals(WebUser.No) == false))
continue; continue;
//设置当前不可以用. //设置当前不可以用.

Write Preview
Loading…
Cancel
Save