Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

hella_online_20240924
zhaoxuebing 2 months ago
parent
commit
72a119c95f
  1. 5
      src/api/wms/supplierdeliverRequestMain/index.ts
  2. 1
      src/locales/en-US.ts
  3. 1
      src/locales/zh-CN.ts
  4. 3
      src/permission.ts
  5. 10
      src/router/modules/remaining.ts
  6. 11
      src/utils/disposition/defaultButtons.ts
  7. 20
      src/views/qms/inspectionJob/index.vue
  8. 2
      src/views/qms/inspectionJob/inspectionJobMain.data.ts
  9. 16
      src/views/qms/inspectionRecord/index.vue
  10. 2
      src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
  11. 2
      src/views/qms/inspectionRecord/inspectionRecordPurchase.vue
  12. 18
      src/views/qms/inspectionRequest/index.vue
  13. 2
      src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
  14. 4
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
  15. 3
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
  16. 34
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  17. 8
      src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/productionreturnRecordMainHold.data.ts
  18. 2
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue
  19. 42
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierResume/index.vue

5
src/api/wms/supplierdeliverRequestMain/index.ts

@ -125,3 +125,8 @@ export const importTemplate = () => {
export const deleteOldLabels = async (id) => { export const deleteOldLabels = async (id) => {
return await request.post({ url: `/wms/supplierdeliver-request-main/deleteOldLabels?id=` + id }) return await request.post({ url: `/wms/supplierdeliver-request-main/deleteOldLabels?id=` + id })
} }
// 查看履历表
export const querySupplierResume = (asnNumber:string) => {
return request.get({ url: `/wms/supplierdeliver-request-main/querySupplierResume?asnNumber=` + asnNumber })
}

1
src/locales/en-US.ts

@ -757,6 +757,7 @@ export default {
2:'Material Description2', 2:'Material Description2',
:'Item Code', :'Item Code',
:'Quality inspection details', :'Quality inspection details',
:'Details of your resume',
:'Add Attachment', :'Add Attachment',
:'Change Record', :'Change Record',
:'Add Detail', :'Add Detail',

1
src/locales/zh-CN.ts

@ -759,6 +759,7 @@ export default {
2:'物料描述2', 2:'物料描述2',
:'项目代码', :'项目代码',
:'质检明细', :'质检明细',
:'履历表明细',
:'添加附件', :'添加附件',
:'变更记录', :'变更记录',
:'添加明细', :'添加明细',

3
src/permission.ts

@ -23,7 +23,8 @@ const whiteList = [
'/bind', '/bind',
'/register', '/register',
'/oauthLogin/gitee', '/oauthLogin/gitee',
'/purchasereceiptReport' '/purchasereceiptReport',
'/supplierResume'
] ]
// 路由加载前 // 路由加载前

10
src/router/modules/remaining.ts

@ -265,6 +265,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
noTagsView: true noTagsView: true
} }
}, },
{
path: '/supplierResume',
component: () => import('@/views/wms/purchasereceiptManage/supplierdeliver/supplierResume/index.vue'),
name: 'supplierResume',
meta: {
hidden: true,
title: t('ts.查看履历表'),
noTagsView: true
}
},
{ {
path: '/bpm', path: '/bpm',
component: Layout, component: Layout,

11
src/utils/disposition/defaultButtons.ts

@ -772,6 +772,17 @@ export function mainListPlanCheckQualityReportBtn(option: any) {
hasPermi: '' hasPermi: ''
}) })
} }
export function mainListSupplierResumeBtn(option: any) {
return __defaultBtnOption(option, {
label: t(`ts.查看履历表`).replace('ts.', ''),
name: 'mainSupplierResume',
hide: false,
type: 'primary',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
})
}
// 主列表-计划流程-提交审批按钮 // 主列表-计划流程-提交审批按钮
export function mainListPlanSubBtn(option: any) { export function mainListPlanSubBtn(option: any) {

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

@ -78,7 +78,7 @@
/> />
<el-dialog <el-dialog
v-model="showQualityReport" v-model="showQualityReport"
:title="t('质检明细')" :title="reportTitle"
:append-to-body="false" :append-to-body="false"
destroy-on-close destroy-on-close
fullscreen fullscreen
@ -285,7 +285,10 @@ const butttondata = (row) => {
defaultButtons.mainListPackageBtn(null), // defaultButtons.mainListPackageBtn(null), //
defaultButtons.mainListPlanCheckQualityReportBtn({ defaultButtons.mainListPlanCheckQualityReportBtn({
hide: isShowMainButton3(row) hide: isShowMainButton3(row)
}) // }), //
defaultButtons.mainListSupplierResumeBtn({
hide: isShowMainButton3(row)
}) //
] ]
} }
const listTableRef = ref() const listTableRef = ref()
@ -313,6 +316,9 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanCheckQualityReport') { } else if (val == 'mainPlanCheckQualityReport') {
// //
checkQualityReport(row) checkQualityReport(row)
} else if (val == 'mainSupplierResume') {
//
checkSupplierResume(row)
} else if (val == 'mainJobAcc') { } else if (val == 'mainJobAcc') {
// //
handleAccept(row.id) handleAccept(row.id)
@ -323,11 +329,19 @@ 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)
const qualityReport = ref('') const qualityReport = ref('')
const reportTitle = ref('')
const checkQualityReport = async (row) => { const checkQualityReport = async (row) => {
reportTitle.value = t('ts.质检明细')
showQualityReport.value = true showQualityReport.value = true
qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
} }
//
const checkSupplierResume = async (row) => {
reportTitle.value = t('ts.履历表明细')
showQualityReport.value = true
qualityReport.value = getReportUrl() + '/supplierResume?asnNumber=' + row.asnNumber
}
/** 添加/修改操作 */ /** 添加/修改操作 */
// const formRef = ref() // const formRef = ref()
// const openForm = async (type : string, row ?: number) => { // const openForm = async (type : string, row ?: number) => {

