diff --git a/src/api/Inventory/StockInquiry.js b/src/api/Inventory/StockInquiry.js new file mode 100644 index 00000000..70438de1 --- /dev/null +++ b/src/api/Inventory/StockInquiry.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +// 机床查询 +export function getMachines(check, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + } + }) +} +// 分组查询 +export function getGroups(machineNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + machineNumber + } + }) +} +// 主表查询 +export function getTable(num1, num2, num3, num4, num5, num6, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_库存管理_基本件库存查询', + param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/api/ManufacturingCenter/ProjectPlanningManagement.js index 52ab573a..eabc005f 100644 --- a/src/api/ManufacturingCenter/ProjectPlanningManagement.js +++ b/src/api/ManufacturingCenter/ProjectPlanningManagement.js @@ -10,23 +10,24 @@ export function getProject() { } }) } +export function getToolNum(check, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + } + }) +} export function getCustomerName() { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' - } - }) -} -export function getToolNum() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + name: '客户关系管理系统_初始化查询_客户名称' } }) } @@ -37,18 +38,63 @@ export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9 data: { type: '1', name: '项目计划管理_项目总计划_查询数据', - param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&@机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12, + param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12, Pagination: pageCurrent + '&' + pageSize } }) } -export function searchtable2() { +export function editTable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '项目计划管理_项目总计划_编辑数据', + param: `项目流水号=` + num1 + '&机床流水号=' + num2 + '&项目编号=' + num3 + '&数量=' + num4 + '&设计者=' + num5 + '&机床设计完成时间=' + num6 + '&采购完成时间=' + num7 + '&备料完成时间=' + num8 + '&机床生产完成时间=' + num9 + '&机床装配完成时间=' + num10 + '&完成顺序=' + num11 + '&更新=' + num12 + } + }) +} +export function searchTable2(num1, num2) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + name: '项目计划管理_项目详细计划_查询数据', + param: `机床流水号=` + num1 + '&计划类型=' + num2 + } + }) +} +export function editTable2(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '项目计划管理_项目详细计划_编辑数据', + param: `组件计划流水号=` + num1 + '&组号=' + num2 + '&任务名称=' + num3 + '&负责人=' + num4 + '&接收任务时间=' + num5 + '&任务开始时间=' + num6 + '&计划完成时间=' + num7 + '&货期=' + num8 + '&实际完成时间=' + num9 + '&备注=' + num10 + } + }) +} +export function Delete(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '项目计划管理_项目详细计划_删除数据', + param: `组件计划流水号=` + num1 + } + }) +} +export function addTable(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '项目计划管理_项目详细计划_增加数据', + param: `机床流水号=` + num1 + '&计划类型=' + num2 } }) } 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/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index 65480ad3..6fbc0f6b 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -286,19 +286,19 @@ export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num data: { type: '2', name: 'PDM_零件明细表_基本件_大量导入', - param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num + param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num } }) } // 传递零件 -export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, oldId, oldNum) { +export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, num8, num9, id, oldId, oldNum) { return request({ url: '', method: 'post', data: { type: '2', name: 'PDM_零件明细表_整改件_大量导入', - param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum + param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&分类码=' + num8 + '&整改类型=' + num9 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum } }) } @@ -309,7 +309,7 @@ export function transferWG(groupNum, materialNum, totalNum, remarks, mark, desig data: { type: '2', name: 'PDM_零件明细表_标准件和外购件_大量导入', - param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}` + param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}` } }) } 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..20d9c1a8 --- /dev/null +++ b/src/views/Inventory/StockInquiry/index.vue @@ -0,0 +1,239 @@ + + + + diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue index 2518359c..9f688f5f 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue @@ -19,123 +19,156 @@ :value="item.value"/> 客户名称: - - - + 签订日期: - ~ - + ~ + 交货期: - ~ - + ~ + 查询 - - + - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -151,15 +184,123 @@ @current-change="handleCurrentChange"/> - + + {{ title }} + 增加 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..e52faa5e 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -71,17 +71,17 @@ {{ scope.row.付款方式 }} - + - + - + @@ -203,17 +203,17 @@ label="付款批次" type="index" width="150"/> - + - + - + @@ -309,7 +309,7 @@ - +
@@ -333,7 +333,7 @@ - +
@@ -348,10 +348,10 @@ - + - + @@ -380,8 +380,8 @@
- - 责权省份 + + 责权省份： diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index cc878508..fe387b51 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -1,36 +1,40 @@