|
@@ -40,7 +40,7 @@
|
|
|
const baseDialog = ref(null)
|
|
|
const selectedProcess = ref(0)
|
|
|
const processList = ref([])
|
|
|
- const isNormalLot = ref("true")
|
|
|
+ const isNormalLot = ref(true)
|
|
|
const curProcessId = ref('')
|
|
|
const processSquence = ref([])
|
|
|
const carrierList = ref([])
|
|
@@ -50,7 +50,7 @@
|
|
|
console.log(store.planDetails)
|
|
|
console.log(data)
|
|
|
if(data == 1) {
|
|
|
- isNormalLot.value = "false"
|
|
|
+ isNormalLot.value = false
|
|
|
}
|
|
|
// getProcessList({
|
|
|
// deptId: store.curDeptDetails.deptId,
|
|
@@ -87,7 +87,6 @@
|
|
|
let filteredData = resp.data.filter((item1) =>
|
|
|
res.data.some((item2) => item2.processCode === item1.processCode)
|
|
|
);
|
|
|
- console.log("filteredData",filteredData);
|
|
|
var processAliasList = [];
|
|
|
for (let i = 0; i < filteredData.length; i++) {
|
|
|
if(processAliasList.includes(filteredData[i].processAlias)) {
|
|
@@ -99,7 +98,6 @@
|
|
|
value: filteredData[i].id
|
|
|
}
|
|
|
}
|
|
|
- console.log("processAliasList",processAliasList)
|
|
|
}
|
|
|
console.log(processList.value)
|
|
|
/* 处理结果格式 */
|
|
@@ -186,8 +184,7 @@
|
|
|
let filteredData = resp.data.filter((item1) =>
|
|
|
res.data.some((item2) => item2.processCode === item1.processCode)
|
|
|
);
|
|
|
- for (let i = 0; i < filteredData.length; i++) {
|
|
|
- var processAliasList = [];
|
|
|
+ for (let i = 0; i < filteredData.length; i++) {
|
|
|
if(processAliasList.includes(filteredData[i].processAlias)) {
|
|
|
continue;
|
|
|
}else {
|
|
@@ -195,9 +192,9 @@
|
|
|
processList.value[i] = {
|
|
|
text: filteredData[i].processAlias,
|
|
|
value: filteredData[i].id
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
/* 处理结果格式 */
|
|
|
carrierList.value = changeResultStructure(response.data);
|