diff --git a/Web/src/api/common/index.js b/Web/src/api/common/index.js
index 2859ee6..b288e88 100644
--- a/Web/src/api/common/index.js
+++ b/Web/src/api/common/index.js
@@ -19,6 +19,15 @@ export function getCommonInfoById(urlName,id) {
})
}
+// 新增提交
+export function postCommonCreate(urlName,data) {
+ return request({
+ url: `/api/${urlName}/create`,
+ method: 'post',
+ data
+ })
+}
+
// 修改提交
export function putCommonUpdate(urlName,data) {
return request({
@@ -28,6 +37,18 @@ export function putCommonUpdate(urlName,data) {
})
}
+// 删除提交
+export function deleteCommonApi(urlName,id) {
+ return request({
+ url: `/api/${urlName}/delete`,
+ method: 'DELETE',
+ headers:{
+ 'content-type':'application/json-patch+json'
+ },
+ data:id
+ })
+}
+
// 导出
export function postCommonExport(urlName,data) {
return request({
diff --git a/Web/src/components/apiEditPop/index.vue b/Web/src/components/apiEditPop/index.vue
index b6039ad..a202c51 100644
--- a/Web/src/components/apiEditPop/index.vue
+++ b/Web/src/components/apiEditPop/index.vue
@@ -1,7 +1,7 @@
+ :rules="formRulesData">
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Web/src/utils/common/apiTableColumns.js b/Web/src/utils/common/apiTableColumns.js
index df9c1e8..a707f19 100644
--- a/Web/src/utils/common/apiTableColumns.js
+++ b/Web/src/utils/common/apiTableColumns.js
@@ -286,19 +286,19 @@ const apiTableColumns = {
],
// 供应商共享库存
cherysuppliersinvdata:[
- {prop:'supplierCode',title:'供应商代码'},
- {prop:'supplierName',title:'供应商名称'},
+ {prop:'supplierCode',title:'供应商代码',required:true},
+ {prop:'supplierName',title:'供应商名称',required:true},
{prop:'serialNumber',title:'行项目号'},
- {prop:'materialCode',title:'零件号'},
- {prop:'materialDescription',title:'零件名称'},
+ {prop:'materialCode',title:'零件号',required:true},
+ {prop:'materialDescription',title:'零件名称',required:true},
{prop:'materialType',title:'物料类型',type:'filter',options:EnumList.materialType},
- {prop:'quantityCurrent',title:'当前库存数量',type:'number'},
- {prop:'quantityPlan',title:'原材料在途数量',type:'number'},
- {prop:'inventoryStatus',title:'库存状态',type:'filter',options:EnumList.inventoryStatus},
- {prop:'safetyStock',title:'安全库存',type:'number'},
- {prop:'productionCycle',title:'生产/采购周期'},
+ {prop:'quantityCurrent',title:'当前库存数量',type:'number',required:true},
+ {prop:'quantityPlan',title:'原材料在途数量',type:'number',required:true},
+ {prop:'inventoryStatus',title:'库存状态',type:'filter',options:EnumList.inventoryStatus,required:true},
+ {prop:'safetyStock',title:'安全库存',type:'number',required:true},
+ {prop:'productionCycle',title:'生产/采购周期',required:true},
{prop:'dataUpdateTime',title:'库存更新时间',type:'datetime',width:180},
- {prop:'supplierBatch',title:'批次'},
+ {prop:'supplierBatch',title:'批次',required:true},
{prop:'supplieryxqDate',title:'效期截止日期',type:'datetime',width:180},
{prop:'creationTime',title:'创建时间',type:'datetime',width:180,noEdit:true},
],
@@ -354,36 +354,36 @@ const apiTableColumns = {
/*生产质量 */
// 来料检验数据
supplierpromaterialstock:[
- {prop:'supplierCode',title:'供应商代码'},
- {prop:'supplierName',title:'供应商名称'},
- {prop:'supplierSubCode',title:'供应商子零件编号',width:180},
- {prop:'supplierSubName',title:'供应商子零件名称',width:180},
- {prop:'subSupplierCode',title:'分供方代码'},
- {prop:'subSupplierName',title:'分供方名称'},
- {prop:'subSupplierAddress',title:'分供方地址'},
+ {prop:'supplierCode',title:'供应商代码',required:true},
+ {prop:'supplierName',title:'供应商名称',required:true},
+ {prop:'supplierSubCode',title:'供应商子零件编号',width:180,required:true},
+ {prop:'supplierSubName',title:'供应商子零件名称',width:180,required:true},
+ {prop:'subSupplierCode',title:'分供方代码',required:true},
+ {prop:'subSupplierName',title:'分供方名称',required:true},
+ {prop:'subSupplierAddress',title:'分供方地址',required:true},
{prop:'componentCode',title:'分供方子件编码'},
{prop:'componentName',title:'分供方子件名称'},
- {prop:'subBatchNo',title:'子件批次号'},
- {prop:'subBatchNum',title:'子件批次数量',type:'number'},
+ {prop:'subBatchNo',title:'子件批次号',required:true},
+ {prop:'subBatchNum',title:'子件批次数量',type:'number',required:true},
{prop:'subBatchSn',title:'子件SN码'},
- {prop:'empCode',title:'检验人员编号'},
- {prop:'empName',title:'检验人员姓名'},
- {prop:'deviceCode',title:'检测设备编号'},
- {prop:'deviceName',title:'检测设备名称'},
- {prop:'featureName',title:'参数/特性名称'},
- {prop:'featureUnit',title:'参数/特性单位'},
- {prop:'standardValue',title:'参数/特性标准值',width:180},
- {prop:'featureUpper',title:'参数/特性上限值',width:180},
- {prop:'featureLower',title:'参数/特性下限值',width:180},
- {prop:'featureValue',title:'参数/特性实测值',width:180},
- {prop:'checkNo',title:'来料检验单号'},
- {prop:'checkResult',title:'批次的最终判定结果',type:'filter',options:EnumList.checkResult,width:180},
- {prop:'checkTime',title:'检验时间',type:'datetime',width:180},
+ {prop:'empCode',title:'检验人员编号',required:true},
+ {prop:'empName',title:'检验人员姓名',required:true},
+ {prop:'deviceCode',title:'检测设备编号',required:true},
+ {prop:'deviceName',title:'检测设备名称',required:true},
+ {prop:'featureName',title:'参数/特性名称',required:true},
+ {prop:'featureUnit',title:'参数/特性单位',required:true},
+ {prop:'standardValue',title:'参数/特性标准值',width:180,required:true},
+ {prop:'featureUpper',title:'参数/特性上限值',width:180,required:true},
+ {prop:'featureLower',title:'参数/特性下限值',width:180,required:true},
+ {prop:'featureValue',title:'参数/特性实测值',width:180,required:true},
+ {prop:'checkNo',title:'来料检验单号',required:true},
+ {prop:'checkResult',title:'批次的最终判定结果',type:'filter',options:EnumList.checkResult,width:180,required:true},
+ {prop:'checkTime',title:'检验时间',type:'datetime',width:180,required:true},
{prop:'samplingRate',title:'控制项要求频率',type:'number'},
{prop:'limitUpdateTime',title:'上下限更新时间',type:'datetime',width:180},
{prop:'vendorFieldDesc',title:'控制项描述'},
- {prop:'vendorFieldCode',title:'控制项代码'},
- {prop:'deadLine',title:'库存有效日期',type:'datetime',width:180},
+ {prop:'vendorFieldCode',title:'控制项代码',required:true},
+ {prop:'deadLine',title:'库存有效日期',type:'datetime',width:180,required:true},
],
// 排产数据
cherysupplierproscheduling:[
@@ -409,46 +409,46 @@ const apiTableColumns = {
],
// 供应商基础信息
cherysupplierinfo:[
- {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:'keyStation',title:'是否关键工位',width:160,type:'tagFilter',options:EnumList.whetherByYN},
- {prop:'dataUpdateTime',title:'供应商修改时间',width:180,type:'datetime'},
- {prop:'productionLineOrder',title:'产线顺序',type:'number'},
- {prop:'stationOrder',title:'工位顺序',type:'number'},
- {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:'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:'keyStation',title:'是否关键工位',width:160,type:'tagFilter',options:EnumList.whetherByYN,required:true},
+ {prop:'dataUpdateTime',title:'供应商修改时间',width:180,type:'datetime',required:true},
+ {prop:'productionLineOrder',title:'产线顺序',type:'number',required:true},
+ {prop:'stationOrder',title:'工位顺序',type:'number',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},
],
// 人员资质信息
cherysupplieremployee:[
- {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:'operatorId',title:'工位人员账号',width:160},
- {prop:'operatorName',title:'工位人员姓名',width:160},
- {prop:'haveQuantity',title:'是否有资质',width:160,type:'tagFilter',options:EnumList.whetherByYN},
- {prop:'dataUpdateTime',title:'供应商修改时间',width:180,type:'datetime'},
- {prop:'positionId',title:'岗位代码'},
- {prop:'positionName',title:'岗位名称'},
- {prop:'qualificationLevel',title:'资质等级'},
- {prop:'checkInTime',title:'资质获取时间',width:180,type:'datetime'},
- {prop:'checkOutTime',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:'operatorId',title:'工位人员账号',width:160,required:true},
+ {prop:'operatorName',title:'工位人员姓名',width:160,required:true},
+ {prop:'haveQuantity',title:'是否有资质',width:160,type:'tagFilter',options:EnumList.whetherByYN,required:true},
+ {prop:'dataUpdateTime',title:'供应商修改时间',width:180,type:'datetime',required:true},
+ {prop:'positionId',title:'岗位代码',required:true},
+ {prop:'positionName',title:'岗位名称',required:true},
+ {prop:'qualificationLevel',title:'资质等级',required:true},
+ {prop:'checkInTime',title:'资质获取时间',width:180,type:'datetime',required:true},
+ {prop:'checkOutTime',title:'资质失去时间',width:180,type:'datetime',required:true},
],
// BOM主数据
cherysupplierbom:[
@@ -472,96 +472,97 @@ const apiTableColumns = {
],
// 过程控制项质量数据
cherysupplierprocps:[
- {prop:'supplierCode',title:'供应商代码'},
- {prop:'supplierName',title:'供应商名称'},
- {prop:'vendorProductNo',title:'供应商总成零件号',width:180},
- {prop:'vendorProductName',title:'供应商总成零件名称',width:180},
- {prop:'vendorProductSn',title:'供应商总成SN码',width:180},
- {prop:'vendorProductBatch',title:'供应商总成批次号',width:180},
- {prop:'cheryProductNo',title:'奇瑞零件号'},
- {prop:'cheryProductName',title:'奇瑞零件名称',width:180},
- {prop:'cheryProductSn',title:'奇瑞SN码'},
- {prop:'productBatchNo',title:'生产批次号'},
- {prop:'manufactureNo',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:'empCode',title:'工位人员编号'},
- {prop:'empName',title:'工位人员姓名'},
- {prop:'vendorFieldName',title:'控制项名称'},
- {prop:'vendorFieldCode',title:'控制项代码'},
+ {prop:'supplierCode',title:'供应商代码',required:true},
+ {prop:'supplierName',title:'供应商名称',required:true},
+ {prop:'vendorProductNo',title:'供应商总成零件号',width:180,required:true},
+ {prop:'vendorProductName',title:'供应商总成零件名称',width:180,required:true},
+ {prop:'vendorProductSn',title:'供应商总成SN码',width:180,required:true},
+ {prop:'vendorProductBatch',title:'供应商总成批次号',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:'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:'empCode',title:'工位人员编号',required:true},
+ {prop:'empName',title:'工位人员姓名',required:true},
+ {prop:'vendorFieldName',title:'控制项名称',required:true},
+ {prop:'vendorFieldCode',title:'控制项代码',required:true},
{prop:'gatherSpot',title:'控制项点位'},
{prop:'samplingRate',title:'控制项要求频率',type:'number'},
{prop:'limitUpdateTime',title:'上下限更新时间',type:'datetime',width:180},
{prop:'vendorFieldDesc',title:'控制项描述'},
{prop:'carrierCode',title:'载体编码'},
- {prop:'intputQty',title:'投入数量',type:'number'},
- {prop:'fttQty',title:'一次合格数量',type:'number'},
- {prop:'parameter',title:'参数',width:160,type:'tagFilter',options:EnumList.whetherByYN},
- {prop:'characteristic',title:'特性',width:160,type:'tagFilter',options:EnumList.whetherByYN},
- {prop:'cc',title:'cc项',width:160,type:'tagFilter',options:EnumList.whetherByYN},
- {prop:'sc',title:'sc项',width:160,type:'tagFilter',options:EnumList.whetherByYN},
- {prop:'spc',title:'SPC',width:160,type:'tagFilter',options:EnumList.whetherByYN},
- {prop:'standardValue',title:'控制项标准值',width:150},
- {prop:'upperLimit',title:'控制项上限',type:'number'},
- {prop:'lowerLimit',title:'控制项下限',type:'number'},
- {prop:'decimalValue',title:'控制项实测值',type:'number'},
+ {prop:'intputQty',title:'投入数量',type:'number',required:true},
+ {prop:'fttQty',title:'一次合格数量',type:'number',required:true},
+ {prop:'parameter',title:'参数',width:160,type:'tagFilter',options:EnumList.whetherByYN,required:true},
+ {prop:'characteristic',title:'特性',width:160,type:'tagFilter',options:EnumList.whetherByYN,required:true},
+ {prop:'cc',title:'cc项',width:160,type:'tagFilter',options:EnumList.whetherByYN,required:true},
+ {prop:'sc',title:'sc项',width:160,type:'tagFilter',options:EnumList.whetherByYN,required:true},
+ {prop:'spc',title:'SPC',width:160,type:'tagFilter',options:EnumList.whetherByYN,required:true},
+ {prop:'standardValue',title:'控制项标准值',width:150,required:true},
+ {prop:'upperLimit',title:'控制项上限',type:'number',required:true},
+ {prop:'lowerLimit',title:'控制项下限',type:'number',required:true},
+ {prop:'decimalValue',title:'控制项实测值',type:'number',required:true},
{prop:'unitCn',title:'控制项值的单位名称',width:180},
- {prop:'unitEn',title:'控制项单位英文',width:180},
- {prop:'checkResult',title:'检测结果'},
+ {prop:'unitEn',title:'控制项单位英文',width:180,required:true},
+ {prop:'checkResult',title:'检测结果',required:true},
{prop:'detectionMode',title:'在线检测',type:'filter',options:EnumList.detectionMode},
- {prop:'workShift',title:'班次',type:'filter',options:EnumList.workShift},
- {prop:'collectTime',title:'采集时间',type:'datetime',width:180},
- {prop:'checkMode',title:'检测方式',type:'filter',options:EnumList.checkMode},
- {prop:'deviceCode',title:'检测设备编号'},
- {prop:'deviceName',title:'检测设备名称'},
+ {prop:'workShift',title:'班次',type:'filter',options:EnumList.workShift,required:true},
+ {prop:'collectTime',title:'采集时间',type:'datetime',width:180,required:true},
+ {prop:'checkMode',title:'检测方式',type:'filter',options:EnumList.checkMode,required:true},
+ {prop:'deviceCode',title:'检测设备编号',required:true},
+ {prop:'deviceName',title:'检测设备名称',required:true},
],
// 生产过程数据
cherysupplierprodata:[
- {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:'empCode',title:'工位人员编号',width:160},
- {prop:'empName',title:'工位人员姓名',width:160},
- {prop:'vendorProductName',title:'供应商总成零件名称',width:180},
- {prop:'vendorProductNo',title:'供应商总成零件号',width:180},
- {prop:'vendorProductBatch',title:'供应商总成批次号'},
- {prop:'vendorProductSn',title:'供应商总成SN码'},
- {prop:'subProdNo',title:'子件编码'},
- {prop:'subProdName',title:'子件名称'},
- {prop:'subBatchNo',title:'子件批次号'},
+ {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:'empCode',title:'工位人员编号',width:160,required:true},
+ {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:'subProdNo',title:'子件编码',required:true},
+ {prop:'subProdName',title:'子件名称',required:true},
+ {prop:'subBatchNo',title:'子件批次号',required:true},
{prop:'childPackageInfo',title:'子件分包号'},
- {prop:'subProdNum',title:'子件扣料数量',type:'number',width:160},
- {prop:'childSource',title:'子件物料来源',width:160},
+ {prop:'subProdNum',title:'子件扣料数量',type:'number',width:160,required:true},
+ {prop:'subProdSn',title:'子件SN码',width:160,required:true},
+ {prop:'childSource',title:'子件物料来源',width:160,required:true},
{prop:'subSupplierCode',title:'分供方代码'},
{prop:'subSupplierName',title:'分供方名称'},
- {prop:'cheryProductNo',title:'奇瑞零件号'},
- {prop:'cheryProductName',title:'奇瑞零件名称',width:180},
- {prop:'cheryProductSn',title:'奇瑞SN码'},
- {prop:'manufactureNo',title:'生产工单号'},
+ {prop:'cheryProductNo',title:'奇瑞零件号',required:true},
+ {prop:'cheryProductName',title:'奇瑞零件名称',width:180,required:true},
+ {prop:'cheryProductSn',title:'奇瑞SN码',required:true},
+ {prop:'manufactureNo',title:'生产工单号',required:true},
{prop:'productBatchNo',title:'生产批次号'},
- {prop:'workShift',title:'班次',type:'filter',options:EnumList.workShift},
- {prop:'materialInputTime',title:'进工位的时间',type:'datetime',width:180},
- {prop:'materialOutputTime',title:'出工位的时间',type:'datetime',width:180},
- {prop:'vendorFieldNum',title:'装配设备编号',width:160},
- {prop:'vendorFieldName',title:'装配设备名称',width:160},
+ {prop:'workShift',title:'班次',type:'filter',options:EnumList.workShift,required:true},
+ {prop:'materialInputTime',title:'进工位的时间',type:'datetime',width:180,required:true},
+ {prop:'materialOutputTime',title:'出工位的时间',type:'datetime',width:180,required:true},
+ {prop:'vendorFieldNum',title:'装配设备编号',width:160,required:true},
+ {prop:'vendorFieldName',title:'装配设备名称',width:160,required:true},
{prop:'instrumentQualityStatus',title:'设备判定的质量状态',type:'filter',options:EnumList.checkResult,width:180},
{prop:'manualQualityStatus',title:'人工判定的质量状态',type:'filter',options:EnumList.checkResult,width:180},
- {prop:'finalQualityStatus',title:'最终质量状态',type:'filter',options:EnumList.checkResult,width:180},
- {prop:'collectTime',title:'采集时间',type:'datetime',width:180},
- {prop:'dateTime',title:'子件绑定扫码时间',type:'datetime',width:180},
+ {prop:'finalQualityStatus',title:'最终质量状态',type:'filter',options:EnumList.checkResult,width:180,required:true},
+ {prop:'collectTime',title:'采集时间',type:'datetime',width:180,required:true},
+ {prop:'dateTime',title:'子件绑定扫码时间',type:'datetime',width:180,required:true},
{prop:'parentHardwareRevision',title:'父件硬件版本号',width:180},
{prop:'parentSoftwareRevision',title:'父件软件版本号',width:180},
{prop:'childHardwareRevision',title:'子件硬件版本号',width:180},
@@ -569,28 +570,28 @@ const apiTableColumns = {
],
// 产品一次合格率
cherysupplierprofirstpassyield:[
- {prop:'supplierCode',title:'供应商代码'},
- {prop:'supplierName',title:'供应商名称'},
- {prop:'vendorProductNo',title:'供应商总成零件号',width:180},
- {prop:'vendorProductName',title:'供应商总成零件名称',width:180},
- {prop:'plantId',title:'工厂代码'},
- {prop:'plantName',title:'工厂名称'},
- {prop:'workshopId',title:'车间代码'},
- {prop:'workshopName',title:'车间名称'},
- {prop:'productionLineId',title:'产线代码'},
- {prop:'productionLineName',title:'产线名称'},
- {prop:'cheryProductNo',title:'奇瑞零件号'},
- {prop:'cheryProductName',title:'奇瑞零件名称',width:180},
- {prop:'manufactureNo',title:'生产工单号'},
- {prop:'productBatchNo',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:'vendorProductNo',title:'供应商总成零件号',width:180,required:true},
+ {prop:'vendorProductName',title:'供应商总成零件名称',width:180,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:'cheryProductNo',title:'奇瑞零件号',required:true},
+ {prop:'cheryProductName',title:'奇瑞零件名称',width:180,required:true},
+ {prop:'manufactureNo',title:'生产工单号',required:true},
+ {prop:'productBatchNo',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},
],
// 工位一次合格率
cherysupplierprostationfirstpassyield:[
diff --git a/Web/src/views/demo/tablePageDemo.vue b/Web/src/views/demo/tablePageDemo.vue
index de9b8cc..851a704 100644
--- a/Web/src/views/demo/tablePageDemo.vue
+++ b/Web/src/views/demo/tablePageDemo.vue
@@ -13,7 +13,7 @@ import { reactive, ref, onMounted } from 'vue'
import tablePage from '@/components/tablePage/index.vue'
const state = reactive({
- apiName:'supplierproplaning',
+ apiName:'tablePageDemo',
searchFilter: {
materialCode: null,
// createTime:null,
@@ -33,10 +33,16 @@ const state = reactive({
// ],
// 右侧操作列方式1,默认为api通用方式
- // rightOperation:'apiUpdate',
+ // rightOperation:'apiUpdate,apiDelete',
//右侧操作列方式2,自定义方式,如果需要默认的api,则使用showApiRightOperation传参
// rightOperation:[],
// showApiRightOperation:['apiUpdate']
+ // 新增/编辑特殊rule
+ // apiEditFormRules:{
+ // supplierCode: [{ required: true, message: '必填项', trigger: 'blur' }],
+ // supplierName: [{ required: true, message: '必填项', trigger: 'blur' }],
+ // deadLine: [{ required: true, message: '必填项', trigger: 'blur' }],
+ // }
})
// 左侧操作事件
@@ -52,4 +58,6 @@ const state = reactive({
// @leftOperationHadel="leftOperationHadel"
// :rightOperation="state.rightOperation"
// :showApiRightOperation="state.showApiRightOperation"
+// :apiEditFormRules="state.apiEditFormRules"
+
\ No newline at end of file
diff --git a/Web/src/views/logisticsPlan/supplierInvData/index.vue b/Web/src/views/logisticsPlan/supplierInvData/index.vue
index 193f3f2..06f33ff 100644
--- a/Web/src/views/logisticsPlan/supplierInvData/index.vue
+++ b/Web/src/views/logisticsPlan/supplierInvData/index.vue
@@ -7,6 +7,7 @@
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierBom/index.vue b/Web/src/views/productionQuality/supplierBom/index.vue
new file mode 100644
index 0000000..2b41553
--- /dev/null
+++ b/Web/src/views/productionQuality/supplierBom/index.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierEmployee/index.vue b/Web/src/views/productionQuality/supplierEmployee/index.vue
new file mode 100644
index 0000000..d4c6cb6
--- /dev/null
+++ b/Web/src/views/productionQuality/supplierEmployee/index.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierInfo/index.vue b/Web/src/views/productionQuality/supplierInfo/index.vue
new file mode 100644
index 0000000..dfc0ff0
--- /dev/null
+++ b/Web/src/views/productionQuality/supplierInfo/index.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierProCps/index.vue b/Web/src/views/productionQuality/supplierProCps/index.vue
new file mode 100644
index 0000000..a885862
--- /dev/null
+++ b/Web/src/views/productionQuality/supplierProCps/index.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierProData/index.vue b/Web/src/views/productionQuality/supplierProData/index.vue
new file mode 100644
index 0000000..a5dfebe
--- /dev/null
+++ b/Web/src/views/productionQuality/supplierProData/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
new file mode 100644
index 0000000..2e84fc9
--- /dev/null
+++ b/Web/src/views/productionQuality/supplierProFirstPassyield/index.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierProMaterialStock/index.vue b/Web/src/views/productionQuality/supplierProMaterialStock/index.vue
index 47b1a86..c8e23b3 100644
--- a/Web/src/views/productionQuality/supplierProMaterialStock/index.vue
+++ b/Web/src/views/productionQuality/supplierProMaterialStock/index.vue
@@ -5,12 +5,12 @@
:searchOptions="state.searchOptions"
:searchFilter="state.searchFilter"
:rightOperation="state.rightOperation"
- :apiEditFormRules="state.apiEditFormRules"
- :searchButtons="['search','import','export','custominvoke']"
+ :searchButtons="['search','export','custominvoke']"
>
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierProScheduling/index.vue b/Web/src/views/productionQuality/supplierProScheduling/index.vue
index 6530b0d..a5b611e 100644
--- a/Web/src/views/productionQuality/supplierProScheduling/index.vue
+++ b/Web/src/views/productionQuality/supplierProScheduling/index.vue
@@ -7,6 +7,7 @@