|
@@ -264,7 +264,7 @@
|
|
@change="($e) => onBatchRecordChange($e, scope.$index)"
|
|
@change="($e) => onBatchRecordChange($e, scope.$index)"
|
|
>
|
|
>
|
|
<el-option
|
|
<el-option
|
|
- v-for="option in batchListOption.concat(qcList) as any[]"
|
|
|
|
|
|
+ v-for="option in computedOption as any[]"
|
|
:key="option.id"
|
|
:key="option.id"
|
|
:value="option.id"
|
|
:value="option.id"
|
|
:label="
|
|
:label="
|
|
@@ -768,7 +768,7 @@ let batchListOption = computed(() =>
|
|
subList.value
|
|
subList.value
|
|
.filter(
|
|
.filter(
|
|
(i) =>
|
|
(i) =>
|
|
- i.Batch_Record && i.Batch_Record.name && i.Batch_Record.name.length,
|
|
|
|
|
|
+ i.Batch_Record && i.Batch_Record.name && i.Batch_Record.name.length > 0,
|
|
)
|
|
)
|
|
.map((i) => {
|
|
.map((i) => {
|
|
return {
|
|
return {
|
|
@@ -783,7 +783,9 @@ let batchListOption = computed(() =>
|
|
self.findIndex((t) => t.Name === item.Name && t.id === item.id),
|
|
self.findIndex((t) => t.Name === item.Name && t.id === item.id),
|
|
),
|
|
),
|
|
)
|
|
)
|
|
-
|
|
|
|
|
|
+let computedOption = computed(() => {
|
|
|
|
+ return qcList.value.concat(batchListOption.value)
|
|
|
|
+})
|
|
let getSubList = (e: any = {}) => {
|
|
let getSubList = (e: any = {}) => {
|
|
if (e.id) currentRow.value = e
|
|
if (e.id) currentRow.value = e
|
|
loading.value = true
|
|
loading.value = true
|