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

增加自定义按钮跳转工艺路线，修改通过接口创建工艺卡审批附件文件报错问题

Browse Source
master
孙亮 3 months ago
parent bf99f21fb9
commit 05594749c7
4 changed files with 81 additions and 51 deletions
Show Stats Download Patch File Download Diff File

51
CCFlow/CCFlow/DataUser/JSLibData/CCFormRef.js
Unescape Escape View File

@ -199,21 +199,40 @@ function chart() {
trData.FK_Flow = GetQueryString("FK_Flow");
pushArray.push(trData);
}
//localStorage.setItem('pushArray', JSON.stringify(pushArray));
let dtlData = JSON.stringify(pushArray);
let body = {}
body.code = '@host#control#openPage';
body.data = {
newPage: false,
params: {
dtlData
},
moduleId: 'b9ff8cfe-005a-1833-9445-bed425bf623a'
}
body.msg = '跳转';
body.to = 'iBKLinker-union-framework';
body.from = 'prd';
window.top?.postMessage(body, '*')
// 点击名称打开抽屉
var W = document.body.clientWidth - 150;
//const oFrame= window.open('https://craft.dayesteel.com.cn:9001/AProcessCard/WorkflowGraph')
OpenBootStrapModal('https://craft.dayesteel.com.cn:9001/AProcessCard/WorkflowGraph', "eudlgframe", "退火曲线生成", W, 600, "icon-edit", false);
setTimeout(() => {
//oFrame.postMessage(pushArray, '*');
let oFrame = document.getElementById('eudlgframe');
oFrame.contentWindow.postMessage(pushArray, '*');
}, 500)
}
function GongCheng() {
//TB_BeiZhu
var W = document.body.clientWidth - 150;
//WinOpenIt('https://craft.dayesteel.com.cn:9001/AProcessCard/RoutingPaths');
OpenBootStrapModal('https://craft.dayesteel.com.cn:9001/AProcessCard/RoutingPaths', "eudlgframe", "工艺路线", W, 600, "icon-edit", false);
window.addEventListener('message', function (e) {
if (e.data) {
//document.getElementById('TB_BeiZhu').innerHTML(e.data);
document.getElementById('TB_PROCESS_ROUTE').innerHTML(e.data);
}
})
// alert("11");
}
function WinOpenIt(url) {
var self = window.open(url, 'newwindow', 'height=500, width=700, top=150, left=150, toolbar=no, menubar=no, scrollbars=no, resizable=no,location=no, status=no');//window.open(url);
var loop = setInterval(function () {
if (self.closed) {
clearInterval(loop);
InitPage();
InitHomeCount();
}
}, 1);
}

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

