diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
index b9c2393e..35ba5a4e 100644
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -1,4 +1,5 @@
import request from '@/utils/request'
+import state from '@/store'
// 查询表格数据
export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) {
@@ -6,6 +7,7 @@ export function searchtable(check1, ManufacturerAbbreviation, check2, starttime,
url: '',
method: 'post',
data: {
+ UserID: state.state.user.id,
type: '1',
name: '车间生产管理工艺_外协付款_查询',
param: '外协厂家_check=' + check1 + '&外协厂家=' + ManufacturerAbbreviation + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,
diff --git a/src/utils/curd.js b/src/utils/curd.js
index 5bbc55eb..d28337aa 100644
--- a/src/utils/curd.js
+++ b/src/utils/curd.js
@@ -1,10 +1,12 @@
-/**
-Created by hedekun
-20180727
- */
+import { ExcelDownLoad } from '@/utils/request'
+
import { type } from './tool' // type判断传入值的类型,比typeof更详细
export default {
install(Vue) {
+ Vue.prototype.exportExcel_NPOI = function(param) {
+ console.log(ExcelDownLoad, param, 1111111111)
+ download(`${ExcelDownLoad}?param=${param}`)
+ }
Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {
var paramStr = ''
var paramarray = []
@@ -268,3 +270,39 @@ export default {
}
}
}
+function download(url) {
+ getBlob(url, function(blob, filename) {
+ 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)
+ xhr.responseType = 'blob'
+ xhr.onload = function() {
+ if (xhr.status === 200) {
+ const name = xhr.getResponseHeader('content-disposition').split('=')[1]
+ var filename1 = decodeURIComponent(name)
+ cb(xhr.response, filename1)
+ }
+ }
+ xhr.send()
+}
+
+function saveAs(blob, filename = '下载文件.xls') {
+ if (window.navigator.msSaveOrOpenBlob) {
+ navigator.msSaveBlob(blob, filename)
+ } else {
+ var link = document.createElement('a')
+ var body = document.querySelector('body')
+ link.href = window.URL.createObjectURL(blob)
+ link.download = filename
+ // fix Firefox
+ link.style.display = 'none'
+ body.appendChild(link)
+ link.click()
+ body.removeChild(link)
+ window.URL.revokeObjectURL(link.href)
+ }
+}
diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index 1a2511dd..f0e65ed5 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -33,9 +33,9 @@
:label="item.label"
:value="item.value"/>
- 查询
+ 查询
- 导出
+ 导出
diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue
index 128da7f9..f138abeb 100644
--- a/src/views/Assembly/QualityBasicData/index.vue
+++ b/src/views/Assembly/QualityBasicData/index.vue
@@ -6,7 +6,7 @@
不合格原因
- 新增
+ 新增
删除
+ @click="handleDelete(scope.row)"/>
@@ -43,7 +42,7 @@
不合格处理
- 新增
+ 新增
删除
+ @click="handleDelete(scope.row)"/>
@@ -73,7 +71,7 @@
质检尺寸
- 新增
+ 新增
删除
+ @click="handleDelete(scope.row)"/>
@@ -110,7 +107,7 @@
质检形位
- 增加
+ 增加
删除
+ @click="handleDelete(scope.row)"/>
@@ -142,7 +138,7 @@
质检外观
- 增加
+ 增加
删除
+ @click="handleDelete(scope.row)"/>
@@ -172,7 +167,7 @@
检测项
- 增加
+ 增加
删除
+ @click="handleDelete(scope.row)"/>
@@ -202,7 +196,7 @@
检测项明细
- 增加
+ 增加
删除
+ @click="handleDelete(scope.row)"/>
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 2f91e923..bae344a4 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -59,9 +59,9 @@
:label="item.label"
:value="item.value"/>
- 查询
+ 查询
- 导出
+ 导出
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index 92e3f4f7..6be72ee7 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -4,7 +4,7 @@
零件图号
- 查询
+ 查询
清空
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index b9199e7f..303e2e83 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -4,9 +4,9 @@
领料单编号:
- 查询
+ 查询
- 领料确认
+ 领料确认
@@ -680,3 +680,20 @@ export default {
background: #E9F0F9 !important;
}
+
diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
index 809cac35..2ffe89b8 100644
--- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
+++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
@@ -24,8 +24,8 @@
-
查询
-
出库
+
查询
+
出库
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
index 91cda143..e44add6d 100644
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -22,7 +22,7 @@
零件图号:
- 查询
+ 查询
diff --git a/src/views/ManufacturingCenter/AddingOrder/index.vue b/src/views/ManufacturingCenter/AddingOrder/index.vue
index d476923f..1e3a5ed4 100644
--- a/src/views/ManufacturingCenter/AddingOrder/index.vue
+++ b/src/views/ManufacturingCenter/AddingOrder/index.vue
@@ -19,9 +19,9 @@
:value="item.value"/>
- 查询
- 加序
- 删除加序
+ 查询
+ 加序
+ 删除加序
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
index dd0f8609..76c40d39 100644
--- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
@@ -31,7 +31,7 @@
计划总工时(小时):
- 查询
+ 查询
diff --git a/src/views/ManufacturingCenter/Enter0therData/index.vue b/src/views/ManufacturingCenter/Enter0therData/index.vue
index 3ba78ae4..3e5a55df 100644
--- a/src/views/ManufacturingCenter/Enter0therData/index.vue
+++ b/src/views/ManufacturingCenter/Enter0therData/index.vue
@@ -17,9 +17,9 @@
- 保存
- 编辑
- 删除
+ 保存
+ 编辑
+ 删除
- 查询
+ 查询
diff --git a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
index 94c8f275..7686671e 100644
--- a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
@@ -18,7 +18,7 @@
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择加工完成日期"/>
- 查询
+ 查询
@@ -34,7 +34,7 @@
:value="item.value"/>
- 查询
+ 查询
@@ -49,7 +49,7 @@
不合格数量统计
- 查询
+ 查询
@@ -73,7 +73,7 @@
style="width: 160px"
type="date"
placeholder="选择日期"/>
- 查询
+ 查询
@@ -90,7 +90,7 @@
:value="item.value"/>
- 查询
+ 查询
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index da00be87..fff065c3 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -47,9 +47,9 @@
style="width: 160px"
type="date"
placeholder="选择日期"/>
- 查询
+ 查询
- 导出
+ 导出
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index e459cc65..8e4f13d4 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -21,8 +21,8 @@
:value="item.value"/>
- 查询
- 导出
+ 查询
+ 导出
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
index 3e89344a..a9fad44e 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
@@ -28,7 +28,7 @@
交货期:
~
- 查询
+ 查询
@@ -247,7 +247,7 @@
子计划:{{ machineNum }} 备料
子计划:{{ machineNum }} 制造
子计划:{{ machineNum }} 装配
- 增加
+ 增加
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index c469cd22..81782d5d 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -16,12 +16,12 @@
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择加工完成日期"/>
- 查询
+ 查询
-
+
{{ scope.row.姓名 }}
@@ -65,7 +65,7 @@
-
+
{{ scope.row.零件图号 }}
diff --git a/src/views/ManufacturingCenter/maintainInformation/index.vue b/src/views/ManufacturingCenter/maintainInformation/index.vue
index 1057ab52..2299edd2 100644
--- a/src/views/ManufacturingCenter/maintainInformation/index.vue
+++ b/src/views/ManufacturingCenter/maintainInformation/index.vue
@@ -12,11 +12,11 @@
:value="item.value"/>
选择月份:
-
- 导出日点检表
+
+ 导出日点检表
-
+
@@ -49,7 +49,7 @@
点检类型、点检内容维护
-
+
@@ -61,13 +61,14 @@
- 新增
+
+ 新增
确定
取消
- 编辑
- 删除
+
+
@@ -105,13 +106,14 @@
- 新增
+
+ 新增
确定
取消
- 编辑
- 删除
+
+
@@ -745,6 +747,21 @@ export default {
+
diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
index 4372d340..942a7e79 100644
--- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue
+++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
@@ -4,7 +4,7 @@
- 查询
+ 查询
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 2bfd12e4..e19386cd 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -3,7 +3,7 @@
零件号:
- 查询
+ 查询
打回车间
-->
厂家:
- 查询
+ 查询
新增
@@ -139,16 +139,16 @@
- 选入零件
- 导出任务单
+ 选入零件
+ 导出任务单
- 提交
+ 提交
- 保存
+ 保存
-
+
{{ 零件图号[scope.$index] }}
@@ -275,7 +275,7 @@
- 查询
+ 查询
diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
index 2fb0105d..418b4dfb 100644
--- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
+++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
@@ -9,11 +9,11 @@
物料型号:
- 查询
+ 查询
采购件列表
-
+
{{ scope.row.物料名称 }}
@@ -66,7 +66,7 @@
- 转为滞货
+ 转为滞货
@@ -82,7 +82,7 @@
@current-change="handleCurrentChange1"/>
滞货件列表
-
+
{{ scope.row.物料名称 }}
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 1373d7bd..2295db18 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -64,8 +64,8 @@
- 查询
- 导出未询价单
+ 查询
+ 导出未询价单
@@ -91,7 +91,7 @@
确定
- 调整采购任务
+ 调整采购任务
@@ -251,6 +251,7 @@
选入物料
@@ -283,8 +284,8 @@
- 查询
- 导出未询价单
+ 查询
+ 导出未询价单
- 调整采购任务
+ 调整采购任务
选入物料
@@ -620,21 +622,23 @@
查询
创建
编辑
删除
打印
- 导出
+ 导出
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 06eefe6a..582c3b0c 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -38,12 +38,12 @@
active-value="含税"
inactive-value="未税"/>
- 快速修改价格
+ 快速修改价格
还原
折叠
展开其他说明
-
+
@@ -145,7 +145,7 @@
预览合同
递交审批:
- 递交
+ 递交
diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue
index bdc96f37..153849db 100644
--- a/src/views/PurchasingCenter/FundApproval1/index.vue
+++ b/src/views/PurchasingCenter/FundApproval1/index.vue
@@ -25,8 +25,8 @@
- 通过
- 不通过
+ 通过
+ 不通过
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index e5ab3fcd..5575cb25 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -6,12 +6,12 @@
发票号:
- 查询
- 创建
- 追加入库记录
+ 查询
+ 创建
+ 追加入库记录
发票结算申请单
-
+
@@ -102,8 +102,8 @@
提交申请
- 编辑
- 删除
+
+
diff --git a/src/views/PurchasingCenter/MaterialMProcure/index.vue b/src/views/PurchasingCenter/MaterialMProcure/index.vue
index 0b86ba3f..3274e045 100644
--- a/src/views/PurchasingCenter/MaterialMProcure/index.vue
+++ b/src/views/PurchasingCenter/MaterialMProcure/index.vue
@@ -89,8 +89,8 @@
- 查询
- 新增采购物料申请
+ 查询
+ 新增采购物料申请
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 020ab011..ddcd3312 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -24,7 +24,7 @@
style="width:250px;margin-left: 5px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
- 查询
+ 查询
@@ -160,13 +160,14 @@
- 查询
+ 查询
- 查询
+ 查询
- 选入物料
+ 选入物料
@@ -226,13 +227,13 @@
税率:
- 生成离线合同
+ 生成离线合同
- 创建离线合同
+ 创建离线合同
-
+
diff --git a/src/views/PurchasingCenter/OfflineContractSearch/index.vue b/src/views/PurchasingCenter/OfflineContractSearch/index.vue
index 3d08a313..a90feb5d 100644
--- a/src/views/PurchasingCenter/OfflineContractSearch/index.vue
+++ b/src/views/PurchasingCenter/OfflineContractSearch/index.vue
@@ -6,15 +6,17 @@
查询
打回
@@ -28,6 +30,7 @@
:data="tableData1"
size="mini"
border
+ stripe
style="width: 100%"
height="700px"
highlight-current-row
diff --git a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
index e2cd96d5..2fe6b1f6 100644
--- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
+++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
@@ -27,9 +27,10 @@
查询
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index 6368a00c..2c4f68d6 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -11,8 +11,8 @@
:label="item.label"
:value="item.value"/>
- 查询
- 请款
+ 查询
+ 请款
请款表
@@ -74,7 +74,7 @@
- 删除
+
diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
index 82e9f7af..570d2897 100644
--- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
@@ -43,6 +43,7 @@
:data="tableData1"
size="mini"
border
+ stripe
style="width: 60%; max-height: 500px"
highlight-current-row
@row-click="searchTable2">
@@ -104,7 +105,7 @@
- 审核
+ 审核
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index ac561361..834e774c 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -52,9 +52,10 @@
:value="item.value"/>
查询
@@ -62,6 +63,7 @@
type="warning"
size="small"
icon="el-icon-download"
+ plain
@click="download()">导出
@@ -72,6 +74,7 @@
:data="tableData1"
size="mini"
border
+ stripe
style="width: 100%"
height="300px"
highlight-current-row
@@ -200,7 +203,7 @@
- 删除
+
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 0e8861e8..96ec344c 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -33,9 +33,9 @@
style="width:250px;margin-left: 5px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
- 查询
+ 查询
- 导出
+ 导出
@@ -45,10 +45,14 @@
- 未分配
- 未询价
- 已询价
- 已采购
+
+
+
+
+ 未分配
+ 未询价
+ 已询价
+ 已采购
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index ff1732ee..5e600a2e 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -84,7 +84,7 @@
:label="item.label"
:value="item.value"/>
- 查询
+ 查询
未分配
已分配
@@ -98,9 +98,10 @@
分配
@@ -109,6 +110,7 @@
type="danger"
size="small"
icon="el-icon-back"
+ plain
style="margin-left: 10px"
@click="executeReturn1">退回
@@ -119,10 +121,10 @@
- 未分配
- 未询价
- 已询价
- 已采购
+ 未分配
+ 未询价
+ 已询价
+ 已采购
@@ -210,6 +212,7 @@
- 查询
+ 查询
-->
- 查询
- 新增供应商
+ 查询
+ 新增供应商
@@ -136,8 +136,8 @@
- 编辑
- 删除
+
+
@@ -154,7 +154,7 @@
供应商联系人列表
- 新增联系人
+ 新增联系人
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index c4e8f4d6..708412eb 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -81,8 +81,8 @@
:label="item.label"
:value="item.value"/>
- 查询
- 创建采购计划单
+ 查询
+ 创建采购计划单
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index 2f30b3c0..a34a21bd 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -20,24 +20,21 @@
:label="item.label"
:value="item.value"/>
-
- 查询
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 备料时间段:
+
+ 查询
+ 导出