Skip to content

K
klck
Commit e7dc1375 authored by xiangjiaojunxp's avatar xiangjiaojunxp
Browse files
Options

物料转换bug修改

parent c41f3436
Show whitespace changes
Inline Side-by-side
Showing with 282 additions and 258 deletions
ruoyi-ui/src/views/login.vue
View file @ e7dc1375
...@@ -131,7 +131,6 @@ export default { ...@@ -131,7 +131,6 @@ export default {
Cookies.remove('rememberMe'); Cookies.remove('rememberMe');
} }
this.$store.dispatch("Login", this.loginForm).then(() => { this.$store.dispatch("Login", this.loginForm).then(() => {
debugger
this.$router.push({ path: this.redirect || "/" }).catch(()=>{}); this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false;
......
ruoyi-ui/src/views/system/supplies/index.vue
View file @ e7dc1375
...@@ -32,6 +32,9 @@ ...@@ -32,6 +32,9 @@
<el-option label="吕矿" :value="4"></el-option> <el-option label="吕矿" :value="4"></el-option>
<el-option label="钱家营矿" :value="5"></el-option> <el-option label="钱家营矿" :value="5"></el-option>
<el-option label="唐山矿" :value="6"></el-option> <el-option label="唐山矿" :value="6"></el-option>
<el-option label="宏丰公司矿业" :value="7"></el-option>
<el-option label="云飞公司矿业" :value="8"></el-option>
<el-option label="单侯煤矿" :value="9"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -373,8 +376,8 @@ export default { ...@@ -373,8 +376,8 @@ export default {
"status": 1, //激活状态 "status": 1, //激活状态
"order": 0, //工作表的下标 "order": 0, //工作表的下标
"hide": 0,//是否隐藏 "hide": 0,//是否隐藏
"row": 8, //行数 "row": 50, //行数
"column": 10, //列数 "column": 20, //列数
"defaultRowHeight": 19, //自定义行高 "defaultRowHeight": 19, //自定义行高
"defaultColWidth": 73, //自定义列宽 "defaultColWidth": 73, //自定义列宽
"celldata": [ "celldata": [
...@@ -1075,7 +1078,7 @@ export default { ...@@ -1075,7 +1078,7 @@ export default {
})); }));
} }
break; break;
//李志昊版 //OK版
case 7: { case 7: {
let map = new Map(); let map = new Map();
let smallMat = []; let smallMat = [];
...@@ -1143,36 +1146,36 @@ export default { ...@@ -1143,36 +1146,36 @@ export default {
} }
this.NewSixList=SixList*/ this.NewSixList=SixList*/
let SixMateriel=[]; let SixMateriel=[];
let MaterielCode=[]; let MaterielCode=[];
let NewMarterielCode=[]; let NewMarterielCode=[];
let SixList=[]; let SixList=[];
let newSmasll =smallMat; let newSmasll =smallMat;
SixMateriel=response.rows; SixMateriel=response.rows;NewMarterielCode= sortArray(SixMateriel)
NewMarterielCode= sortArray(SixMateriel)
try {
// //转化编码 // //转化编码
let p=0; let p=0;
for(var i=0;i<newSmasll.length;i++){ for(var i=0;i<newSmasll.length;i++){
for (var j = 0; j < NewMarterielCode.length; j++) { for (var j = 0; j < NewMarterielCode.length; j++) {
if(newSmasll[i] !== null){ if(newSmasll[i] !== null){
if(newSmasll[i].slice(0,NewMarterielCode[j].code.length)==NewMarterielCode[j].code){ if (NewMarterielCode[j] && NewMarterielCode[j].code && newSmasll[i].slice(0, NewMarterielCode[j].code.length) == NewMarterielCode[j].code) {
SixList[i]=NewMarterielCode[j].codes SixList[i] = NewMarterielCode[j].codes;
p++ p++;
break break;
}else{ } else {
SixList[i]='11' if (NewMarterielCode[j] && NewMarterielCode[j].code) { // 判断是否存在并具有code属性
p++ SixList[i] = '11';
p++;
} }
} }
} }
} }
}
let newSixList=SixList }catch(err){
//throw new Error("导入失败,转换编码运行错误,请检查对应规则");
}
var warn1 = 0,warn2 = 0;
for (let i = parseFloat(sysRulez[0].re) + 1, k = 0; i < data.length; i++, k++) { for (let i = parseFloat(sysRulez[0].re) + 1, k = 0; i < data.length; i++, k++) {
let values = []; let values = [];
if (data[i][key_i] != null) { if (data[i][key_i] != null) {
...@@ -1188,7 +1191,12 @@ export default { ...@@ -1188,7 +1191,12 @@ export default {
innerReject(error); // 异步请求出错 innerReject(error); // 异步请求出错
} }
} }
if(SixList[k]==undefined){
warn1++; //如果为空,统计为undefined
}else{
if(deps[k]==undefined){
warn2++;
}else{
let key = SixList[k] + '/' + deps[k]; let key = SixList[k] + '/' + deps[k];
if (map.has(key)) { if (map.has(key)) {
let oldValues = map.get(key); let oldValues = map.get(key);
...@@ -1200,6 +1208,11 @@ export default { ...@@ -1200,6 +1208,11 @@ export default {
map.set(key, values); map.set(key, values);
} }
} }
}
}
} }
...@@ -1281,18 +1294,30 @@ export default { ...@@ -1281,18 +1294,30 @@ export default {
config.borderInfo.push(bord); config.borderInfo.push(bord);
luckysheet.setConfig(config); luckysheet.setConfig(config);
modify = true; modify = true;
} else { }else{
warn++; warn++;
} }
}); });
if (warn === map.size) { if (warn === map.size) {
throw new Error("导入文件与所选模板规则不匹配"); throw new Error("导入文件与所选模板规则不匹配");
} else if (warn > 0) { }else if (warn > 0) {
this.$message({ this.$message({
message: "还有" + warn + "条大类未能匹配到", message: "还有" + warn + "条大类没匹配到,请仔细检查导入表",
type: "warning" type: "warning"
}); });
} }
if (warn1 > 0) {
this.$message({
message: "有" + warn1 + "条数据编码不存在,请仔细检查导入表",
type: "error"
});
}
if (warn2 > 0) {
this.$message({
message: "有" + warn2 + "条数据部门不存在,请仔细检查导入表",
type: "error"
});
}
// 记录结束时间 // 记录结束时间
const endTime = new Date().getTime(); const endTime = new Date().getTime();
// 计算执行时间（以毫秒为单位） // 计算执行时间（以毫秒为单位）
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment