diff --git a/src/api/Inventory/StockInquiry.js b/src/api/Inventory/StockInquiry.js new file mode 100644 index 00000000..2104299f --- /dev/null +++ b/src/api/Inventory/StockInquiry.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +// 初始化项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据_按时间排序' + } + }) +} +// 机床查询 +export function searchmachine(check, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + } + }) +} +// 分组查询 +export function searchTeam(machineNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + machineNumber + } + }) +} diff --git a/src/api/ManufacturingCenter/machiningHoursStatistics.js b/src/api/ManufacturingCenter/machiningHoursStatistics.js index 749c2705..444da7f9 100644 --- a/src/api/ManufacturingCenter/machiningHoursStatistics.js +++ b/src/api/ManufacturingCenter/machiningHoursStatistics.js @@ -7,8 +7,8 @@ export function searchtable(num1, num2, num3, num4, num5, pageCurrent, pageSize) method: 'post', data: { type: '1', - name: '车间生产管理工艺_工时统计_查询数据', - param: '操作者_check=' + num1 + '&操作者=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, + name: '车间生产管理工艺_工时统计_查询数据2', + param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, Pagination: pageCurrent + '&' + pageSize } }) @@ -20,7 +20,7 @@ export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) { method: 'post', data: { type: '1', - name: '车间生产管理工艺_工时统计按人员查询_查询数据', + name: '车间生产管理工艺_工时统计按人员查询_查询数据2', param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4, Pagination: pageCurrent + '&' + pageSize } diff --git a/src/icons/svg/StockInquiry.svg b/src/icons/svg/StockInquiry.svg new file mode 100644 index 00000000..343a5d73 --- /dev/null +++ b/src/icons/svg/StockInquiry.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index ef7bb5da..184ab3ad 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -27,3 +27,14 @@ } } } + //.el-table td, .el-table th.is-leaf{ + // border-bottom: 1px solid DarkGray; + // border-left: 1px solid DarkGray; + // border-top: 1px solid DarkGray; + // border-right: 1px solid DarkGray; + //} + .el-textarea__inner, + .el-radio__inner, + .el-input__inner{ + border: 1px solid rgb(49, 56, 72)!important; + } diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue index ea29520e..93e072fb 100644 --- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue +++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue @@ -25,21 +25,21 @@ - + - - + - + + + + @@ -54,36 +54,41 @@ @current-change="handleCurrentChange"/> - + - - + - + - + - + + + + + + + @@ -160,14 +165,12 @@ export default { this.loading2 = true this.tableData2 = [] this.pageCurrent2 = 1 - this.gongzuozhebianhao = row.工作者编号 - searchtable2(row.工作者编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => { + this.gongzuozhebianhao = row.人员编号 + searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => { if (response.data.total === 0) { this.loading2 = false } else { - for (let i = 0; i < response.data.rows.length; i++) { - response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0] - } + console.log(response.data) this.total2 = response.data.total this.tableData2 = response.data.rows } @@ -182,9 +185,6 @@ export default { if (response.data.total === 0) { this.loading2 = false } else { - for (let i = 0; i < response.data.rows.length; i++) { - response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0] - } this.total2 = response.data.total this.tableData2 = response.data.rows } diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue index c0506572..b6ddc1b5 100644 --- a/src/views/MarketingCenter/CRM/index.vue +++ b/src/views/MarketingCenter/CRM/index.vue @@ -24,7 +24,7 @@ 查询 - + - + 添加销售经理 销售经理 @@ -586,5 +586,9 @@ export default { .move{ margin-left: 10px; } - + .el-table td, .el-table th.is-leaf, + .el-radio__inner, + .el-input__inner{ + border: 1px solid black!important; + } diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index b3758cbc..c2ee328e 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -380,8 +380,8 @@ - - 责权省份 + + 责权省份： diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index cc878508..5cc03949 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -1,36 +1,40 @@