From 76e8ed0c11f4732a4ef5d9110372ae7f57d0c38e Mon Sep 17 00:00:00 2001 From: "liulujia@meswork.com" Date: Mon, 10 Feb 2020 17:55:17 +0800 Subject: [PATCH 1/2] 20200210llj --- src/styles/element-ui.scss | 10 +- src/styles/index.scss | 21 +- .../EquipmentMonitoring/index.vue | 2 +- .../PurchaseTaskAllocate/index.vue | 227 ++++++++++-------- .../NewArrivalList/index.vue | 2 +- src/views/login/index.vue | 2 +- 6 files changed, 151 insertions(+), 113 deletions(-) diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index b6a6d57b..f5d9be3b 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -41,13 +41,19 @@ } //单击表格行变色 .el-table__body tr.current-row>td{ - background-color: rgb(216,229,245) !important; + background-color: #d8e5f6 !important; /* color: #f19944; */ /* 设置文字颜色，可以选择不设置 */ } //聚焦表格行变色 .hover-row td{ - background: RGB(236 245 255)!important; + //background: RGB(236 245 255)!important; + background: red!important; + } + .el-table--enable-row-hover .el-table__body tr:hover>td{ + background-color: #d8e5f6 !important; + } + //.el-table tbody tr:hover>td { background-color: RED } //表格行颜色9745 //.el-table td, .is-leaf{ // background-color: rgb(255, 255, 255); diff --git a/src/styles/index.scss b/src/styles/index.scss index 8187b825..396bd891 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -140,6 +140,13 @@ el-card{ .el-table{ margin: 3px 0px; } +.el-table td.gutter,.el-table th.gutter{ + width: 15px; + border-right-width: 0; + border-bottom-width: 0; + padding: 0; + background: white; +}s .block{ margin-bottom: 3px; } @@ -198,10 +205,16 @@ el-card{ } } //登录页login输入框上串所以屏蔽 -//.el-input__inner:focus { -// border: 1px solid #1b55a0!important; -// height: 29px; -//} +.el-input__inner:focus { + border: 1px solid #2A71CB!important; + //height: 29px; +} +.el-input__inner{ + border: 1px solid red +} +.el-textarea__inner, .el-radio__inner, .el-input__inner{ + border: 1px solid #676767 !important +} //.el-input--small .el-input__inner { // height: 29px; //} diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index 383d006c..2973c522 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -553,7 +553,7 @@
-
设备开机
电流计正常工作
工控机关机
+
设备开机
电流计正常工作
工控机关机
电脑关机
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index ff1732ee..017c40fa 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -1,11 +1,11 @@ - + - + - + - + - + @@ -1144,4 +1147,20 @@ export default { line-height: 46px; } } + /*.el-table td.gutter,.el-table th.gutter{*/ + /*width: 15px;*/ + /*border-right-width: 0;*/ + /*border-bottom-width: 0;*/ + /*padding: 0;*/ + /*background: red;*/ + /*}*/ + + diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index 46cdd120..8d440fcb 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -947,10 +947,10 @@ export default { }) }, searchTable5(row) { + console.log(row) this.excle_row = row console.log(this.userId, this.id) this.disable = row.是否关联 - console.log(this.disable) this.tableData6 = [] this.到货单流水号 = row.到货单流水号 this.ArrivalOrderNumber = row.到货单流水号 diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 2d85fa83..785e224f 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -235,7 +235,7 @@ export default { } input { background: transparent; - border: 0; + border: 1px; -webkit-appearance: none; border-radius: 0; padding: 12px 5px 12px 15px; From ad88ce344177f77af8dd9d327bf73fae0476ea05 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 10 Feb 2020 17:59:59 +0800 Subject: [PATCH 2/2] a --- src/utils/curd.js | 9 +++++---- src/utils/request.js | 2 +- .../OutsourcingPaymentPlanManagement/index.vue | 12 ++++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/utils/curd.js b/src/utils/curd.js index d28337aa..c611f0c8 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,6 +272,7 @@ export default { } function download(url) { getBlob(url, function(blob, filename) { + console.log(blob, filename, 2) saveAs(blob, filename) }) } @@ -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/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index d4115478..011739c0 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -6,6 +6,7 @@ 外协厂家: 查询 + 查询 @@ -180,6 +181,17 @@ export default { this.getParts() }, methods: { + exportExcel() { + var param = [] + param[0] = ['物料名称_check', 0] + param[1] = ['物料名称', 0] + param[2] = ['物料规格_check', 0] + param[3] = ['物料规格', 0] + param[4] = ['物料型号_check', 0] + param[5] = ['物料型号', 0] + var Data = this.CreateData('00', '报表_采购部仓库_库存_查询', param) + this.exportExcel_NPOI(Data) + }, // 获取表格1数据 getParts() { this.loading = true