diff --git a/Web/src/api/common/index.js b/Web/src/api/common/index.js
index b288e88..6f413b5 100644
--- a/Web/src/api/common/index.js
+++ b/Web/src/api/common/index.js
@@ -68,7 +68,7 @@ export function getCommonImportTemplate(urlName) {
})
}
-// 手动传出(单)
+// 手动开关
export function getCommonCustominvoke(urlName,params) {
return request({
url: `/api/${urlName}/custominvoke`,
diff --git a/Web/src/components/elTable/index.vue b/Web/src/components/elTable/index.vue
index 478aa2f..33d16ff 100644
--- a/Web/src/components/elTable/index.vue
+++ b/Web/src/components/elTable/index.vue
@@ -55,7 +55,50 @@
{{ formatTableTagFilter('label',scope.row,item) }}
-
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row[item.prop] }}
@@ -142,6 +185,11 @@
type: String,
default: 'center'
},
+ // 是否为可编辑tabel
+ isEditTable:{
+ type: Boolean,
+ default: false
+ },
})
const emits = defineEmits([
@@ -196,7 +244,7 @@
function rightOperationHadel(btn,scope) {
emits('rightOperationHadel',btn,scope)
}
-
+
onMounted(() => {})
diff --git a/Web/src/components/tablePage/index.vue b/Web/src/components/tablePage/index.vue
index 6c01501..21c9296 100644
--- a/Web/src/components/tablePage/index.vue
+++ b/Web/src/components/tablePage/index.vue
@@ -18,8 +18,8 @@
{ElMessage.error('操作失败!')})
.finally(() => (state.loading = false))
}
- // 手动传出(直接调接口)
+ // 手动开关
else if (btn == 'custominvoke'){
- ElMessageBox.confirm('是否确定手动传出?', '提示', {
+ ElMessageBox.confirm('是否确定操作手动开关?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -510,7 +510,6 @@
ElMessage.success('操作成功!')
getTableData(1)//同步数据查询
})
- .catch(err=>{ElMessage.error('操作失败!')})
.finally(() => (state.loading = false))
})
}
diff --git a/Web/src/utils/common/apiTableColumns.js b/Web/src/utils/common/apiTableColumns.js
index a707f19..2af2a04 100644
--- a/Web/src/utils/common/apiTableColumns.js
+++ b/Web/src/utils/common/apiTableColumns.js
@@ -93,29 +93,29 @@ const apiTableColumns = {
],
// M+6月物料需求计划风险确认
cherysupplierconmmrp:[
- {prop:'supplierCode',title:'供应商代码'},
- {prop:'releaseEdition',title:'需求发布版次',width:150},
- {prop:'materialCode',title:'零件号'},
- {prop:'plantId',title:'工厂代码'},
- {prop:'feedbackResults',title:'反馈结果',type:'filter',options:EnumList.feedbackResults},
+ {prop:'supplierCode',title:'供应商代码',type:'input',required:true},
+ {prop:'releaseEdition',title:'需求发布版次',width:150,type:'input',required:true},
+ {prop:'materialCode',title:'零件号',type:'input',required:true},
+ {prop:'plantId',title:'工厂代码',type:'input',required:true},
+ {prop:'feedbackResults',title:'反馈结果',type:'filterSelect',options:EnumList.feedbackResults,required:true},
// todo:当反馈结果=1时,此字段必输
- {prop:'ventureType',title:'风险类型',type:'filter',options:EnumList.ventureType},
+ {prop:'ventureType',title:'风险类型',type:'filterSelect',options:EnumList.ventureType},
// todo:当反馈结果=1时,此字段必输
- {prop:'ventureSpecific',title:'具体风险'},
- {prop:'measures',title:'应对措施'},
- {prop:'startMonth',title:'起始月份',type:'datetime'},
- {prop:'quantityMeet1',title:'满足数量1',type:'number'},
- {prop:'quantityMeet2',title:'满足数量2',type:'number'},
- {prop:'quantityMeet3',title:'满足数量3',type:'number'},
- {prop:'quantityMeet4',title:'满足数量4',type:'number'},
- {prop:'quantityMeet5',title:'满足数量5',type:'number'},
- {prop:'quantityMeet6',title:'满足数量6',type:'number'},
- {prop:'quantityMeet7',title:'满足数量7',type:'number'},
- {prop:'quantityMeet8',title:'满足数量8',type:'number'},
- {prop:'quantityMeet9',title:'满足数量9',type:'number'},
- {prop:'quantityMeet10',title:'满足数量10',type:'number'},
- {prop:'quantityMeet11',title:'满足数量11',type:'number'},
- {prop:'quantityMeet12',title:'满足数量12',type:'number'},
+ {prop:'ventureSpecific',title:'具体风险',type:'input'},
+ {prop:'measures',title:'应对措施',type:'input'},
+ {prop:'startMonth',title:'起始月份',type:'datetimeInput',required:true},
+ {prop:'quantityMeet1',title:'满足数量1',type:'numberInput',required:true},
+ {prop:'quantityMeet2',title:'满足数量2',type:'numberInput',required:true},
+ {prop:'quantityMeet3',title:'满足数量3',type:'numberInput',required:true},
+ {prop:'quantityMeet4',title:'满足数量4',type:'numberInput',required:true},
+ {prop:'quantityMeet5',title:'满足数量5',type:'numberInput',required:true},
+ {prop:'quantityMeet6',title:'满足数量6',type:'numberInput',required:true},
+ {prop:'quantityMeet7',title:'满足数量7',type:'numberInput'},
+ {prop:'quantityMeet8',title:'满足数量8',type:'numberInput'},
+ {prop:'quantityMeet9',title:'满足数量9',type:'numberInput'},
+ {prop:'quantityMeet10',title:'满足数量10',type:'numberInput'},
+ {prop:'quantityMeet11',title:'满足数量11',type:'numberInput'},
+ {prop:'quantityMeet12',title:'满足数量12',type:'numberInput'},
],
// 日物料需求计划
cherysuppliermrpdata:[
@@ -537,8 +537,8 @@ const apiTableColumns = {
{prop:'empName',title:'工位人员姓名',width:160,required:true},
{prop:'vendorProductName',title:'供应商总成零件名称',width:180,required:true},
{prop:'vendorProductNo',title:'供应商总成零件号',width:180,required:true},
- {prop:'vendorProductBatch',title:'供应商总成批次号',required:true},
- {prop:'vendorProductSn',title:'供应商总成SN码',required:true},
+ {prop:'vendorProductBatch',title:'供应商总成批次号',width:180,required:true},
+ {prop:'vendorProductSn',title:'供应商总成SN码',width:180,required:true},
{prop:'subProdNo',title:'子件编码',required:true},
{prop:'subProdName',title:'子件名称',required:true},
{prop:'subBatchNo',title:'子件批次号',required:true},
@@ -595,60 +595,60 @@ const apiTableColumns = {
],
// 工位一次合格率
cherysupplierprostationfirstpassyield:[
- {prop:'supplierCode',title:'供应商代码'},
- {prop:'supplierName',title:'供应商名称'},
- {prop:'plantId',title:'工厂代码'},
- {prop:'plantName',title:'工厂名称'},
- {prop:'workshopId',title:'车间代码'},
- {prop:'workshopName',title:'车间名称'},
- {prop:'productionLineId',title:'产线代码'},
- {prop:'productionLineName',title:'产线名称'},
- {prop:'stationId',title:'工位代码'},
- {prop:'stationName',title:'工位名称'},
- {prop:'cheryProductNo',title:'奇瑞零件号'},
- {prop:'cheryProductName',title:'奇瑞零件名称',width:180},
- {prop:'vendorProductNo',title:'供应商总成零件号',width:180},
- {prop:'vendorProductName',title:'供应商总成零件名称',width:180},
- {prop:'productBatchNo',title:'生产批次号'},
- {prop:'manufactureNo',title:'生产工单号'},
- {prop:'workOrderNumber',title:'批次计划数量',type:'number',width:160},
- {prop:'defectiveNumber',title:'不合格数',type:'number',width:160},
- {prop:'acceptableNumber',title:'合格数',type:'number',width:160},
- {prop:'oncePassRateRealValue',title:'一次合格率实际值',type:'number',width:180},
- {prop:'oncePassRateTagValue',title:'一次合格率目标值',type:'number',width:180},
- {prop:'workShift',title:'班次',type:'filter',options:EnumList.workShift},
- {prop:'statisticalTime',title:'生产日期',width:180,type:'datetime'},
- {prop:'dateTime',title:'值统计时间',width:180,type:'datetime'},
+ {prop:'supplierCode',title:'供应商代码',required:true},
+ {prop:'supplierName',title:'供应商名称',required:true},
+ {prop:'plantId',title:'工厂代码',required:true},
+ {prop:'plantName',title:'工厂名称',required:true},
+ {prop:'workshopId',title:'车间代码',required:true},
+ {prop:'workshopName',title:'车间名称',required:true},
+ {prop:'productionLineId',title:'产线代码',required:true},
+ {prop:'productionLineName',title:'产线名称',required:true},
+ {prop:'stationId',title:'工位代码',required:true},
+ {prop:'stationName',title:'工位名称',required:true},
+ {prop:'cheryProductNo',title:'奇瑞零件号',required:true},
+ {prop:'cheryProductName',title:'奇瑞零件名称',width:180,required:true},
+ {prop:'vendorProductNo',title:'供应商总成零件号',width:180,required:true},
+ {prop:'vendorProductName',title:'供应商总成零件名称',width:180,required:true},
+ {prop:'productBatchNo',title:'生产批次号',required:true},
+ {prop:'manufactureNo',title:'生产工单号',required:true},
+ {prop:'workOrderNumber',title:'批次计划数量',type:'number',width:160,required:true},
+ {prop:'defectiveNumber',title:'不合格数',type:'number',width:160,required:true},
+ {prop:'acceptableNumber',title:'合格数',type:'number',width:160,required:true},
+ {prop:'oncePassRateRealValue',title:'一次合格率实际值',type:'number',width:180,required:true},
+ {prop:'oncePassRateTagValue',title:'一次合格率目标值',type:'number',width:180,required:true},
+ {prop:'workShift',title:'班次',type:'filter',options:EnumList.workShift,required:true},
+ {prop:'statisticalTime',title:'生产日期',width:180,type:'datetime',required:true},
+ {prop:'dateTime',title:'值统计时间',width:180,type:'datetime',required:true},
],
// 缺陷业务数据
cherysupplierproflaw:[
- {prop:'supplierCode',title:'供应商代码'},
- {prop:'supplierName',title:'供应商名称'},
- {prop:'plantId',title:'工厂代码'},
- {prop:'plantName',title:'工厂名称'},
- {prop:'workshopId',title:'车间代码'},
- {prop:'workshopName',title:'车间名称'},
- {prop:'productionLineId',title:'产线代码'},
- {prop:'productionLineName',title:'产线名称'},
- {prop:'stationId',title:'工位代码'},
- {prop:'stationName',title:'工位名称'},
- {prop:'defectsCode',title:'缺陷代码'},
- {prop:'defectsName',title:'缺陷名称'},
- {prop:'classOfName',title:'缺陷分类',type:'filter',options:EnumList.defectsClass},
- {prop:'vendorProductNo',title:'供应商总成零件号',width:180},
- {prop:'vendorProductName',title:'供应商总成零件名称',width:180},
- {prop:'vendorProductBatch',title:'供应商总成批次号',width:180},
- {prop:'vendorProductSn',title:'供应商总成SN码',width:180},
- {prop:'cheryProductNo',title:'奇瑞零件号'},
- {prop:'cheryProductName',title:'奇瑞零件名称',width:180},
- {prop:'cheryProductSn',title:'奇瑞SN码'},
- {prop:'productBatchNo',title:'生产批次号'},
- {prop:'manufactureNo',title:'生产工单号'},
- {prop:'workShift',title:'班次',type:'filter',options:EnumList.workShift},
- {prop:'numberofdefect',title:'缺陷件数',type:'number'},
- {prop:'defectsDesc',title:'缺陷描述'},
- {prop:'defectsLevel',title:'缺陷等级',type:'filter',options:EnumList.defectsLevel},
- {prop:'statisticalTime',title:'缺陷录入时间',width:180,type:'datetime'},
+ {prop:'supplierCode',title:'供应商代码',required:true},
+ {prop:'supplierName',title:'供应商名称',required:true},
+ {prop:'plantId',title:'工厂代码',required:true},
+ {prop:'plantName',title:'工厂名称',required:true},
+ {prop:'workshopId',title:'车间代码',required:true},
+ {prop:'workshopName',title:'车间名称',required:true},
+ {prop:'productionLineId',title:'产线代码',required:true},
+ {prop:'productionLineName',title:'产线名称',required:true},
+ {prop:'stationId',title:'工位代码',required:true},
+ {prop:'stationName',title:'工位名称',required:true},
+ {prop:'defectsCode',title:'缺陷代码',required:true},
+ {prop:'defectsName',title:'缺陷名称',required:true},
+ {prop:'classOfName',title:'缺陷分类',type:'filter',options:EnumList.defectsClass,required:true},
+ {prop:'vendorProductNo',title:'供应商总成零件号',width:180,required:true},
+ {prop:'vendorProductName',title:'供应商总成零件名称',width:180,required:true},
+ {prop:'vendorProductBatch',title:'供应商总成批次号',width:180,required:true},
+ {prop:'vendorProductSn',title:'供应商总成SN码',width:180,required:true},
+ {prop:'cheryProductNo',title:'奇瑞零件号',required:true},
+ {prop:'cheryProductName',title:'奇瑞零件名称',width:180,required:true},
+ {prop:'cheryProductSn',title:'奇瑞SN码',required:true},
+ {prop:'productBatchNo',title:'生产批次号',required:true},
+ {prop:'manufactureNo',title:'生产工单号',required:true},
+ {prop:'workShift',title:'班次',type:'filter',options:EnumList.workShift,required:true},
+ {prop:'numberofdefect',title:'缺陷件数',type:'number',required:true},
+ {prop:'defectsDesc',title:'缺陷描述',required:true},
+ {prop:'defectsLevel',title:'缺陷等级',type:'filter',options:EnumList.defectsLevel,required:true},
+ {prop:'statisticalTime',title:'缺陷录入时间',width:180,type:'datetime',required:true},
],
// 物料主数据
cherysupplierpromaterialdata:[
@@ -675,56 +675,56 @@ const apiTableColumns = {
],
// 附件类数据
cherysupplierproattachmentdata:[
- {prop:'supplierCode',title:'供应商代码'},
- {prop:'supplierName',title:'供应商名称'},
- {prop:'type',title:'数据类型',type:'filter',options:EnumList.attachmentType},
- {prop:'fileName',title:'文件名'},
- {prop:'fileUrl',title:'图文地址',width:null},
- {prop:'dateTime',title:'生成时间',type:'datetime',width:180},
- {prop:'productionLineName',title:'产线名称'},
- {prop:'productionLineId',title:'产线代码'},
- {prop:'stationName',title:'工位名称'},
- {prop:'stationId',title:'工位代码'},
- {prop:'deviceName',title:'设备名称'},
- {prop:'deviceId',title:'设备代码'},
- {prop:'vendorProductNo',title:'供应商总成零件号',width:180},
- {prop:'vendorProductName',title:'供应商总成零件名称',width:180},
- {prop:'cheryProductNo',title:'奇瑞零件号'},
- {prop:'cheryProductName',title:'奇瑞零件名称',width:180},
+ {prop:'supplierCode',title:'供应商代码',required:true},
+ {prop:'supplierName',title:'供应商名称',required:true},
+ {prop:'type',title:'数据类型',type:'filter',options:EnumList.attachmentType,required:true},
+ {prop:'fileName',title:'文件名',required:true},
+ {prop:'fileUrl',title:'图文地址',width:null,required:true},
+ {prop:'dateTime',title:'生成时间',type:'datetime',width:180,required:true},
+ {prop:'productionLineName',title:'产线名称',required:true},
+ {prop:'productionLineId',title:'产线代码',required:true},
+ {prop:'stationName',title:'工位名称',required:true},
+ {prop:'stationId',title:'工位代码',required:true},
+ {prop:'deviceName',title:'设备名称',required:true},
+ {prop:'deviceId',title:'设备代码',required:true},
+ {prop:'vendorProductNo',title:'供应商总成零件号',width:180,required:true},
+ {prop:'vendorProductName',title:'供应商总成零件名称',width:180,required:true},
+ {prop:'cheryProductNo',title:'奇瑞零件号',required:true},
+ {prop:'cheryProductName',title:'奇瑞零件名称',width:180,required:true},
{prop:'vendorProductSn',title:'供应商总成SN码',width:180},
],
// 工艺装备
cherysupplierproprocessequipment:[
- {prop:'supplierCode',title:'供应商代码'},
- {prop:'supplierName',title:'供应商名称'},
- {prop:'cheryProductNo',title:'奇瑞零件号'},
- {prop:'cheryProductName',title:'奇瑞零件名称',width:180},
- {prop:'vendorProductNo',title:'供应商总成零件号',width:180},
- {prop:'vendorProductName',title:'供应商总成零件名称',width:180},
- {prop:'deviceType',title:'工艺装备类型分类',type:'filter',options:EnumList.deviceType},
- {prop:'deviceCode',title:'工艺装备编码'},
- {prop:'deviceName',title:'工艺装备名称'},
- {prop:'manufacturer',title:'生产厂家'},
- {prop:'modelNumber',title:'工艺装备型号'},
- {prop:'serialNumber',title:'工艺装备序列号',width:180},
- {prop:'productionDate',title:'工艺装备制造日期',width:180,type:'datetime'},
- {prop:'material',title:'主要材质'},
- {prop:'currentLocation',title:'当前存放地点'},
- {prop:'deviceStatus',title:'工艺装备状态'},
- {prop:'cavityCount',title:'穴腔数量',type:'number'},
- {prop:'moldSize',title:'模具尺寸规格'},
- {prop:'designLifeUnits',title:'设计寿命单位'},
- {prop:'designLifeValue',title:'设计寿命'},
- {prop:'currentUsageCount',title:'当前剩余寿命',width:180},
- {prop:'overhaulCount',title:'模具大修次数',type:'number',width:160},
- {prop:'coolingChannelLayout',title:'图纸编号描述'},
- {prop:'detectionAccuracy',title:'检测精度'},
- {prop:'calibrationDate',title:'最近校准日期',width:180,type:'datetime'},
- {prop:'calibrationDueDays',title:'校准到期天数'},
- {prop:'toleranceRange',title:'允许误差范围'},
- {prop:'wearThreshold',title:'磨损阈值'},
- {prop:'detectionRange',title:'检测范围'},
- {prop:'unitType',title:'检测单位'},
+ {prop:'supplierCode',title:'供应商代码',required:true},
+ {prop:'supplierName',title:'供应商名称',required:true},
+ {prop:'cheryProductNo',title:'奇瑞零件号',required:true},
+ {prop:'cheryProductName',title:'奇瑞零件名称',width:180,required:true},
+ {prop:'vendorProductNo',title:'供应商总成零件号',width:180,required:true},
+ {prop:'vendorProductName',title:'供应商总成零件名称',width:180,required:true},
+ {prop:'deviceType',title:'工艺装备类型分类',type:'filter',width:180,options:EnumList.deviceType,required:true},
+ {prop:'deviceCode',title:'工艺装备编码',required:true},
+ {prop:'deviceName',title:'工艺装备名称',required:true},
+ {prop:'manufacturer',title:'生产厂家',required:true},
+ {prop:'modelNumber',title:'工艺装备型号',required:true},
+ {prop:'serialNumber',title:'工艺装备序列号',width:180,required:true},
+ {prop:'productionDate',title:'工艺装备制造日期',width:180,type:'datetime',required:true},
+ {prop:'material',title:'主要材质',required:true},
+ {prop:'currentLocation',title:'当前存放地点',required:true},
+ {prop:'deviceStatus',title:'工艺装备状态',required:true},
+ {prop:'cavityCount',title:'穴腔数量',type:'number',required:true},
+ {prop:'moldSize',title:'模具尺寸规格',required:true},
+ {prop:'designLifeUnits',title:'设计寿命单位',required:true},
+ {prop:'designLifeValue',title:'设计寿命',required:true},
+ {prop:'currentUsageCount',title:'当前剩余寿命',width:180,required:true},
+ {prop:'overhaulCount',title:'模具大修次数',type:'number',width:160,required:true},
+ {prop:'coolingChannelLayout',title:'图纸编号描述',required:true},
+ {prop:'detectionAccuracy',title:'检测精度',required:true},
+ {prop:'calibrationDate',title:'最近校准日期',width:180,type:'datetime',required:true},
+ {prop:'calibrationDueDays',title:'校准到期天数',required:true},
+ {prop:'toleranceRange',title:'允许误差范围',required:true},
+ {prop:'wearThreshold',title:'磨损阈值',required:true},
+ {prop:'detectionRange',title:'检测范围',required:true},
+ {prop:'unitType',title:'检测单位',required:true},
],
// 工艺
cherysupplierproprocess:[
diff --git a/Web/src/views/logisticsPlan/supplierConMmrp/index.vue b/Web/src/views/logisticsPlan/supplierConMmrp/index.vue
index 2222b5f..ff65421 100644
--- a/Web/src/views/logisticsPlan/supplierConMmrp/index.vue
+++ b/Web/src/views/logisticsPlan/supplierConMmrp/index.vue
@@ -1,14 +1,16 @@
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierProAttachmentData/index.vue b/Web/src/views/productionQuality/supplierProAttachmentData/index.vue
new file mode 100644
index 0000000..842ce56
--- /dev/null
+++ b/Web/src/views/productionQuality/supplierProAttachmentData/index.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierProFirstPassyield/index.vue b/Web/src/views/productionQuality/supplierProFirstPassyield/index.vue
index 2e84fc9..208c14d 100644
--- a/Web/src/views/productionQuality/supplierProFirstPassyield/index.vue
+++ b/Web/src/views/productionQuality/supplierProFirstPassyield/index.vue
@@ -18,10 +18,10 @@ import tablePage from '@/components/tablePage/index.vue'
const state = reactive({
apiName:'cherysupplierprofirstpassyield',
searchFilter: {
- supplierCode: null
+ cheryProductNo: null
},
searchOptions:[
- {type:'input',prop:'supplierCode',label:'供应商代码'}
+ {type:'input',prop:'cheryProductNo',label:'奇瑞零件号'}
],
rightOperation:'apiUpdate',
})
diff --git a/Web/src/views/productionQuality/supplierProFlaw/index.vue b/Web/src/views/productionQuality/supplierProFlaw/index.vue
new file mode 100644
index 0000000..433c229
--- /dev/null
+++ b/Web/src/views/productionQuality/supplierProFlaw/index.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierProProcess/index.vue b/Web/src/views/productionQuality/supplierProProcess/index.vue
new file mode 100644
index 0000000..abab56f
--- /dev/null
+++ b/Web/src/views/productionQuality/supplierProProcess/index.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue b/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue
new file mode 100644
index 0000000..b2a6dd1
--- /dev/null
+++ b/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/upplierProMaterialData/index.vue b/Web/src/views/productionQuality/upplierProMaterialData/index.vue
new file mode 100644
index 0000000..43eaaf9
--- /dev/null
+++ b/Web/src/views/productionQuality/upplierProMaterialData/index.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/upplierProStationFirstPassyield/index.vue b/Web/src/views/productionQuality/upplierProStationFirstPassyield/index.vue
new file mode 100644
index 0000000..a4d874e
--- /dev/null
+++ b/Web/src/views/productionQuality/upplierProStationFirstPassyield/index.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file