diff --git a/Pages/page/Graphic/PatternManager/PattrenList.html b/Pages/page/Graphic/PatternManager/PattrenList.html index d1a61c4..f224047 100644 --- a/Pages/page/Graphic/PatternManager/PattrenList.html +++ b/Pages/page/Graphic/PatternManager/PattrenList.html @@ -141,7 +141,7 @@ delete files[index] } } - $('#LAY-excel-upload').next().val(''); + //$('#LAY-excel-upload').next().val(''); uploadExcel(fileArr) // 如果只需要最新选择的文件，可以这样写： uploadExcel([files.pop()]) } }); @@ -321,10 +321,11 @@ // 读取数据的同时梳理数据 fields: { 'number': 'C', + 'projectcode': 'F', 'patterntype': 'G', - 'filename': 'J', 'signaturecode': 'H', 'subcode': 'I', + 'filename': 'J', 'pictureframe': 'K', 'remark': 'L', } @@ -332,19 +333,131 @@ var dataArr = data[0].Sheet1; //数据校验 if (dataArr.length > 1) { - //从1开始，避过标题 + //从2开始，避过标题和说明列 for (let index = 2; index < dataArr.length; index++) { + //校验项目编号是否存在 + if (dataArr[index].projectcode != '' && dataArr[index].projectcode != undefined && dataArr[index].projectcode != null) { + //获取所有项目编号 + $.ajax({ + url: apiUrl + '/api/services/app/Project/GetProjectParams', //请求的url地址 + dataType: "json", //返回格式为json + async: false,//请求是否异步，默认为异步，这也是ajax重要特性 + data: {}, //参数值 + type: 'GET', //请求方式 + success: function (req) { + //请求成功时处理 + var isHave = 0; + for (let x = 0; x < req.result.arrData.length; x++) { + if (req.result.arrData[x].code == dataArr[index].projectcode) { + isHave = 1; + } + } + if (isHave == 0) { + layer.msg("序号：" + dataArr[index].number + " 的数据，项目编号不存在，请检查！"); + return false; + } + }, + }); + } + else { + layer.msg("序号：" + dataArr[index].number + " 的数据，项目编号为空，请检查！"); + return false; + } if (dataArr[index].patterntype != 0 && dataArr[index].patterntype != 2 && dataArr[index].patterntype != 5 && dataArr[index].patterntype != 6 && dataArr[index].patterntype != 8) { //图样类型 layer.msg("序号：" + dataArr[index].number + " 的数据，图样类型有误，请检查！"); return false; } if (dataArr[index].patterntype == 5 || dataArr[index].patterntype == 6 || dataArr[index].patterntype == 8) { + //特征码 if (dataArr[index].signaturecode == '' || dataArr[index].signaturecode == null || dataArr[index].signaturecode == undefined) { layer.msg("序号：" + dataArr[index].number + " 的数据，特征码不能为空，请检查！"); return false; } + //特征码不为空，根据不同的图样类型与数据库进行比对 + var url = ""; + if (dataArr[index].patterntype == 5) { + url = "/api/services/app/MaterialNumber/GetAllMaterialNumber"; + } + else if (dataArr[index].patterntype == 6) { + url = "/api/services/app/MarketableNumber/GetAllMarketableNumber"; + } + else if (dataArr[index].patterntype == 8) { + url = "/api/services/app/PartNumber/GetAllPartNumber"; + } + //给下拉框赋值 特征号 + $.ajax({ + url: apiUrl + url, //请求的url地址 + dataType: "json", //返回格式为json + async: false,//请求是否异步，默认为异步，这也是ajax重要特性 + data: {}, //参数值 + type: "GET", //请求方式 + success: function (req) { + //请求成功时处理 + var isHave = 0; + $.each(req.result.data, function (index, item) { + var code = ''; + if (dataArr[index].patterntype == 5) { + code = item.materialNum; + } + else if (dataArr[index].patterntype == 6) { + code = item.marketableNum; + } + else if (dataArr[index].patterntype == 8) { + code = item.partNum; + } + + if (dataArr[index].signaturecode == code) { + isHave = 1; + } + }); + + if (isHave == 0) { + layer.msg("序号：" + dataArr[index].number + " 的数据，特征码不存在，请检查！"); + return false; + } + + for (let z = 0; z < req.result.data.length; z++) { + var name = req.result.data[index].remark; + var code = ''; + if (dataArr[index].patterntype == 5) { + code = req.result.data[index].materialNum; + } + else if (dataArr[index].patterntype == 6) { + code = req.result.data[index].marketableNum; + } + else if (dataArr[index].patterntype == 8) { + code = req.result.data[index].partNum; + } + if (code == dataArr[index].signaturecode) { + if (name != dataArr[index].filename) { + layer.msg("序号：" + dataArr[index].number + " 的数据，当图样类型为5,6,8时，图样名称只能为特征码对应的名称，请检查！"); + return false; + } + } + } + } + }); + } + else if (dataArr[index].patterntype == 0 || dataArr[index].patterntype == 2) { + if (dataArr[index].filename == '' || dataArr[index].filename == undefined || dataArr[index].filename == null) { + layer.msg("序号：" + dataArr[index].number + " 的数据，图样名称不能为空，请检查！"); + return false; + } + else { + if (dataArr[index].patterntype == 0) { + if (dataArr[index].filename.indexOf('原理图') == -1) { + layer.msg("序号：" + dataArr[index].number + " 的数据，图样类型为0时，图样名称必须为原理图，请检查！"); + return false; + } + } + } + + if (dataArr[index].signaturecode != '' || dataArr[index].signaturecode != null || dataArr[index].signaturecode != undefined) { + layer.msg("序号：" + dataArr[index].number + " 的数据，特征码不需要填写，请检查！"); + return false; + } } if (dataArr[index].subcode != '' && dataArr[index].subcode != null && dataArr[index].subcode != undefined) { //附加尾号 @@ -381,7 +494,7 @@ url: apiUrl + '/api/services/app/GalleryFiles/GetGalleryFilesTypeCount', //请求的url地址 dataType: "json", //返回格式为json //async: false,//请求是否异步，默认为异步，这也是ajax重要特性 - data: { Type: dataArr[index].patterntype }, //参数值 + data: { Type: dataArr[index].patterntype + dataArr[index].projectcode }, //参数值 type: "GET", //请求方式 success: function (req) { //请求成功时处理 @@ -410,16 +523,31 @@ }, }); - var FileNumber = getFileNumber(dataArr[index].patterntype, dataArr[index].signaturecode, order, dataArr[index].subcode); - var ProjectCode = getQueryString('ProjectCode'); + var FileNumber = getFileNumber(dataArr[index].patterntype, dataArr[index].projectcode, dataArr[index].signaturecode, order, dataArr[index].subcode); + var PID = ''; + $.ajax({ + url: apiUrl + '/api/services/app/Project/GetProjectParams', //请求的url地址 + dataType: "json", //返回格式为json + async: false,//请求是否异步，默认为异步，这也是ajax重要特性 + data: {}, //参数值 + type: 'GET', //请求方式 + success: function (req) { + //请求成功时处理 + for (let x = 0; x < req.result.arrData.length; x++) { + if (req.result.arrData[x].code == dataArr[index].projectcode) { + PID = req.result.arrData[x].id; + } + } + }, + }); $.ajax({ url: apiUrl + "/api/services/app/GalleryFiles/CreateGalleryFiles", //请求的url地址 dataType: "json", //返回格式为json //async: false,//请求是否异步，默认为异步，这也是ajax重要特性 contentType: 'application/json', data: JSON.stringify({ - projectID: ProjectID, - projectCode: ProjectCode, + projectID: PID, + projectCode: dataArr[index].projectcode, patternType: dataArr[index].patterntype, fileNum: FileNumber, subCode: dataArr[index].subcode, @@ -457,16 +585,15 @@ } //创建编号 - function getFileNumber(patterntype, signaturecode, order, subcode) { - var ProjectCode = getQueryString('ProjectCode'); + function getFileNumber(patterntype, projectcode, signaturecode, order, subcode) { //文件编号 var fileNum = ''; if (patterntype == 5 || patterntype == 6 || patterntype == 8) { - fileNum = patterntype + ProjectCode + '-' + signaturecode + '-' + order; + fileNum = patterntype + projectcode + '-' + signaturecode + '-' + order; } else { - fileNum = patterntype + ProjectCode + order; + fileNum = patterntype + projectcode + order; } if (subcode != '' && subcode != undefined && subcode != null) { fileNum += '-' + '1~' + subcode; diff --git a/Pages/page/login.html b/Pages/page/login.html index 26eebfb..ad35cb5 100644 --- a/Pages/page/login.html +++ b/Pages/page/login.html @@ -354,17 +354,21 @@ // 进行登录操作 form.on("submit(login)", function (data) { + var ii = layer.load(2); data = data.field; if (data.username == "") { + layer.close(ii); layer.msg("用户名不能为空"); return false; } if (data.password == "") { + layer.close(ii); layer.msg("密码不能为空"); return false; } var password = b64_md5(data.password); var apiUrl = GetWebApiUrl(); + $.ajax({ url: apiUrl + "/api/services/app/UserInfo/GetLoginUser", //请求的url地址 dataType: "json", //返回格式为json @@ -376,10 +380,12 @@ var result = req.result; var totalCount = result.totalCount; if (totalCount > 1) { + layer.close(ii); layer.msg("存在多个重复账号，请联系管理员！"); return false; } if (totalCount == 0) { + layer.close(ii); layer.msg("账号或密码有误，请检查！"); return false; } @@ -406,6 +412,7 @@ } }); + layer.close(ii); layer.msg('登录成功', { time: 500 }, function () { window.location = '../index.html'; });