diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
index 1e02d379..f5fb0ce7 100644
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -3,6 +3,7 @@ import state from '@/store'
// 查询表格数据
export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) {
+ console.log(state.state.tagsView)
return request({
url: '',
method: 'post',
diff --git a/src/utils/curd.js b/src/utils/curd.js
index d28337aa..66817bfe 100644
--- a/src/utils/curd.js
+++ b/src/utils/curd.js
@@ -4,7 +4,7 @@ import { type } from './tool' // type判断传入值的类型，比typeof更详
export default {
install(Vue) {
Vue.prototype.exportExcel_NPOI = function(param) {
- console.log(ExcelDownLoad, param, 1111111111)
+ console.log(param, 1)
download(`${ExcelDownLoad}?param=${param}`)
}
Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {
@@ -272,10 +272,11 @@ export default {
}
function download(url) {
getBlob(url, function(blob, filename) {
+ console.log(blob, filename, 2)
saveAs(blob, filename)
})
}
-// function decodeUtf8(bytes) { var encoded = ''; for (var i = 0; i < bytes.length; i++) { encoded += '%' + bytes[i].toString(16) } return decodeURIComponent(encoded) }
+
function getBlob(url, cb) {
var xhr = new XMLHttpRequest()
xhr.open('GET', url, true)
@@ -283,14 +284,14 @@ function getBlob(url, cb) {
xhr.onload = function() {
if (xhr.status === 200) {
const name = xhr.getResponseHeader('content-disposition').split('=')[1]
- var filename1 = decodeURIComponent(name)
- cb(xhr.response, filename1)
+ var filename = decodeURIComponent(name)
+ cb(xhr.response, filename)
}
}
xhr.send()
}
-function saveAs(blob, filename = '下载文件.xls') {
+function saveAs(blob, filename) {
if (window.navigator.msSaveOrOpenBlob) {
navigator.msSaveBlob(blob, filename)
} else {
diff --git a/src/utils/request.js b/src/utils/request.js
index 1840b290..15f19c7e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,7 +17,7 @@ export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` //
export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel
+export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESDownloadExcel.ashx' // 导出excel
export const ExcelWaiGou = 'http://192.168.0.106:8045/submit/excel.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue
index 3a28894d..e0b0cd28 100644
--- a/src/views/Inventory/PurchaseInRecord/index.vue
+++ b/src/views/Inventory/PurchaseInRecord/index.vue
@@ -23,6 +23,7 @@
查询
+ 导出
{
for (let i = 0; i < response.data.length; i++) {
diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index 8db31c35..948f0dbe 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -23,6 +23,7 @@
查询
+ 导出
{
for (let i = 0; i < response.data.length; i++) {
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index 33790659..9161e59e 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -7,6 +7,7 @@
查询
+ 导出
@@ -190,6 +191,23 @@ export default {
this.searchMaterial()
},
methods: {
+ // EXCEL 导出
+ // 姜福壮
+ exportExcel() {
+ let check1, check2, check3
+ this.materialName ? check1 = 1 : check1 = 0
+ this.materialSpec ? check2 = 1 : check2 = 0
+ this.materialModel ? check3 = 1 : check3 = 0
+ var param = []
+ param[0] = ['物料名称_check', check1]
+ param[1] = ['物料名称', this.materialName]
+ param[2] = ['物料规格_check', check2]
+ param[3] = ['物料规格', this.materialSpec]
+ param[4] = ['物料型号_check', check3]
+ param[5] = ['物料型号', this.materialModel]
+ var Data = this.CreateData('00', '报表_采购部仓库_库存_查询', param)
+ this.exportExcel_NPOI(Data)
+ },
// 初始化数据
initData() {
const param = {
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 953f9c7c..34c9667e 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -287,10 +287,10 @@
-
+
-
+
{{ scope.row.物料名称 }}
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 259c9ab2..69d74422 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -45,6 +45,7 @@
新增
+ 导出
@@ -231,6 +232,7 @@ export default {
startTime: '',
endTime: '',
date: null,
+ time_check: 0,
PageCurrent: 1,
PageSize: 10,
total: null,
@@ -279,6 +281,28 @@ export default {
// this.fetchTableData1()
},
methods: {
+ // EXCEL 导出
+ // 姜福壮
+ exportExcel() {
+ if (this.contractNumber === '' || this.contractNumber === null) { this.contractNumber_check = 0 } else { this.contractNumber_check = 1 }
+ if (this.date !== null) {
+ this.time_check = 1
+ this.startTime = this.datetoYYMMDD(this.date[0])
+ this.endTime = this.datetoYYMMDD(this.date[1])
+ } else {
+ this.time_check = 0
+ this.startTime = ''
+ this.endTime = ''
+ }
+ var param = []
+ param[0] = ['项目流水号_check', this.contractNumber_check]
+ param[1] = ['项目流水号', this.contractNumber]
+ param[2] = ['日期_check', this.time_check]
+ param[3] = ['开始日期', this.startTime]
+ param[4] = ['结束日期', this.endTime]
+ var Data = this.CreateData('00', '报表_自家项目报表_查询', param)
+ this.exportExcel_NPOI(Data)
+ },
init() {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'entryName')
},
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 44f214f2..bed309cb 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -56,7 +56,6 @@
:row-class-name="tableRowClassName"
size="mini"
border
- stripe
style="width: 100%"
height="500px"
highlight-current-row
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index da4661a5..480991a3 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -28,17 +28,17 @@
- {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.组件名称 }}
+ {{ scope.row.零件名称 }}
- {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.组号 }}
+ {{ scope.row.图号或型号 }}
- {{ scope.row.材料 ? scope.row.材料 : scope.row.物料规格 }}
+ {{ scope.row.材料或规格 }}
@@ -62,7 +62,7 @@