diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue index 254be7c..ced66df 100644 --- a/src/views/tested/device/model/components/list.vue +++ b/src/views/tested/device/model/components/list.vue @@ -17,7 +17,7 @@ category: '', equipmentName: '', helpInstruction: '', - inspectable: [], + inspectable: '', model: '', offset: 1, limit: 20, @@ -76,7 +76,8 @@ // 获取数据 const fetchData = (isNowPage = true) => { listLoading.value = true - getModelList({ ...listQuery, inspectable: listQuery.inspectable.length === 2 ? '1,2' : listQuery.inspectable.join() }).then((response) => { + // inspectable: listQuery.inspectable.length === 2 ? '1,2' : listQuery.inspectable.join() + getModelList({ ...listQuery }).then((response) => { list.value = response.data.rows.map((item: any) => ({ ...item, helpInstruction: item.helpInstruction ? item.helpInstruction : '/' })) total.value = parseInt(response.data.total) listLoading.value = false @@ -147,7 +148,7 @@ offset: undefined, limit: undefined, ids: selectList.value.map(item => item.id), - inspectable: listQuery.inspectable.join(), + // inspectable: listQuery.inspectable.join(), } exportModelList(data).then((res) => { exportFile(res.data, '设备规格型号') @@ -266,7 +267,7 @@ // 重置 const reset = () => { listQuery.equipmentType = '' - listQuery.inspectable = [] + listQuery.inspectable = '' listQuery.category = '' listQuery.equipmentName = '' listQuery.helpInstruction = '' @@ -371,9 +372,11 @@ - + + + diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue index 254be7c..ced66df 100644 --- a/src/views/tested/device/model/components/list.vue +++ b/src/views/tested/device/model/components/list.vue @@ -17,7 +17,7 @@ category: '', equipmentName: '', helpInstruction: '', - inspectable: [], + inspectable: '', model: '', offset: 1, limit: 20, @@ -76,7 +76,8 @@ // 获取数据 const fetchData = (isNowPage = true) => { listLoading.value = true - getModelList({ ...listQuery, inspectable: listQuery.inspectable.length === 2 ? '1,2' : listQuery.inspectable.join() }).then((response) => { + // inspectable: listQuery.inspectable.length === 2 ? '1,2' : listQuery.inspectable.join() + getModelList({ ...listQuery }).then((response) => { list.value = response.data.rows.map((item: any) => ({ ...item, helpInstruction: item.helpInstruction ? item.helpInstruction : '/' })) total.value = parseInt(response.data.total) listLoading.value = false @@ -147,7 +148,7 @@ offset: undefined, limit: undefined, ids: selectList.value.map(item => item.id), - inspectable: listQuery.inspectable.join(), + // inspectable: listQuery.inspectable.join(), } exportModelList(data).then((res) => { exportFile(res.data, '设备规格型号') @@ -266,7 +267,7 @@ // 重置 const reset = () => { listQuery.equipmentType = '' - listQuery.inspectable = [] + listQuery.inspectable = '' listQuery.category = '' listQuery.equipmentName = '' listQuery.helpInstruction = '' @@ -371,9 +372,11 @@ - + + + diff --git a/src/views/tested/subpackage/task/components/list.vue b/src/views/tested/subpackage/task/components/list.vue index 669804c..472ed28 100644 --- a/src/views/tested/subpackage/task/components/list.vue +++ b/src/views/tested/subpackage/task/components/list.vue @@ -80,7 +80,7 @@ }, { text: '外送设备数量', - value: 'createTime', + value: 'equipmentNum', align: 'center', }, {