@ -96,7 +96,7 @@ function beforeSend() {
var shenPiArr = ['021'];
var shenPiArr2 = ['002'];
var shenPiArr3 = ['061'];
var processArr = ['013', '004'];//219工艺卡-章节表单
var processArr = ['013', '014', '010', '015', '049', '025', '041', '033', '024', '040', '062', '038', '032', '004', '031', '020', '019', '050', '023', '028', '043', '045', '046', '047', '044', '048'];//219工艺卡-章节表单
var processArr02 = ['022', '016'];//银亮，冷拉工艺卡-开发者表单
var flow = new Entity("BP.WF.Flow", fk_flow);
var ptable = flow.PTable;
@ -236,7 +236,7 @@ function beforeSend() {
//重复审批判断
if (fk_flow == '008') {
var JSXYSP = "SELECT ZLYDBH FROM Frm_BCLZLYD WHERE ZLYDBH='" + bh + "' AND WFState = '3'";
var JSXYSP = "SELECT ZLYDBH FROM Frm_BCLZLYD WHERE ZLYDBH='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(JSXYSP);
if (isHave.length > 0) {
alert("该质量要点编号:“" + bh + "”已经发起创建流程。");
@ -246,7 +246,7 @@ function beforeSend() {
}
if (fk_flow == '029') {
var JSXYSP = "SELECT ZLYDBH FROM Frm_DCLZLYD WHERE ZLYDBH='" + bh + "' AND WFState = '3'";
var JSXYSP = "SELECT ZLYDBH FROM Frm_DCLZLYD WHERE ZLYDBH='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(JSXYSP);
if (isHave.length > 0) {
alert("该质量要点编号:“" + bh + "”已经发起创建流程。");
@ -256,7 +256,7 @@ function beforeSend() {
}
if (fk_flow == '009') {
var JSXYSP = "SELECT ZLYDBH FROM Frm_GCLZLYD WHERE ZLYDBH='" + bh + "' AND WFState = '3'";
var JSXYSP = "SELECT ZLYDBH FROM Frm_GCLZLYD WHERE ZLYDBH='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(JSXYSP);
if (isHave.length > 0) {
alert("该质量要点编号:“" + bh + "”已经发起创建流程。");
@ -276,8 +276,9 @@ function beforeSend() {
var mc = ccfrom["TB_PC_NAME"].value;
var bh = ccfrom["TB_PC_NO"].value;
//大棒轧钢工艺卡
if (fk_flow == '004') {
var JSXYSP = "SELECT PC_NO FROM Frm_DBZGGYK WHERE PC_NO='" + bh + "' AND WFState = '3'";
var JSXYSP = "SELECT PC_NO FROM Frm_DBZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(JSXYSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -289,7 +290,7 @@ function beforeSend() {
//219钢管厂轧管工艺卡
if (fk_flow == '013') {
var GYKSP = "SELECT PC_NO FROM Frm_F219GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM Frm_F219GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -298,7 +299,7 @@ function beforeSend() {
}
//460钢管厂轧管工艺卡
if (fk_flow == '015') {
var GYKSP = "SELECT PC_NO FROM Frm_F460GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM Frm_F460GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -307,7 +308,7 @@ function beforeSend() {
}
//170钢管厂热处理工艺卡
if (fk_flow == '014') {
var GYKSP = "SELECT PC_NO FROM Frm_F170GGCRCLGYK WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM Frm_F170GGCRCLGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -316,7 +317,7 @@ function beforeSend() {
}
//170钢管厂轧管工艺卡
if (fk_flow == '010') {
var GYKSP = "SELECT PC_NO FROM Frm_F170GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM Frm_F170GGCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -325,7 +326,7 @@ function beforeSend() {
}
//扁棒厂轧钢工艺卡
if (fk_flow == '038') {
var GYKSP = "SELECT PC_NO FROM FB_STEEL_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM FB_STEEL_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -334,7 +335,7 @@ function beforeSend() {
}
//小棒厂热处理（调质)工艺卡
if (fk_flow == '032') {
var GYKSP = "SELECT PC_NO FROM SS_TEMPER_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM SS_TEMPER_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -343,7 +344,7 @@ function beforeSend() {
}
//大棒厂轧钢工艺卡
if (fk_flow == '004') {
var GYKSP = "SELECT PC_NO FROM Frm_DBZGGYK WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM Frm_DBZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -352,7 +353,7 @@ function beforeSend() {
}
//中棒厂轧钢工艺卡
if (fk_flow == '019') {
var GYKSP = "SELECT PC_NO FROM Frm_ZBCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM Frm_ZBCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -361,7 +362,7 @@ function beforeSend() {
}
//小棒厂轧钢工艺卡
if (fk_flow == '020') {
var GYKSP = "SELECT PC_NO FROM Frm_XBCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM Frm_XBCZGGYK WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -370,7 +371,7 @@ function beforeSend() {
}
//小棒厂热处理工艺卡
if (fk_flow == '031') {
var GYKSP = "SELECT PC_NO FROM SS_HEATT_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM SS_HEATT_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -379,7 +380,7 @@ function beforeSend() {
}
//特冶厂真空自耗炼钢工艺卡
if (fk_flow == '047') {
var GYKSP = "SELECT PC_NO FROM SSP_VIM_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM SSP_VIM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -388,7 +389,7 @@ function beforeSend() {
}
//特冶厂电渣炼钢工艺卡
if (fk_flow == '044') {
var GYKSP = "SELECT PC_NO FROM SSP_ES_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM SSP_ES_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -397,7 +398,7 @@ function beforeSend() {
}
//特冶厂真空感应炼钢工艺卡
if (fk_flow == '048') {
var GYKSP = "SELECT PC_NO FROM SSP_VI_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM SSP_VI_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -406,7 +407,7 @@ function beforeSend() {
}
//电炉厂连铸炼钢工艺卡
if (fk_flow == '028') {
var GYKSP = "SELECT PC_NO FROM EFF_CCS_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM EFF_CCS_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -415,7 +416,7 @@ function beforeSend() {
}
//电炉厂自耗母材炼钢工艺卡
if (fk_flow == '046') {
var GYKSP = "SELECT PC_NO FROM SSP_CBM_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM SSP_CBM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -424,7 +425,7 @@ function beforeSend() {
}
//电炉厂电渣母材炼钢工艺卡
if (fk_flow == '045') {
var GYKSP = "SELECT PC_NO FROM SSP_EBM_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM SSP_EBM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -433,7 +434,7 @@ function beforeSend() {
}
//电炉厂模铸炼钢工艺卡
if (fk_flow == '043') {
var GYKSP = "SELECT PC_NO FROM EFF_DCS_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM EFF_DCS_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -442,7 +443,7 @@ function beforeSend() {
}
//电炉系列连铸工艺卡
if (fk_flow == '050') {
var GYKSP = "SELECT PC_NO FROM EFF_CC_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM EFF_CC_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -451,7 +452,7 @@ function beforeSend() {
}
//电炉厂钢锭炼钢工艺卡
if (fk_flow == '023') {
var GYKSP = "SELECT PC_NO FROM SSP_SIR_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM SSP_SIR_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -460,7 +461,7 @@ function beforeSend() {
}
//转炉厂炼钢工艺卡
if (fk_flow == '025') {
var GYKSP = "SELECT PC_NO FROM CP_SM_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM CP_SM_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -469,7 +470,7 @@ function beforeSend() {
}
//转炉系列连铸工艺卡
if (fk_flow == '049') {
var GYKSP = "SELECT PC_NO FROM CS_CC_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM CS_CC_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -478,7 +479,7 @@ function beforeSend() {
}
//锻造厂锻造工艺卡
if (fk_flow == '024') {
var GYKSP = "SELECT PC_NO FROM TF_FORGING_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM TF_FORGING_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -487,7 +488,7 @@ function beforeSend() {
}
//锻造厂热处理工艺卡
if (fk_flow == '033') {
var GYKSP = "SELECT PC_NO FROM TF_HEATT_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM TF_HEATT_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -496,7 +497,7 @@ function beforeSend() {
}
//锻造厂调质工艺卡
if (fk_flow == '040') {
var GYKSP = "SELECT PC_NO FROM TF_TEMPER_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM TF_TEMPER_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -505,7 +506,7 @@ function beforeSend() {
}
//锻造厂固溶时效工艺卡
if (fk_flow == '041') {
var GYKSP = "SELECT PC_NO FROM TF_SA_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM TF_SA_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -514,7 +515,7 @@ function beforeSend() {
}
//锻造厂固溶球化退火工艺卡
if (fk_flow == '062') {
var GYKSP = "SELECT PC_NO FROM TF_SSA_PC WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM TF_SSA_PC WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起创建流程。");
@ -540,7 +541,7 @@ function beforeSend() {
var bh = $('input[name=TB_PC_NO]')[0].value;
//重复审批判断
var GYKSP = "SELECT PC_NO FROM Frm_GYKSPB WHERE PC_NO='" + bh + "' AND WFState = '3'";
var GYKSP = "SELECT PC_NO FROM Frm_GYKSPB WHERE PC_NO='" + bh + "' AND WFState = '2'";
var isHave = DBAccess.RunSQLReturnTable(GYKSP);
if (isHave.length > 0) {
alert("该工艺卡编号:“" + bh + "”已经发起过审批流程。");

3
CCFlow/CCFlow/WF/CCForm/ChapterFrm.htm
Unescape Escape View File

@ -38,6 +38,9 @@
<script src="../../WF/CCForm/FrmEnd.js"></script>
<script src="../Comm/JScript.js"></script>
<script src="../../WF/Portal/layui-v2.9.6/layui.js" type="text/javascript"></script>
<script src="../../DataUser/JSLibData/CCFormRef.js" type="text/javascript"></script>
<script type="text/javascript" src="../Scripts/bootstrap/BootstrapUIDialog.js"></script>
<script language="javascript" type="text/javascript">
var frmID = null;
var oid = null;

9
CCFlow/Components/BP.WF/Dev2Interface.cs
Unescape Escape View File

@ -21,6 +21,7 @@ using ICSharpCode.SharpZipLib.Zip;
using BP.Pub;
using System.Text;
using Aliyun.OSS;
using System.Web.UI.WebControls;
namespace BP.WF
{
@ -9559,7 +9560,13 @@ namespace BP.WF
{
string fileName = dr[0].ToString(); //文件名称. 我的附件.
string fileUrl = dr[1].ToString(); //文件路径. http://xxx.xxx.xxx/myfile.doc;
byte[] base64DecodedBytes = Convert.FromBase64String(fileUrl);
var encryptedContent = fileUrl.Trim().Replace("%", "").Replace(",", "").Replace(" ", "+");
//base字符串必须被4整除，不足的在末尾填充'='号
if (encryptedContent.Length % 4 > 0)
{
encryptedContent = encryptedContent.PadRight(encryptedContent.Length + 4 - encryptedContent.Length % 4, '=');
}
byte[] base64DecodedBytes = Convert.FromBase64String(encryptedContent);
string base64DecodedfileUrl = System.Text.Encoding.UTF8.GetString(base64DecodedBytes);

Write Preview
Loading…
Cancel
Save