From 92164e958e8ce5d2ae3532f6250968b81c9bf2e1 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 8 Apr 2024 17:28:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemInstallPackage.data.ts | 2 +- .../strategy/supplieDeliveryStrategy/AddForm.vue | 14 +++++++++++++- .../purchasereceiptJobMain/index.vue | 8 ++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/views/system/systemInstallPackage/systemInstallPackage.data.ts b/src/views/system/systemInstallPackage/systemInstallPackage.data.ts index db884d927..91634a91d 100644 --- a/src/views/system/systemInstallPackage/systemInstallPackage.data.ts +++ b/src/views/system/systemInstallPackage/systemInstallPackage.data.ts @@ -98,7 +98,7 @@ export const SystemInstallPackage = useCrudSchemas(reactive([ }, limit:1, fileType:['apk'], - fileSize:35 + fileSize:100 } }, }, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index d4e869471..bc293b211 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -232,6 +232,14 @@ /> + + + + + + + + @@ -291,7 +299,11 @@ const formData = ref({ // 月台代码 DockCode: '', // 在途库位代码 - OnTheWayLocationCode: '' + OnTheWayLocationCode: '', + // 收货人 + Receiver: '', + // 联系电话 + PhoneNumber: '' } }) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 58a73593d..313501077 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -196,10 +196,10 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 - // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭 - // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 - // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 + defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 + defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭 + defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 + defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 { label: '拒收', name: 'mainJobClo', From c143ebdf04144551b29df4319362e31107bea0e0 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 8 Apr 2024 17:36:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionMethod/inspectionMethod.data.ts | 2 +- src/views/qms/samplingProcess/samplingProcess.data.ts | 2 +- src/views/qms/samplingScheme/samplingScheme.data.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts index 136dfbb44..edec8935c 100644 --- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts +++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts @@ -3,7 +3,6 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const InspectionMethodRules = reactive({ - code: [required], available: [required], description: [required], }) @@ -21,6 +20,7 @@ export const InspectionMethod = useCrudSchemas(reactive([ field: 'code', sort: 'custom', isSearch: true, + ifForm:false, }, { label: '描述', diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts index 22411b5bc..8fecb505f 100644 --- a/src/views/qms/samplingProcess/samplingProcess.data.ts +++ b/src/views/qms/samplingProcess/samplingProcess.data.ts @@ -3,7 +3,6 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const SamplingProcessRules = reactive({ - code: [required], sampleType: [required], evaluationMode: [required], available: [required], @@ -23,6 +22,7 @@ export const SamplingProcess = useCrudSchemas(reactive([ field: 'code', sort: 'custom', isSearch: true, + isForm: false, }, { label: '描述', diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts index d75fecad2..3cf173eb3 100644 --- a/src/views/qms/samplingScheme/samplingScheme.data.ts +++ b/src/views/qms/samplingScheme/samplingScheme.data.ts @@ -3,7 +3,6 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const SamplingSchemeRules = reactive({ - code: [required], available: [required], description: [required], }) @@ -21,6 +20,7 @@ export const SamplingScheme = useCrudSchemas(reactive([ field: 'code', sort: 'custom', isSearch: true, + isForm: false, }, { label: '描述', From 83ac68f5db3c30dc6c88f91b0c9942a9b029c191 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 8 Apr 2024 17:38:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=92=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionJob/inspectionJobMain.data.ts | 71 +++++++++- .../inspectionRecordMain.data.ts | 125 +++++++++++++++--- .../inspection/inspectionRequest/index.vue | 6 +- .../inspectionRequest/inspectionMain.data.ts | 70 +++++++++- 4 files changed, 246 insertions(+), 26 deletions(-) diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts index eaa8c51a3..1074891fa 100644 --- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts @@ -28,6 +28,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '申请单号', @@ -39,6 +42,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '供应商编码', @@ -50,6 +56,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '物料编码', @@ -61,6 +70,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '物料批次', @@ -72,6 +84,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '订单号', @@ -83,6 +98,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '订单行', @@ -96,6 +114,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '凭证号', @@ -107,6 +128,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '凭证行', @@ -120,6 +144,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '检验方案编码', @@ -131,6 +158,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, // { // label: '检验方案Json', @@ -148,6 +178,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '检验批数量', @@ -159,6 +192,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '采样总数量', @@ -170,6 +206,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '检验类型', @@ -184,6 +223,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '检验批来源', @@ -196,6 +238,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ componentProps:{ disabled:true } + }, + table: { + width: 150 } }, { @@ -210,6 +255,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '检验严格性', @@ -222,6 +270,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ componentProps:{ disabled:true } + }, + table: { + width: 150 } }, { @@ -233,6 +284,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ componentProps:{ disabled:true } + }, + table: { + width: 150 } }, { @@ -244,6 +298,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ componentProps:{ disabled:true } + }, + table: { + width: 150 } }, { @@ -268,6 +325,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '计划结束时间', @@ -291,6 +351,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + table: { + width: 150 + } }, { label: '检验水平', @@ -303,6 +366,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ componentProps:{ disabled:true } + }, + table: { + width: 150 } }, { @@ -316,6 +382,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ componentProps:{ disabled:true } + }, + table: { + width: 150 } }, // { @@ -347,7 +416,7 @@ export const InspectionJobMain = useCrudSchemas(reactive([ activeValue: 'TRUE', disabled:true } - }, + } }, { label: '操作', diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts index 436752732..6153d4163 100644 --- a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts @@ -13,101 +13,145 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ field: 'number', sort: 'custom', isSearch: true, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '申请编码', field: 'applicationCode', sort: 'custom', isSearch: true, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '任务编码', field: 'taskCode', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '供应商编码', field: 'supplierCode', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '物料编码', field: 'materialCode', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '批次', field: 'batch', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '检验方案编码', field: 'inspectionSchemeCode', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '检验方案Json', field: 'inspectionSchemeJson', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + isTable:false, + table: { + width: 150 + } }, { label: '检验批次', field: 'inspectionBatch', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '检验批数量', field: 'inspectionBatchAmount', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '采样总数量', field: 'sampleTatalAmount', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '检验类型', field: 'inspectionType', + dictType: DICT_TYPE.INSPECTION_TYPE, sort: 'custom', isSearch: false, isForm:false, form: { component: 'Select' }, + table: { + width: 150 + } }, { label: '检验批来源', field: 'inspectionBatchSource', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '订单号', field: 'orderCode', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '订单行', @@ -119,13 +163,19 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ component: 'InputNumber', value: 0 }, + table: { + width: 150 + } }, { label: '凭证号', field: 'certificateCode', sort: 'custom', isSearch: false, - isForm:false + isForm:false, + table: { + width: 150 + } }, { label: '凭证行', @@ -137,6 +187,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ component: 'InputNumber', value: 0 }, + table: { + width: 150 + } }, { label: '检验阶段', @@ -148,20 +201,20 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ component: 'InputNumber', value: 0 }, + table: { + width: 150 + } }, { label: '检验严格性', field: 'inspectionStringency', + dictType: DICT_TYPE.INSPECTION_SEVERITY, sort: 'custom', isSearch: false, isForm:false, - }, - { - label: '使用决策', - field: 'useDecision', - sort: 'custom', - isSearch: false, - isForm:false + table: { + width: 150 + } }, { label: '计划开始时间', @@ -185,6 +238,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + table: { + width: 150 + } }, { label: '计划结束时间', @@ -208,6 +264,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + table: { + width: 150 + } }, { label: '实际开始时间', @@ -231,6 +290,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + table: { + width: 150 + } }, { label: '实际结束时间', @@ -254,27 +316,42 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + table: { + width: 150 + } }, { label: '检验水平', field: 'inspectionLevel', + dictType: DICT_TYPE.INSPECTION_LEVEL, sort: 'custom', isSearch: false, isForm:false, + table: { + width: 150 + } }, { label: 'AQL值', field: 'aqlValue', + dictType: DICT_TYPE.BASIC_AQL, sort: 'custom', isSearch: false, isForm:false, + table: { + width: 150 + } }, { label: '是否可用', field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, sort: 'custom', isSearch: false, isForm:false, + table: { + width: 150 + } }, { label: '使用决策', @@ -282,6 +359,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, dictType: DICT_TYPE.USAGE_DECISION, + table: { + width: 150 + } }, { @@ -299,6 +379,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ } }, isForm: false, + table: { + width: 150 + } }, { diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspection/inspectionRequest/index.vue index d69795d30..941d6b27b 100644 --- a/src/views/qms/inspection/inspectionRequest/index.vue +++ b/src/views/qms/inspection/inspectionRequest/index.vue @@ -15,9 +15,9 @@ total: tableObject.total }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort"> -