diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js
index 45b96472..f0f8d699 100644
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -1,5 +1,26 @@
import request from '@/utils/request'
+// 查询询价单号
+export function getBillNum(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_创建询价单单号_查询数据'
+ }
+ })
+}
+export function getGongyings(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_创建询价单单号_查询数据'
+ }
+ })
+}
// 查询全部未询价的标准件和外购件
export function getExport1(num) {
return request({
@@ -130,7 +151,7 @@ export function searchSheetDetail(num2) {
})
}
// 创建询价单
-export function createInquirySheet(num1, num2, remark, id) {
+export function createInquirySheet(num1, id, num2, remark) {
return request({
url: '',
method: 'post',
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index d7d19599..d5dd4fca 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -340,6 +340,7 @@
+
+
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js b/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js
index a4a80fd7..20784f3a 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js
+++ b/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js
@@ -1,7 +1,7 @@
/* eslint-disable */
require('script-loader!file-saver');
-// import XLSX from 'xlsx'
-import XLSX from 'xlsx-style'
+import XLSX from 'xlsx'
+
function generateArray(table) {
var out = [];
var rows = table.querySelectorAll('tr');
@@ -145,74 +145,70 @@ export function export_table_to_excel(id) {
}
export function export_json_to_excel({
- headerGroup,
- dataGroup,
- sheetGroup,
+ multiHeader = [],
+ header,
+ data,
filename,
+ merges = [],
autoWidth = true,
bookType= 'xlsx'
} = {}) {
- var wb = new Workbook()
- for (let i = 0; i < dataGroup.length; i++) {
- /* original data */
- let data = dataGroup[i]
- filename = filename || 'excel-list'
- data = [...data]
- data.unshift(headerGroup[i]);
- var ws_name = sheetGroup[i];
- var ws = sheet_from_array_of_arrays(data);
+ /* original data */
+ filename = filename || 'excel-list'
+ data = [...data]
+ data.unshift(header);
- if (autoWidth) {
- /*设置worksheet每列的最大宽度*/
- const colWidth = data.map(row => row.map(val => {
- /*先判断是否为null/undefined*/
- if (val == null) {
- return {
- 'wch': 10
- };
- }
- /*再判断是否为中文*/
- else if (val.toString().charCodeAt(0) > 255) {
- return {
- 'wch': val.toString().length * 2
- };
- } else {
- return {
- 'wch': val.toString().length
- };
- }
- }))
- /*以第一行为初始值*/
- let result = colWidth[0];
- for (let i = 1; i < colWidth.length; i++) {
- for (let j = 0; j < colWidth[i].length; j++) {
- if (result[j]['wch'] < colWidth[i][j]['wch']) {
- result[j]['wch'] = colWidth[i][j]['wch'];
- }
+ for (let i = multiHeader.length-1; i > -1; i--) {
+ data.unshift(multiHeader[i])
+ }
+
+ var ws_name = "SheetJS";
+ var wb = new Workbook(),
+ ws = sheet_from_array_of_arrays(data);
+
+ if (merges.length > 0) {
+ if (!ws['!merges']) ws['!merges'] = [];
+ merges.forEach(item => {
+ ws['!merges'].push(XLSX.utils.decode_range(item))
+ })
+ }
+
+ if (autoWidth) {
+ /*设置worksheet每列的最大宽度*/
+ const colWidth = data.map(row => row.map(val => {
+ /*先判断是否为null/undefined*/
+ if (val == null) {
+ return {
+ 'wch': 10
+ };
+ }
+ /*再判断是否为中文*/
+ else if (val.toString().charCodeAt(0) > 255) {
+ return {
+ 'wch': val.toString().length * 2
+ };
+ } else {
+ return {
+ 'wch': val.toString().length
+ };
+ }
+ }))
+ /*以第一行为初始值*/
+ let result = colWidth[0];
+ for (let i = 1; i < colWidth.length; i++) {
+ for (let j = 0; j < colWidth[i].length; j++) {
+ if (result[j]['wch'] < colWidth[i][j]['wch']) {
+ result[j]['wch'] = colWidth[i][j]['wch'];
}
}
- ws['!cols'] = result;
}
- let R = 0;
- data.map(item => {
- let C = 0;
- item.map(itm => {
- var cell_ref = XLSX.utils.encode_cell({c:C,r:R});
- var cell = {v: itm }
- cell.s= {
- alignment: {
- horizontal: "center"
- }
- }
- ws[cell_ref] = cell;
- C++;
- })
- R++;
- })
- /* add worksheet to workbook */
- wb.SheetNames.push(ws_name);
- wb.Sheets[ws_name] = ws;
+ ws['!cols'] = result;
}
+
+ /* add worksheet to workbook */
+ wb.SheetNames.push(ws_name);
+ wb.Sheets[ws_name] = ws;
+
var wbout = XLSX.write(wb, {
bookType: bookType,
bookSST: false,
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index a284d243..86e91a88 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -706,11 +706,20 @@
-
+
-
-
+
+
+
+
+
+
+