diff --git a/Web/src/api/common/index.js b/Web/src/api/common/index.js index 4c7738a..fa085a6 100644 --- a/Web/src/api/common/index.js +++ b/Web/src/api/common/index.js @@ -2,21 +2,21 @@ import request from '@/utils/request' // 获取分页 -export function getCommonPaged(urlName,params) { +export function getCommonPaged(urlName,data) { return request({ - url: `/api/${urlName}/getpaged`, - method: 'get', - params:params + url: `/api/${urlName}/getdatapaged`, + method: 'post', + data }) } // 导出 -export function postCommonExport(urlName,params) { +export function postCommonExport(urlName,data) { return request({ - url: `/api/${urlName}/export`, - method: 'get', + url: `/api/${urlName}/exportdata`, + method: 'post', responseType:'blob', - params:params + data }) } diff --git a/Web/src/components/elPager/index.vue b/Web/src/components/elPager/index.vue index fced1f7..de33d1f 100644 --- a/Web/src/components/elPager/index.vue +++ b/Web/src/components/elPager/index.vue @@ -52,7 +52,7 @@ const emits = defineEmits(['pageSizeChange', 'pageCurrentChange']) watch(props.pager, (val) => { - state.currentPage = val.Page + state.currentPage = val.page }) // size-change diff --git a/Web/src/components/tablePage/index.vue b/Web/src/components/tablePage/index.vue index 4e6b94e..30011b4 100644 --- a/Web/src/components/tablePage/index.vue +++ b/Web/src/components/tablePage/index.vue @@ -1,17 +1,51 @@ @@ -11,7 +10,6 @@ defineOptions({ name: 'supplierMrpMonth' }) import { reactive, ref, onMounted } from 'vue' import tablePage from '@/components/tablePage/index.vue' -import EnumList from '@/utils/common/enumList' const state = reactive({ apiName:'cherysuppliermrpmonth', @@ -21,32 +19,5 @@ const state = reactive({ searchOptions:[ {type:'input',prop:'materialCode',label:'零件号'} ], - tableColumns: [ - {prop:'releaseEdition',title:'需求发布版次',width:150}, - {prop:'materialCode',title:'零件号'}, - {prop:'materialDescription',title:'零件名称'}, - {prop:'plantId',title:'工厂代码'}, - {prop:'plantName',title:'工厂名称'}, - {prop:'startMonth',title:'起始年月'}, - {prop:'quantityDemand1',title:'需求数量1'}, - {prop:'quantityDemand2',title:'需求数量2'}, - {prop:'quantityDemand3',title:'需求数量3'}, - {prop:'quantityDemand4',title:'需求数量4'}, - {prop:'quantityDemand5',title:'需求数量5'}, - {prop:'quantityDemand6',title:'需求数量6'}, - {prop:'quantityDemand7',title:'需求数量7'}, - {prop:'quantityDemand8',title:'需求数量8'}, - {prop:'quantityDemand9',title:'需求数量9'}, - {prop:'quantityDemand10',title:'需求数量10',width:130}, - {prop:'quantityDemand11',title:'需求数量11',width:130}, - {prop:'quantityDemand12',title:'需求数量12',width:130}, - {prop:'isUpdate',title:'是否更新',type:'tagFilter',options:EnumList.whether}, - {prop:'createByUser',title:'创建人'}, - {prop:'createTime',title:'创建时间',width:180}, - {prop:'updateByUser',title:'修改人'}, - {prop:'updateTime',title:'修改时间',width:180}, - {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether}, - {prop:'version',title:'版本号'}, - ], }) diff --git a/Web/src/views/logisticsPlan/supplierMrpWarning/index.vue b/Web/src/views/logisticsPlan/supplierMrpWarning/index.vue new file mode 100644 index 0000000..f61a1d2 --- /dev/null +++ b/Web/src/views/logisticsPlan/supplierMrpWarning/index.vue @@ -0,0 +1,23 @@ + + + \ No newline at end of file diff --git a/Web/src/views/logisticsPlan/supplierPo/index.vue b/Web/src/views/logisticsPlan/supplierPo/index.vue index bc32039..0023fb4 100644 --- a/Web/src/views/logisticsPlan/supplierPo/index.vue +++ b/Web/src/views/logisticsPlan/supplierPo/index.vue @@ -2,7 +2,6 @@ @@ -11,7 +10,6 @@ defineOptions({ name: 'supplierPo' }) import { reactive, ref, onMounted } from 'vue' import tablePage from '@/components/tablePage/index.vue' -import EnumList from '@/utils/common/enumList' const state = reactive({ apiName:'cherysupplierpo', @@ -21,32 +19,5 @@ const state = reactive({ searchOptions:[ {type:'input',prop:'purchaseOrder',label:'采购订单号'} ], - tableColumns: [ - {prop:'purchaseOrder',title:'采购订单号',width:120}, - {prop:'serialNumber',title:'行项目号'}, - {prop:'plantId',title:'工厂代码'}, - {prop:'plantName',title:'工厂名称'}, - {prop:'voucherDate',title:'凭证日期',width:180}, - {prop:'purchaser',title:'需方联系人'}, - {prop:'supplier',title:'供方联系人'}, - {prop:'materialCode',title:'物料编码'}, - {prop:'materialDescription',title:'物料描述'}, - {prop:'quantityDemand',title:'需求数量'}, - {prop:'materialUnit',title:'物料单位'}, - {prop:'deliveryDate',title:'交货日期',width:180}, - {prop:'deliveryPlace',title:'交货地点'}, - {prop:'quantityDelivery',title:'到货数量'}, - {prop:'note',title:'备注'}, - {prop:'itemType',title:'项目类别文本',width:150}, - {prop:'tradeTerms',title:'国际贸易条件',width:150}, - {prop:'country',title:'出口国家'}, - {prop:'batch',title:'批次'}, - {prop:'createByUser',title:'创建人'}, - {prop:'createTime',title:'创建时间',width:180}, - {prop:'updateByUser',title:'修改人'}, - {prop:'updateTime',title:'修改时间',width:180}, - {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether}, - {prop:'version',title:'版本号'}, - ], }) \ No newline at end of file diff --git a/Web/src/views/logisticsPlan/supplierProPlaning/index.vue b/Web/src/views/logisticsPlan/supplierProPlaning/index.vue index 462afd0..2de8b53 100644 --- a/Web/src/views/logisticsPlan/supplierProPlaning/index.vue +++ b/Web/src/views/logisticsPlan/supplierProPlaning/index.vue @@ -2,7 +2,6 @@ @@ -11,39 +10,20 @@ defineOptions({ name: 'supplierProPlaning' }) import { reactive, ref, onMounted } from 'vue' import tablePage from '@/components/tablePage/index.vue' -import EnumList from '@/utils/common/enumList' const state = reactive({ apiName:'supplierproplaning', searchFilter: { - materialCode: null + materialCode: null, + // createTime:null, + // isDelete:null, + // quantity1:null }, searchOptions:[ - {type:'input',prop:'materialCode',label:'零件号'} - ], - tableColumns: [ - {prop:'releaseEdition',title:'需求发布版次',width:150}, - {prop:'models',title:'车型'}, - {prop:'salseDepartment',title:'销售单位'}, - {prop:'type',title:'类型'}, - {prop:'assembly',title:'动力总成'}, - {prop:'pattern',title:'版型'}, - {prop:'omterior',title:'内饰'}, - {prop:'materialCode',title:'物料号'}, - {prop:'startMonth',title:'起始月份'}, - {prop:'quantity1',title:'数量1'}, - {prop:'quantity2',title:'数量2'}, - {prop:'quantity3',title:'数量3'}, - {prop:'quantity4',title:'数量4'}, - {prop:'quantity5',title:'数量5'}, - {prop:'quantity6',title:'数量6'}, - {prop:'plant',title:'工厂'}, - {prop:'createByUser',title:'创建人'}, - {prop:'createTime',title:'创建时间',width:180}, - {prop:'updateByUser',title:'修改人'}, - {prop:'updateTime',title:'修改时间',width:180}, - {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether}, - {prop:'version',title:'版本号'}, + {type:'input',prop:'materialCode',label:'物料号'}, + // {type:'datetimerange',prop:'createTime',label:'创建时间'}, + // {type:'number',prop:'quantity1',label:'数量1'}, + // {type:'select',prop:'isDelete',label:'是否删除',options:EnumList.whether,noSearch:true}, ], }) \ No newline at end of file diff --git a/Web/src/views/logisticsPlan/supplierProTschedul/index.vue b/Web/src/views/logisticsPlan/supplierProTschedul/index.vue new file mode 100644 index 0000000..993a8e4 --- /dev/null +++ b/Web/src/views/logisticsPlan/supplierProTschedul/index.vue @@ -0,0 +1,23 @@ + + + \ No newline at end of file diff --git a/Web/src/views/logisticsPlan/supplierReturn/index.vue b/Web/src/views/logisticsPlan/supplierReturn/index.vue new file mode 100644 index 0000000..25c45fd --- /dev/null +++ b/Web/src/views/logisticsPlan/supplierReturn/index.vue @@ -0,0 +1,23 @@ + + + \ No newline at end of file diff --git a/Web/src/views/logisticsPlan/supplierSaWeek/index.vue b/Web/src/views/logisticsPlan/supplierSaWeek/index.vue index 573d4a9..1b3e41a 100644 --- a/Web/src/views/logisticsPlan/supplierSaWeek/index.vue +++ b/Web/src/views/logisticsPlan/supplierSaWeek/index.vue @@ -2,7 +2,6 @@ @@ -11,7 +10,6 @@ defineOptions({ name: 'supplierSaWeek' }) import { reactive, ref, onMounted } from 'vue' import tablePage from '@/components/tablePage/index.vue' -import EnumList from '@/utils/common/enumList' const state = reactive({ apiName:'cherysuppliersaweek', @@ -21,21 +19,5 @@ const state = reactive({ searchOptions:[ {type:'input',prop:'scheduleAgreement',label:'计划协议号'} ], - tableColumns: [ - {prop:'scheduleAgreement',title:'计划协议号',width:120}, - {prop:'serialNumber',title:'行项目号'}, - {prop:'materialCode',title:'零件号'}, - {prop:'materialDescription',title:'零件名称'}, - {prop:'purchasingGroup',title:'采购组'}, - {prop:'plantId',title:'工厂代码'}, - {prop:'quantityDemand',title:'需求数量'}, - {prop:'dateReceived',title:'交货日期',width:180}, - {prop:'createByUser',title:'创建人'}, - {prop:'createTime',title:'创建时间',width:180}, - {prop:'updateByUser',title:'修改人'}, - {prop:'updateTime',title:'修改时间',width:180}, - {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether}, - {prop:'version',title:'版本号'}, - ], }) \ No newline at end of file