2
src/views/qms/inspectionJob/inspectionJobMain.data.ts

@ -686,7 +686,7 @@ export const InspectionJobMain = useCrudSchemas(
isForm: false, isForm: false,
isDetail: false, isDetail: false,
table: { table: {
width: 300, width: 390,
fixed: 'right' fixed: 'right'
} }
} }

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

@ -85,7 +85,7 @@
/> />
<el-dialog <el-dialog
v-model="showQualityReport" v-model="showQualityReport"
:title="t('质检明细')" :title="reportTitle"
:append-to-body="false" :append-to-body="false"
destroy-on-close destroy-on-close
fullscreen fullscreen
@ -257,7 +257,8 @@ const butttondata = (row) => {
// 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({}) // defaultButtons.mainListPlanCheckQualityReportBtn({}), //
defaultButtons.mainListSupplierResumeBtn({}) //
] ]
} }
@ -306,6 +307,9 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanCheckQualityReport') { } else if (val == 'mainPlanCheckQualityReport') {
// //
checkQualityReport(row) checkQualityReport(row)
} else if (val == 'mainSupplierResume') {
//
checkSupplierResume(row)
} else if (val == 'edit') { } else if (val == 'edit') {
// //
// //
@ -317,10 +321,18 @@ 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)
const qualityReport = ref('') const qualityReport = ref('')
const reportTitle = ref('')
const checkQualityReport = async (row) => { const checkQualityReport = async (row) => {
reportTitle.value = t('ts.质检明细')
showQualityReport.value = true showQualityReport.value = true
qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
} }
//
const checkSupplierResume = async (row) => {
reportTitle.value = t('ts.履历表明细')
showQualityReport.value = true
qualityReport.value = getReportUrl() + '/supplierResume?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: 340, width: 430,
fixed: 'right' fixed: 'right'
} }
} }

2
src/views/qms/inspectionRecord/inspectionRecordPurchase.vue

