Browse Source

修改模糊查询

linshi20240813
parent
commit
709a27db6b
  1. 1
      src/views/qms/inspectionJob/index.vue
  2. 16
      src/views/qms/inspectionRecord/index.vue
  3. 2
      src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
  4. 14
      src/views/qms/inspectionRecordFirst/index.vue
  5. 16
      src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts

1
src/views/qms/inspectionJob/index.vue

@ -290,7 +290,6 @@ const buttonTableClick = async (val, row) => {
} }
} }
//
// //
const reportHeight = ref(window.innerHeight - 120) const reportHeight = ref(window.innerHeight - 120)
const showQualityReport = ref(false) const showQualityReport = ref(false)

16
src/views/qms/inspectionRecord/index.vue

@ -116,6 +116,7 @@ import UseAddForm from './useAddForm.vue'
import AddForm from './addForm.vue' import AddForm from './addForm.vue'
import Detail from './detail.vue' import Detail from './detail.vue'
import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain' import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
import { getReportUrl } from '@/utils/systemParam'
import { import {
InspectionJobMain, InspectionJobMain,
@ -234,7 +235,8 @@ const butttondata = (row) => {
// hide:row.useDecision, // hide:row.useDecision,
// hasPermi: 'qms:inspection-recode-main:execute', // hasPermi: 'qms:inspection-recode-main:execute',
// }), // // }), //
defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }) // defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), //
defaultButtons.mainListPlanCheckQualityReportBtn({}) //
] ]
} }
@ -278,12 +280,24 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainOrderPub') { } else if (val == 'mainOrderPub') {
// //
handleOrderPub(row) handleOrderPub(row)
}else if (val == 'mainPlanCheckQualityReport') {
//
checkQualityReport(row)
} else if (val == 'edit') { } else if (val == 'edit') {
// //
// //
execute('execute', row) execute('execute', row)
} }
} }
//
const reportHeight = ref(window.innerHeight - 120)
const showQualityReport = ref(false)
const qualityReport = ref('')
const checkQualityReport = async (row) => {
showQualityReport.value = true
qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
}
/** 添加/修改操作 */ /** 添加/修改操作 */
const basicFormRef = ref() const basicFormRef = ref()
// const openForm = async (type : string, row ?: number) => { // const openForm = async (type : string, row ?: number) => {

2
src/views/qms/inspectionRecord/inspectionRecordMain.data.ts

@ -603,7 +603,7 @@ export const InspectionRecordMain = useCrudSchemas(
isForm: false, isForm: false,
isDetail: false, isDetail: false,
table: { table: {
width: 250, width: 300,
fixed: 'right' fixed: 'right'
} }
} }

14
src/views/qms/inspectionRecordFirst/index.vue

@ -62,6 +62,7 @@
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import AddForm from '../inspectionRecordFirst/addForm.vue' import AddForm from '../inspectionRecordFirst/addForm.vue'
import Detail from './detail.vue' import Detail from './detail.vue'
import { getReportUrl } from '@/utils/systemParam'
import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../inspectionTemplate/inspectionTemplate.data' import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../inspectionTemplate/inspectionTemplate.data'
@ -138,8 +139,8 @@ const buttonBaseClick = (val, item) => {
defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:update' }), // defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:update' }), //
defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:delete' }), // defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:delete' }), //
defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, 'publish'), hasPermi: 'qms:inspection-recode-first-main:pub' }), // defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, 'publish'), hasPermi: 'qms:inspection-recode-first-main:pub' }), //
defaultButtons.mainExport({ hide: !row.isPublished }),// defaultButtons.mainExport({ hide: !row.isPublished }),//
defaultButtons.mainListPlanCheckQualityReportBtn({}) //
] ]
} }
@ -155,10 +156,21 @@ const buttonBaseClick = (val, item) => {
handleDelete(row.id) handleDelete(row.id)
}else if (val == 'mainOrderPub') { // }else if (val == 'mainOrderPub') { //
handleOrderPub(row) handleOrderPub(row)
}else if (val == 'mainPlanCheckQualityReport') {
//
checkQualityReport(row)
} else if (val == 'mainExport') { } else if (val == 'mainExport') {
// //
handleMainExport(row) handleMainExport(row)
} }
}
//
const reportHeight = ref(window.innerHeight - 120)
const showQualityReport = ref(false)
const qualityReport = ref('')
const checkQualityReport = async (row) => {
showQualityReport.value = true
qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
const basicFormRef = ref() const basicFormRef = ref()

16
src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts

@ -145,13 +145,27 @@ export const InspectionRecordMain = useCrudSchemas(
disabled: false disabled: false
} }
}, },
{
label: '发货单号',
field: 'asnNumber',
sort: 'custom',
isSearch: true,
form: {
componentProps: {
disabled: true
}
},
table: {
width: 180
}
},
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',
isForm: false, isForm: false,
isDetail: false, isDetail: false,
table: { table: {
width: 200, width: 300,
fixed: 'right' fixed: 'right'
} }
} }

Loading…
Cancel
Save