diff --git a/src/api/oss/oss.js b/src/api/oss/oss.js index 220b171..bf855cc 100644 --- a/src/api/oss/oss.js +++ b/src/api/oss/oss.js @@ -20,3 +20,6 @@ export const removeOss = (data) => createAPI(`/oss/remove`,'post',data) export const previewOssFileById = (data) => createAPI(`/oss/${data.id}`,'post',777) export const previewOssFileById2 = (data) => createAPI(`/oss/2/${data.id}`,'post',777) + + +export const ossUploadNoSaveOSS = (data) => createAPI(`/oss/ossUploadNoSaveOSS`,'post',data) diff --git a/src/api/srm/srmSupplier.js b/src/api/srm/srmSupplier.js index d8174d1..82fbbe6 100644 --- a/src/api/srm/srmSupplier.js +++ b/src/api/srm/srmSupplier.js @@ -3,3 +3,6 @@ import { createAPI } from '@/utils/httpRequest.js' // 获取派工单的最新信息 export const searchSrmSupplierList = data => createAPI('/srmSupplier/searchSrmSupplierList', 'POST', data) export const searchSupplierGroupRequestList = data => createAPI('/srmSupplier/searchSupplierGroupRequestList', 'POST', data) +export const getSupplierGroupRequestList = data => createAPI('/srmSupplier/getSupplierGroupRequestList', 'POST', data) +export const createNewSupplierRequest = data => createAPI('/srmSupplier/createNewSupplierRequest', 'POST', data) +export const checkSrmSupplierList = data => createAPI('/srmSupplier/checkSrmSupplierList', 'POST', data) diff --git a/src/utils/resizable.js b/src/utils/resizable.js index b470110..34926ae 100644 --- a/src/utils/resizable.js +++ b/src/utils/resizable.js @@ -1,6 +1,6 @@ // v-resizable.js export default { - bind(el) { + bind() { const minWidth = 400; // 设置表格最小宽度 const minHeight = 200; // 设置表格最小高度 let startX, startY, startWidth, startHeight; diff --git a/src/views/demo/rqDemo.vue b/src/views/demo/rqDemo.vue new file mode 100644 index 0000000..ee77a95 --- /dev/null +++ b/src/views/demo/rqDemo.vue @@ -0,0 +1,215 @@ + + + + + + diff --git a/src/views/modules/srmSupplier/SupplierGroupReview.vue b/src/views/modules/srmSupplier/SupplierGroupReview.vue new file mode 100644 index 0000000..048be30 --- /dev/null +++ b/src/views/modules/srmSupplier/SupplierGroupReview.vue @@ -0,0 +1,396 @@ + + + + + + diff --git a/src/views/modules/srmSupplier/supplierGroupRequestList.vue b/src/views/modules/srmSupplier/supplierGroupRequestList.vue new file mode 100644 index 0000000..06b9b23 --- /dev/null +++ b/src/views/modules/srmSupplier/supplierGroupRequestList.vue @@ -0,0 +1,694 @@ + + + + + + diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue index 893a931..d873698 100644 --- a/src/views/modules/srmSupplier/supplierList.vue +++ b/src/views/modules/srmSupplier/supplierList.vue @@ -4,14 +4,25 @@ - - + + Supplier No + - + + + + + + + + + Query + {{'导出'}} + @@ -107,7 +118,7 @@ - + @@ -117,8 +128,8 @@ import { searchSupplierGroupRequestList,searchSrmSupplierList, } from '@/api/srm/srmSupplier.js' - - +import excel from "@/utils/excel-util.js"; +import Chooselist from '@/views/modules/common/Chooselist_eam' export default { data() { return { @@ -128,6 +139,7 @@ export default { searchData:{ supplierNo:'', supplierName:'', + supplierGroup:'', site:this.$store.state.user.site, page: 1, limit: 10, @@ -135,6 +147,7 @@ export default { pageIndex: 1, pageSize: 50, totalPage: 0, + tagNo:'', mainDataList:[], supplierGroupRequestList:[], dataListLoading: false, @@ -323,11 +336,12 @@ export default { fixed: false }, ], + exportName: '供应商信息'+this.dayjs().format('YYYYMMDDHHmmss'), } }, /*组件*/ components: { - + Chooselist, }, @@ -337,7 +351,23 @@ export default { }) }, methods: { + getBaseList(val, type) { + this.tagNo = val + this.$nextTick(() => { + let strVal = '' + if (val === 1100) { + strVal = this.searchData.supplierNo + } + this.$refs.baseList.init(val, strVal) + }) + }, + /* 列表方法的回调 */ + getBaseData(val) { + if (this.tagNo === 1100) { + this.searchData.supplierNo = val.supplier_no + } + }, getMainData(){ this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex @@ -403,7 +433,20 @@ export default { }); } }, - + async exportExcel() { + this.searchData.limit = -1 + this.searchData.page = 1 + excel.exportTable({ + url: "/srmSupplier/searchSrmSupplierList", + columnMapping: this.columnArray1,//可以直接用table,不需要的列就剔除 + mergeSetting: [],//需要合并的列 + params: this.searchData, + fileName: this.exportName+".xlsx", + rowFetcher: res => res.data, + columnFormatter: [], + dropColumns: [],//需要剔除的列,例如dropColumns: ["netWeight"],即剔除净重列 + }); + }, }, created() { //查询报表的类型