@ -5,7 +5,7 @@
<script setup lang="ts"> <script setup lang="ts">
import index from './index.vue' import index from './index.vue'
// //
defineOptions({ name: 'inspectionRecordPurchase' }) defineOptions({ name: 'inspectionRecordPurchase' })
const indesRef = ref() const indesRef = ref()
onActivated(() => { onActivated(() => {

18
src/views/qms/inspectionRequest/index.vue

@ -89,7 +89,7 @@
<el-dialog <el-dialog
v-model="showQualityReport" v-model="showQualityReport"
:title="t('质检明细')" :title="reportTitle"
:append-to-body="false" :append-to-body="false"
destroy-on-close destroy-on-close
fullscreen fullscreen
@ -118,6 +118,7 @@ import { getReportUrl } from '@/utils/systemParam'
// import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data' // import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
import { usePageLoading } from '@/hooks/web/usePageLoading' import { usePageLoading } from '@/hooks/web/usePageLoading'
const { loadStart, loadDone } = usePageLoading() const { loadStart, loadDone } = usePageLoading()
//
defineOptions({ name: 'inspectionMain' }) defineOptions({ name: 'inspectionMain' })
const message = useMessage() // const message = useMessage() //
@ -238,7 +239,9 @@ const butttondata = (row) => {
hide: isShowMainButton(row, ['1']), hide: isShowMainButton(row, ['1']),
hasPermi: 'qms:inspection-request-main:edit' hasPermi: 'qms:inspection-request-main:edit'
}),// }),//
defaultButtons.mainListPlanCheckQualityReportBtn({}) // defaultButtons.mainListPlanCheckQualityReportBtn({}), //
defaultButtons.mainListSupplierResumeBtn({}) //
] ]
} }
const listTableRef = ref() const listTableRef = ref()
@ -278,6 +281,9 @@ const buttonTableClick = async (val, row) => {
}else if (val == 'mainPlanCheckQualityReport') { }else if (val == 'mainPlanCheckQualityReport') {
// //
checkQualityReport(row) checkQualityReport(row)
}else if (val == 'mainSupplierResume') {
//
checkSupplierResume(row)
} }
} }
@ -369,10 +375,18 @@ const handleSubmit = async (id: number) => {
const reportHeight = ref(window.innerHeight - 120) const reportHeight = ref(window.innerHeight - 120)
const showQualityReport = ref(false) const showQualityReport = ref(false)
const qualityReport = ref('') const qualityReport = ref('')
const reportTitle = ref('')
const checkQualityReport = async (row) => { const checkQualityReport = async (row) => {
reportTitle.value = t('ts.质检明细')
showQualityReport.value = true showQualityReport.value = true
qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
} }
//
const checkSupplierResume = async (row) => {
reportTitle.value = t('ts.履历表明细')
showQualityReport.value = true
qualityReport.value = getReportUrl() + '/supplierResume?asnNumber=' + row.asnNumber
}
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()

2
src/views/qms/inspectionRequest/inspectionRequestMain.data.ts

@ -576,7 +576,7 @@ export const InspectionMain = useCrudSchemas(
isForm: false, isForm: false,
isDetail: false, isDetail: false,
table: { table: {
width: 300, width: 390,
fixed: 'right' fixed: 'right'
} }
} }

4
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue

