Browse Source

物料叫料、补料 的页面修改

master_hella_20240701
zhousq 7 months ago
parent
commit
52ae9cbba9
  1. 2
      src/utils/dict.ts
  2. 8
      src/views/mes/itemRequestMain/index.vue
  3. 28
      src/views/mes/itemRequestMain/itemRequestMain.data.ts

2
src/utils/dict.ts

@ -322,7 +322,7 @@ export enum DICT_TYPE {
DISMANTLING_BILL_TYPE = 'dismantling_bill_type',//工单类型 DISMANTLING_BILL_TYPE = 'dismantling_bill_type',//工单类型
DISMANTLING_MATERIAL_STATUS = 'dismantling_material_status',//报废拆解物料状态 DISMANTLING_MATERIAL_STATUS = 'dismantling_material_status',//报废拆解物料状态
DISMANTLING_MATERIAL_HANDLE_STATUS = 'dismantling_material_handle_status',//报废拆解处理状态 DISMANTLING_MATERIAL_HANDLE_STATUS = 'dismantling_material_handle_status',//报废拆解处理状态
MES_REQUEST_TYPE = 'mes_request_type',//生产物料申请类型
SUPPLIERINVOICE_REQUEST_STATUS = 'supplierinvoice_request_status', //发票申请状态 SUPPLIERINVOICE_REQUEST_STATUS = 'supplierinvoice_request_status', //发票申请状态
SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态 SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态

8
src/views/mes/itemRequestMain/index.vue

@ -61,9 +61,9 @@
:apiCreate="ItemRequestDetailApi.createItemRequestDetail" :apiCreate="ItemRequestDetailApi.createItemRequestDetail"
:apiUpdate="ItemRequestDetailApi.updateItemRequestDetail" :apiUpdate="ItemRequestDetailApi.updateItemRequestDetail"
:apiDelete="ItemRequestDetailApi.deleteItemRequestDetail" :apiDelete="ItemRequestDetailApi.deleteItemRequestDetail"
:detailButtonIsShowAdd="true" :detailButtonIsShowAdd="false"
:detailButtonIsShowEdit="true" :detailButtonIsShowEdit="false"
:detailButtonIsShowDelete="true" :detailButtonIsShowDelete="false"
@handleMainFefresh="handleMainFefresh" @handleMainFefresh="handleMainFefresh"
@searchTableSuccessDetail="searchTableSuccessDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
:key="count" :key="count"
@ -150,7 +150,7 @@ const buttonBaseClick = (val, item) => {
// - // -
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'mes:itemRequestMain:update'}), // //defaultButtons.mainListEditBtn({hasPermi:'mes:itemRequestMain:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'mes:itemRequestMain:delete'}), // defaultButtons.mainListDeleteBtn({hasPermi:'mes:itemRequestMain:delete'}), //
] ]

28
src/views/mes/itemRequestMain/itemRequestMain.data.ts

@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
// 表单校验 // 表单校验
export const ItemRequestMainRules = reactive({ export const ItemRequestMainRules = reactive({
concurrencyStamp: [required], requestBillNo:[{required : true, message: '请输入删除时间', trigger: 'blur' }]
}) })
export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
@ -24,6 +24,9 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, },
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -37,6 +40,7 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'requestBillNo', field: 'requestBillNo',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
disabled: true,
}, },
{ {
label: '主键', label: '主键',
@ -132,13 +136,20 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true, isSearch: true,
}, },
{ {
label: '类型(1:叫料、2:补料)', label: '类型',
field: 'requestType', field: 'requestType',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
form: { dictType: DICT_TYPE.MES_REQUEST_TYPE,
component: 'SelectV2' dictClass: 'string',
}, form: {
component: 'Select',
// componentProps:{
// options:[{label:'叫料',value:'1'},{label:'补料',value:'2'}]
// },
value:'1'
},
}, },
{ {
label: '创建时间', label: '创建时间',
@ -154,6 +165,9 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, },
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
isForm: false, isForm: false,
}, },
{ {
@ -275,6 +289,9 @@ export const ItemRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, },
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
isForm: false, isForm: false,
}, },
{ {
@ -287,6 +304,7 @@ export const ItemRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '操作', label: '操作',
field: 'action', field: 'action',
isForm: false, isForm: false,
isTable: false,
table: { table: {
width: 150, width: 150,
fixed: 'right' fixed: 'right'

Loading…
Cancel
Save