zhibinlv
/
QRAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

导出及日志需求更改

web
安虹睿 19 hours ago
parent
c018c2361b
commit
4661399fba
3 changed files with 25 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Web/src/components/tablePage/index.vue
  2. 34
      Web/src/utils/common/apiTableColumns.js
  3. 9
      Web/src/views/task/components/commonLogPage.vue

2
Web/src/components/tablePage/index.vue
View File

@ -582,7 +582,7 @@
function exportHandle(isAll){
state.loading = true
//同步数据查询
getTableData(1,(res=>{
getTableData(false,(res=>{
let _params = getPageParams()
if(isAll){_params = getPageParams(res.data.totalCount)}
postCommonExport(props.apiName,_params)

34
Web/src/utils/common/apiTableColumns.js
View File

@ -51,7 +51,7 @@ const apiTableColumns = {
// 整车月度生产计划2
supplierproplaning:[
{prop:'releaseEdition',title:'需求发布版次',width:150},
{prop:'materialCode',title:'物料号',width:150},
{prop:'materialCode',title:'物料号',width:180},
{prop:'models',title:'车型'},
{prop:'salseDepartment',title:'销售单位'},
{prop:'type',title:'类型'},
@ -76,7 +76,7 @@ const apiTableColumns = {
// M+6月物料需求计划
cherysuppliermrpmonth:[
{prop:'releaseEdition',title:'需求发布版次',width:150},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'materialDescription',title:'零件名称'},
{prop:'plantId',title:'工厂代码'},
{prop:'plantName',title:'工厂名称'},
@ -107,7 +107,7 @@ const apiTableColumns = {
{prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
{prop:'supplierCode',title:'供应商代码',width:120},
{prop:'releaseEdition',title:'需求发布版次',width:150},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'plantId',title:'工厂代码',width:120},
{prop:'feedbackResults',title:'反馈结果',type:'filterSelect',options:EnumList.feedbackResults,required:true,noClear:true},
{prop:'ventureType',title:'风险类型',type:'filterSelect',options:EnumList.ventureType},
@ -131,7 +131,7 @@ const apiTableColumns = {
// M+6月物料需求计划风险确认-明细
cherysupplierconmmrpDetail:[
{prop:'releaseEdition',title:'需求发布版次',width:150},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'materialDescription',title:'零件名称'},
{prop:'plantId',title:'工厂代码'},
{prop:'plantName',title:'工厂名称'},
@ -162,7 +162,7 @@ const apiTableColumns = {
// 日物料需求计划
cherysuppliermrpdata:[
{prop:'releaseEdition',title:'需求发布版次',width:150},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'materialDescription',title:'零件名称'},
{prop:'plantId',title:'工厂代码'},
{prop:'plantName',title:'工厂名称'},
@ -212,7 +212,7 @@ const apiTableColumns = {
{prop:'readState',title:'是否已确认',type:'tagFilter',options:EnumList.whetherBoolean,width:120,noEdit:true},
{prop:'supplierCode',title:'供应商代码',width:120},
{prop:'releaseEdition',title:'需求发布版次',width:150},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'plantId',title:'工厂代码',width:120},
{prop:'feedbackResults',title:'反馈结果',type:'filterSelect',options:EnumList.feedbackResults,required:true,noClear:true},
{prop:'ventureType',title:'风险类型',type:'filterSelect',options:EnumList.ventureType},
@ -255,7 +255,7 @@ const apiTableColumns = {
// 日物料需求计划风险确认-明细
cherysuppliercondateDetail:[
{prop:'releaseEdition',title:'需求发布版次',width:150},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'materialDescription',title:'零件名称'},
{prop:'plantId',title:'工厂代码'},
{prop:'plantName',title:'工厂名称'},
@ -303,7 +303,7 @@ const apiTableColumns = {
cherysuppliersaweek:[
{prop:'scheduleAgreement',title:'计划协议号',width:120},
{prop:'serialNumber',title:'行项目号'},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'materialDescription',title:'零件名称'},
{prop:'purchasingGroup',title:'采购组'},
{prop:'plantId',title:'工厂代码'},
@ -394,7 +394,7 @@ const apiTableColumns = {
{prop:'vin',title:'VIN'},
{prop:'productionLineId',title:'产线代码'},
{prop:'productionLineName',title:'产线名称'},
{prop:'materialCode',title:'物料编码',width:150},
{prop:'materialCode',title:'物料编码',width:180},
{prop:'materialDescription',title:'物料描述'},
{prop:'productionType',title:'报工类型'},
{prop:'onLineTime',title:'上线日期时间',width:180},
@ -411,7 +411,7 @@ const apiTableColumns = {
{prop:'vin',title:'VIN'},
{prop:'productionLineId',title:'产线代码'},
{prop:'productionLineName',title:'产线名称'},
{prop:'materialCode',title:'物料编码',width:150},
{prop:'materialCode',title:'物料编码',width:180},
{prop:'materialDescription',title:'物料描述'},
{prop:'onLineTime',title:'上线日期时间',width:180},
{prop:'finalWorkshop',title:'总装车间'},
@ -433,7 +433,7 @@ const apiTableColumns = {
{prop:'pickUpCrossings',title:'取货道口'},
{prop:'feedback',title:'反馈信息'},
{prop:'plant',title:'工厂'},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'materialDescription',title:'零件名称'},
{prop:'quantityDelivery',title:'数量'},
{prop:'returnType',title:'退货类型',type:'filter',options:EnumList.returnType},
@ -451,7 +451,7 @@ const apiTableColumns = {
supplierinvdata:[
{prop:'plantId',title:'工厂代码'},
{prop:'plantName',title:'工厂名称'},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'materialDescription',title:'零件名称'},
{prop:'quantityCurrent',title:'前库存数量'},
{prop:'stockState',title:'库存状态'},
@ -470,7 +470,7 @@ const apiTableColumns = {
{prop:'supplierCode',title:'供应商代码',required:true},
{prop:'supplierName',title:'供应商名称',required:true},
{prop:'serialNumber',title:'行项目号'},
{prop:'materialCode',title:'零件号',required:true,width:150},
{prop:'materialCode',title:'零件号',required:true,width:180},
{prop:'materialDescription',title:'零件名称',required:true},
{prop:'materialType',title:'物料类型',type:'filter',options:EnumList.materialType},
{prop:'quantityCurrent',title:'当前库存数量',type:'number',required:true},
@ -489,7 +489,7 @@ const apiTableColumns = {
{prop:'plantName',title:'工厂名称'},
{prop:'demandSrate',title:'需求状态'},
{prop:'demandType',title:'需求类型'},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'materialDescription',title:'零件名称'},
{prop:'summarySign',title:'集货标识'},
{prop:'dateRequired',title:'需求日期',width:180},
@ -514,7 +514,7 @@ const apiTableColumns = {
// 日MRP预警推移
cherysuppliermrpwarning:[
{prop:'plantId',title:'工厂代码'},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'materialDescription',title:'零件名称'},
{prop:'quantityCurrent',title:'当前库存'},
{prop:'reckonDate',title:'需求日期',width:180},
@ -536,7 +536,7 @@ const apiTableColumns = {
{prop:'deliveryNumber',title:'配送单号'},
{prop:'serialNumber',title:'行项目号'},
{prop:'serialSrate',title:'配送单状态'},
{prop:'materialCode',title:'零件号',width:150},
{prop:'materialCode',title:'零件号',width:180},
{prop:'materialDescription',title:'零件名称'},
{prop:'plantId',title:'工厂代码'},
{prop:'receivingCrossings',title:'收货道口'},
@ -559,7 +559,7 @@ const apiTableColumns = {
{prop:'vin',title:'VIN'},
{prop:'productionLineId',title:'产线代码'},
{prop:'productionLineName',title:'产线名称'},
{prop:'materialCode',title:'物料编码',width:150},
{prop:'materialCode',title:'物料编码',width:180},
{prop:'materialDescription',title:'物料描述'},
{prop:'sortDate',title:'排序日期'},
{prop:'sortTime',title:'排序时间'},

9
Web/src/views/task/components/commonLogPage.vue
View File

@ -84,11 +84,16 @@
],
searchFilterOptions:{ module:{action:'=='} },
leftOperation:[
{label:'查看详情',name:'showInfo',link:true,type:'primary'},
{
label:'查看详情',name:'showInfo',link:true,type:'primary',
disabled:(row)=>{
return row.type == '应答'
}
},
{
label:'下载JSON',name:'downloadJSON',link:true,type:'warning',
disabled:(row)=>{
return !row.path || row.path == ''
return (!row.path || row.path == '') || row.type == '应答'
}
},
],

Write Preview
Loading…
Cancel
Save