@ -151,6 +151,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(formField === 'reasonCodeRequisition'){ if(formField === 'reasonCodeRequisition'){
setV['reasonCodeRequisition'] = val[0]['code'] setV['reasonCodeRequisition'] = val[0]['code']
setV['reasonDescRequisition'] = val[0]['accountingName'] setV['reasonDescRequisition'] = val[0]['accountingName']
//
if(UnplannedissueRequestMainRules['projectCode']){
UnplannedissueRequestMainRules['projectCode'][0].required = val[0]['isProject']=='TRUE'
}
} }
if(formField === 'projectCode'){ if(formField === 'projectCode'){
setV['projectCode'] = val[0]['projectCode'] setV['projectCode'] = val[0]['projectCode']

3
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts

@ -674,6 +674,9 @@ export const UnplannedissueRequestMainRules = reactive({
reasonCodeRequisition: [ reasonCodeRequisition: [
{ required: true, message: '请输入领用原因代码', trigger: 'blur' } { required: true, message: '请输入领用原因代码', trigger: 'blur' }
], ],
projectCode: [
{ required: false, message: '请输入项目代码', trigger: 'blur' }
],
}) })
/** /**

34
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@ -247,22 +247,26 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
} }
if(formField === 'reasonCodeRequisition'){ if(formField === 'reasonCodeRequisition'){
setV['reasonCodeRequisition'] = val[0]['code'] setV['reasonCodeRequisition'] = val[0]['code']
let accountRes = await SubjectAccountApi.getSubjectAccountPage({ // let accountRes = await SubjectAccountApi.getSubjectAccountPage({
pageSize: 20, // pageSize: 20,
pageNo: 1, // pageNo: 1,
code: val[0]['code'], // code: val[0]['code'],
costcentreType: formRef.formModel['costCenterType'], // costcentreType: formRef.formModel['costCenterType'],
sort: '', // sort: '',
by: 'ASC' // by: 'ASC'
}) // })
console.log('UnplannedreceiptRequestMainRules',UnplannedreceiptRequestMainRules) // console.log('UnplannedreceiptRequestMainRules',UnplannedreceiptRequestMainRules)
// if( UnplannedreceiptRequestMainRules['projectCode']){
// UnplannedreceiptRequestMainRules['projectCode'][0]['required'] = false
// if(accountRes&&accountRes.list&&accountRes.list.length>0){
// if(accountRes.list[0]['isProject']=='TRUE'){
// UnplannedreceiptRequestMainRules['projectCode'][0]['required'] = true
// }
// }
// }
//
if(UnplannedreceiptRequestMainRules['projectCode']){ if(UnplannedreceiptRequestMainRules['projectCode']){
UnplannedreceiptRequestMainRules['projectCode'][0]['required'] = false UnplannedreceiptRequestMainRules['projectCode'][0].required = val[0]['isProject']=='TRUE'
if(accountRes&&accountRes.list&&accountRes.list.length>0){
if(accountRes.list[0]['isProject']=='TRUE'){
UnplannedreceiptRequestMainRules['projectCode'][0]['required'] = true
}
}
} }
} }
if(formField === 'projectCode'){ if(formField === 'projectCode'){

8
src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/productionreturnRecordMainHold.data.ts

@ -452,6 +452,14 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150 width: 150
}, },
}, },
{
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '物料名称', label: '物料名称',
field: 'itemName', field: 'itemName',

2
src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue

@ -391,7 +391,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), // //defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //

42
src/views/wms/purchasereceiptManage/supplierdeliver/supplierResume/index.vue

@ -0,0 +1,42 @@
<template>
<div style="height:100%;overflow-y: auto;">
<ContentWrap >
<Annex
:annexData="reportAnnex"
:showDownload = "true"
:showPreview="true"
:hiddenDelete = "true"
:upData="{
tableId:30,
tableName:'SupplierdeliverInspectionDetail'
}"
:key="99"
:showAddBtn="false"
/>
</ContentWrap>
</div>
</template>
<script lang="ts" setup>
// supplierResume
import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
import Annex from '@/components/Annex/src/Annex.vue'
defineOptions({ name: 'supplierResume' })
const route = useRoute() //
const reportAnnex = reactive({
annexList: []
})
onMounted(() => {
getAnnexList()
})
const getAnnexList = async () => {
let res = await SupplierdeliverRequestMainApi.querySupplierResume(route.query.asnNumber as string)
reportAnnex.annexList = res.fileList
}
</script>
<style lang="scss" scoped></style>
Loading…
Cancel
Save