|
@@ -495,17 +495,17 @@ export default {
|
|
|
// this.getSpanArr(this.tableData.data)
|
|
|
},
|
|
|
changename(name, obj) {
|
|
|
- try {
|
|
|
+ try {
|
|
|
const keys = this.dictsKeys,
|
|
|
no = keys.find(
|
|
|
(ele) => this.dicts["PROCEDURE_TYPE_NAME"][ele] == name
|
|
|
),
|
|
|
- n = no ? no[no.length - 1] : -2;
|
|
|
+ n = no ? no[no.length - 1] : -2;
|
|
|
if (obj.index == 1) {
|
|
|
- obj["no"] = `OP0${n}`;
|
|
|
- }else{
|
|
|
+ obj["no"] = `OP0${n}`;
|
|
|
+ }else{
|
|
|
obj["no"] = name.indexOf("上料")>-1? `OP${obj.xh-1}${n}`: `OP${obj.xh}${n}`;
|
|
|
- }
|
|
|
+ }
|
|
|
this.getType(n, obj);
|
|
|
} catch (error) {
|
|
|
console.log(error);
|
|
@@ -597,7 +597,7 @@ export default {
|
|
|
this.validateMsg = "";
|
|
|
return false;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
obj.procedureList = obj.procedureList.map((ele) => {
|
|
|
let obj = {};
|
|
|
for (let property in ele) {
|
|
@@ -633,11 +633,12 @@ export default {
|
|
|
let index = this.tableData.data.length - 1;
|
|
|
let item = this.tableData.data[index] || {};
|
|
|
let keys = this.dictsKeys;
|
|
|
- for (let i = 0, len = 3; i <= len; i++) {
|
|
|
+ for (let i = 0, len = 2; i <= len; i++) {
|
|
|
let obj = {};
|
|
|
let xh = (item.xh || 0) + 1;
|
|
|
obj.xh = xh;
|
|
|
// obj.index = index + 1 + i + 1;
|
|
|
+ console.log(this.titleMap)
|
|
|
for (let key in this.titleMap) {
|
|
|
obj[key] = "";
|
|
|
|
|
@@ -655,12 +656,13 @@ export default {
|
|
|
obj[key] = `设备序`;
|
|
|
}
|
|
|
obj.isinput = true;
|
|
|
+ obj.isadd = true;
|
|
|
// obj.no = keys.find(
|
|
|
// (ele) => this.dicts["PROCEDURE_TYPE_NAME"][ele] == "设备序"
|
|
|
// );
|
|
|
obj.no = `OP${xh}0`;
|
|
|
}
|
|
|
- if (i == 2) {
|
|
|
+ /*if (i == 2) {
|
|
|
if (key == "name") {
|
|
|
obj[key] = `清洗${xh}`;
|
|
|
}
|
|
@@ -669,8 +671,8 @@ export default {
|
|
|
// (ele) => this.dicts["PROCEDURE_TYPE_NAME"][ele] == "清洗"
|
|
|
// );
|
|
|
obj.no = `OP${xh}1`;
|
|
|
- }
|
|
|
- if (i == 3) {
|
|
|
+ }*/
|
|
|
+ if (i == 2) {
|
|
|
if (key == "name") {
|
|
|
obj[key] = `OP${xh}0下料`;
|
|
|
}
|
|
@@ -682,9 +684,10 @@ export default {
|
|
|
if (key == "sort") obj[key] = (item.sort || 101) - i - 1;
|
|
|
let n = obj.no ? obj.no[obj.no.length - 1] : -2;
|
|
|
obj.content = obj.name;
|
|
|
- this.getType(n, obj);
|
|
|
+ this.getType(n, obj);
|
|
|
}
|
|
|
this.tableData.data.push(obj);
|
|
|
+ console.log("this.tableData.data",this.tableData.data)
|
|
|
this.getSpanArr(this.tableData.data);
|
|
|
}
|
|
|
} catch (error) {
|
|
@@ -739,7 +742,7 @@ export default {
|
|
|
}
|
|
|
if (n == 8) {
|
|
|
obj["content"] = `热处理上料`;
|
|
|
- obj["type"] = `工序上料`;
|
|
|
+ obj["type"] = `工序上料`;
|
|
|
}
|
|
|
},
|
|
|
clear(row) {
|
|
@@ -756,7 +759,7 @@ export default {
|
|
|
this.tableData.data.splice(row.index - 1, 1);
|
|
|
this.getSpanArr(this.tableData.data);
|
|
|
return;
|
|
|
- }
|
|
|
+ }
|
|
|
for (let key in this.titleMap) {
|
|
|
//if (key == "sort") continue;
|
|
|
if(["sort","type","no"].includes(key)) continue;
|
|
@@ -783,7 +786,7 @@ export default {
|
|
|
.then(() => {
|
|
|
let data_del = this.tableData.data.filter((ele) => ele.xh == row.xh);
|
|
|
let data = this.tableData.data.filter((ele) => ele.xh != row.xh);
|
|
|
-
|
|
|
+
|
|
|
for (let i = 0, len = data.length; i < len; i++) {
|
|
|
if (data[i].xh > row.xh) {
|
|
|
data[i].sort = +data[i].sort + data_del.length; //更新排序值
|
|
@@ -866,7 +869,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- } catch (error) {
|
|
|
+ } catch (error) {
|
|
|
console.log(error);
|
|
|
}
|
|
|
this.loading = false;
|
|
@@ -915,25 +918,26 @@ export default {
|
|
|
// return;
|
|
|
let arr = res.data.data.map((ele) => ele.xh);
|
|
|
arr = Array.from(new Set(arr));
|
|
|
- arr = arr.map((xh) => ({ xh }));
|
|
|
- for (let item of arr) {
|
|
|
- item.children = res.data.data.filter((ele) => ele.xh == item.xh);
|
|
|
- item.children[1].isinput = true;
|
|
|
+ arr = arr.map((xh) => ({ xh }));
|
|
|
+ for (let item of arr) {
|
|
|
+ item.children = res.data.data.filter((ele) => ele.xh == item.xh);
|
|
|
+ item.children[1].isinput = true;
|
|
|
item.children[2].isadd = true;
|
|
|
if(item.children.length>4){
|
|
|
- item.children.forEach((ele, index)=>{
|
|
|
+ item.children.forEach((ele, index)=>{
|
|
|
if(index>2 && index!=item.children.length-1){
|
|
|
ele.isdel = true
|
|
|
}
|
|
|
})
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
this.tableData.data = res.data.data;
|
|
|
|
|
|
if (this.tableData.data == "") {
|
|
|
+ console.log("经过这里")
|
|
|
this.$nextTick(() => this.add());
|
|
|
- } else {
|
|
|
+ } else {
|
|
|
this.getSpanArr(this.tableData.data);
|
|
|
}
|
|
|
|