diff --git a/src/views/biz/basicProcessPlan/index.vue b/src/views/biz/basicProcessPlan/index.vue index 9035d62..a213140 100644 --- a/src/views/biz/basicProcessPlan/index.vue +++ b/src/views/biz/basicProcessPlan/index.vue @@ -301,7 +301,6 @@ const columns: DataTableColumns = [ { type: 'selection' }, { title: '工序名称', key: 'name' }, { title: '工序编码', key: 'code' }, - { title: '工序顺序', key: 'sort' }, { title: '是否采购', key: 'procurement', render(row) { var opt = row.procurement @@ -540,6 +539,8 @@ async function loadDictOptions() { //开启关联质检项抽屉 function handleOpenRelateModel(row) { + relatePagination.page = 1 + relatePagination.pageSize = 10 relateLoading.value = true qualityItemModel.value = true qualityItemRelate.processId = row.id @@ -583,6 +584,7 @@ const isAllCheck = computed({ }else{ selectQualityItemIds.value = [] } + loadQualityItemCreateApi() } }) @@ -592,19 +594,24 @@ const handleAllCheck = (val:boolean) => { const onCheckedChange = async (keys:number[]) =>{ selectQualityItemIds.value = keys - qualityItemRelate.qualityItemIds = selectQualityItemIds.value - try{ - await qcitemProcessApi.qualityItemcreate(qualityItemRelate); - message.success("关联成功") - getQualityList(qualityItemRelate.processId) - - }catch(error) { - message.error("关联失败") - } + + loadQualityItemCreateApi() } - +const loadQualityItemCreateApi = async()=> { + qualityItemRelate.qualityItemIds = selectQualityItemIds.value + qualityItemRelate.page = relatePagination.page + qualityItemRelate.pageSize = relatePagination.pageSize + try{ + await qcitemProcessApi.qualityItemcreate(qualityItemRelate); + message.success("关联成功") + getQualityList(qualityItemRelate.processId) + + }catch(error) { + message.error("关联失败") + } +} const getRowKey = (row: any) => row.id const qualityItemColums: DataTableColumns = [ diff --git a/src/views/biz/device/index.vue b/src/views/biz/device/index.vue index 91ec2e7..a677b4c 100644 --- a/src/views/biz/device/index.vue +++ b/src/views/biz/device/index.vue @@ -503,7 +503,7 @@ async function loadDictOptions() { //加载工段 async function loadSection() { - const data = await sectionApi.list() + const data = await sectionApi.listNoParam() sectionList = data.map((d:any)=> ({ label: d.sectionName, value: (Number(d.id) || d.id) })) } diff --git a/src/views/biz/qualityItem/index.vue b/src/views/biz/qualityItem/index.vue index 5746540..9920109 100644 --- a/src/views/biz/qualityItem/index.vue +++ b/src/views/biz/qualityItem/index.vue @@ -258,7 +258,7 @@ const qcProcessRelate =ref ({ const relateLoading = ref(false) const relatePagination = reactive({ page: 1, - pageSize: 2, + pageSize: 10, itemCount: 0, showSizePicker: true, pageSizes: [10, 20, 50] @@ -690,6 +690,8 @@ async function downloadPlans(row: any) { //关联工序抽屉 function handleProccess(row) { + relatePagination.page = 1 + relatePagination.pageSize = 10 relateLoading.value = true processModel.value = true qcProcessRelate.qualityItemId = row.id @@ -730,6 +732,7 @@ const isAllCheck = computed({ }else{ selectedProcessIds.value = [] } + loadCreateApi() } }) @@ -742,17 +745,24 @@ function rowKey(row: RowData) { const handleUpateCheck = async (keys: Array,) =>{ selectedProcessIds.value = keys - - qcProcessRelate.processIds = selectedProcessIds.value - qcProcessRelate.page = relatePagination.page - qcProcessRelate.pageSize = relateLoading.pageSize - try{ - await qcitemProcessApi.create(qcProcessRelate); - message.success("关联成功") - getProcessList(qcProcessRelate.qualityItemId) - }catch(error) { - message.error("关联失败") - } + + loadCreateApi() +} + + +const loadCreateApi = async ()=>{ + qcProcessRelate.processIds = selectedProcessIds.value + qcProcessRelate.page = relatePagination.page + qcProcessRelate.pageSize = relatePagination.pageSize + console.log(qcProcessRelate); + + try{ + await qcitemProcessApi.create(qcProcessRelate); + message.success("关联成功") + getProcessList(qcProcessRelate.qualityItemId) + }catch(error) { + message.error("关联失败") + } } const processColumns: DataTableColumns = [ diff --git a/src/views/biz/stationhandover/index.vue b/src/views/biz/stationhandover/index.vue index 5e41844..7f00221 100644 --- a/src/views/biz/stationhandover/index.vue +++ b/src/views/biz/stationhandover/index.vue @@ -47,18 +47,6 @@ 新增 - - - 导入 - - - - 导出{{ selectedIds.length > 0 ? `(${selectedIds.length})` : '' }} - - - - 删除 - @@ -88,28 +76,17 @@ :options="deviceList" /> - - - - - - - + + @@ -230,9 +207,6 @@ const columns: DataTableColumns = [ return h('div', { style: { display: 'flex', alignItems: 'center', gap: '8px', flexWrap: 'nowrap' } }, [ h(NButton, { size: 'small', quaternary: true, onClick: () => handleEdit(row) }, { default: () => [h(NIcon, null, { default: () => h(CreateOutline) }), ' 编辑'] - }), - h(NButton, { size: 'small', quaternary: true, type: 'error', onClick: () => handleDelete(row) }, { - default: () => [h(NIcon, null, { default: () => h(TrashOutline) }), ' 删除'] }) ]) } @@ -432,7 +406,7 @@ async function loadDictOptions() { //加载工段 async function loadSection() { - const res = await sectionApi.list(); + const res = await sectionApi.listNoParam(); sectionList.value = res.map((n:any) =>{ return { label:n.sectionName,