From 3d02306337c41316075a2063805f3ab04693454b Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 25 Oct 2019 09:24:44 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=90=A5=E9=94=80=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=92=8C=E8=A1=A8=E6=A0=BC=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/MarketingCenter/BidBond/index.vue | 47 ++++++++----------- .../ComprehensiveInquiryMS/index.vue | 17 ++----- .../ContractCapitalManagement/index.vue | 2 +- .../ContractInformationManagement/index.vue | 21 +++------ .../MarketingCenter/InvoiceRecord/index.vue | 20 +++----- .../MarketingCenter/PerformanceBond/index.vue | 8 ++-- .../MarketingCenter/SafetyMargin/index.vue | 6 +-- 8 files changed, 47 insertions(+), 76 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index f5d89e37..7218f9b2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.110:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue index 531218a8..9e13f41f 100644 --- a/src/views/MarketingCenter/BidBond/index.vue +++ b/src/views/MarketingCenter/BidBond/index.vue @@ -2,40 +2,31 @@
- - - 招标企业: - - 保金类型: - + + - 投标人: - - - 开始日期: - - 结束日期: - - 查询 - 新增 - + + + + 查询 + 新增 diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue index 1158cc16..371991a0 100644 --- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue +++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue @@ -2,32 +2,25 @@
- 项目名称： - + - 机床型号： - - 营销经理： - - - - 开始日期： + + - 结束日期：
- 项目名称： - + - 机床型号： - - 营销经理： - -
-
- 开始日期： + + - 结束日期： diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue index c0518427..2436c3c7 100644 --- a/src/views/MarketingCenter/InvoiceRecord/index.vue +++ b/src/views/MarketingCenter/InvoiceRecord/index.vue @@ -3,30 +3,24 @@ - 项目名称： - + - 营销经理： - - - - 开始日期： + - 结束日期： - + diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue index 80892e18..f03eab2c 100644 --- a/src/views/MarketingCenter/PerformanceBond/index.vue +++ b/src/views/MarketingCenter/PerformanceBond/index.vue @@ -32,8 +32,8 @@ - + - + - + From 52fece3089f573e57c8740a187962ed1d0769a43 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 25 Oct 2019 18:25:54 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ShopScheduling.js | 24 +++ src/styles/index.scss | 12 ++ .../ManufacturingCenter/Querybd/index.vue | 3 +- .../ShopScheduling/index.vue | 199 ++++++++++++++++++ 4 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 src/api/ManufacturingCenter/ShopScheduling.js create mode 100644 src/views/ManufacturingCenter/ShopScheduling/index.vue diff --git a/src/api/ManufacturingCenter/ShopScheduling.js b/src/api/ManufacturingCenter/ShopScheduling.js new file mode 100644 index 00000000..aa12a67c --- /dev/null +++ b/src/api/ManufacturingCenter/ShopScheduling.js @@ -0,0 +1,24 @@ +import request from '@/utils/request' + +// 初始化工艺 +export function getPerson() { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'SELECT 姓名,人员编号 FROM 人事档案管理_人员名单 inner join dbo.人事档案管理_基础表_部门 on 人事档案管理_人员名单.考核部门编号=人事档案管理_基础表_部门.考核部门编号 where 人事档案管理_人员名单.考核部门编号=12 and 人员编号 <> 82 order by 姓名 ' + } + }) +} +export function getParts(pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_车间排产_零件查询', + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/styles/index.scss b/src/styles/index.scss index ae382d70..8187b825 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -278,3 +278,15 @@ h3 { .el-tabs--border-card>.el-tabs__content { padding: 15px 15px 0px 15px!important; } +//.el-table__header-wrapper { +// height: 25px!important; +//} +/* 设置表主体的高度 */ +.el-table__body td,.el-table__body th{ + padding:1px!important; + height: 25px!important; +} +/* 设置表头的高度 */ +.el-table__header td,.el-table__header th{ + padding:0px!important; +} diff --git a/src/views/ManufacturingCenter/Querybd/index.vue b/src/views/ManufacturingCenter/Querybd/index.vue index e592de52..01df9f7c 100644 --- a/src/views/ManufacturingCenter/Querybd/index.vue +++ b/src/views/ManufacturingCenter/Querybd/index.vue @@ -186,7 +186,8 @@
- + + From b1ddb09a808e0932836c5ffb5654667377f5040b Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 25 Oct 2019 18:28:24 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/ShopScheduling/index.vue | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index a9dab1e5..b6e08907 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -165,18 +165,10 @@ export default { 工艺计划流水号: v.工艺计划流水号, 图号及规格: v.图号及规格, 零件名称: v.零件名称, - 投产数量: v.投产数量 + 投产数量: v.投产数量, + 计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '', + 计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '' }) - if (v.计划开始时间) { - this.tableData1.push({ - 计划开始时间: v.计划开始时间.split(' ')[0] - }) - } - if (v.计划结束时间) { - this.tableData1.push({ - 计划结束时间: v.计划结束时间.split(' ')[0] - }) - } }) this.total = response.data.total this.loading1 = false From ac3477bf778885132d56eb800a7a2ff33806dd51 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 26 Oct 2019 15:48:41 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ShopScheduling.js | 40 +++++ .../Inventory/OfflinePartsStorage/index.vue | 1 + .../ShopScheduling/index.vue | 137 +++++++++++++++--- 3 files changed, 154 insertions(+), 24 deletions(-) diff --git a/src/api/ManufacturingCenter/ShopScheduling.js b/src/api/ManufacturingCenter/ShopScheduling.js index aa12a67c..779c6245 100644 --- a/src/api/ManufacturingCenter/ShopScheduling.js +++ b/src/api/ManufacturingCenter/ShopScheduling.js @@ -22,3 +22,43 @@ export function getParts(pageCurrent, pageSize) { } }) } +export function getGongxu(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: `select 姓名,排产时间,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 工艺编号 is not null and 工艺编号<>0 and 考核状态 = 6 and 工艺计划流水号=${num} order by 工序顺序` + } + }) +} +export function searchTableData2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: `select 姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} order by 工序顺序` + } + }) +} +export function XuanRu(num, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '4', + name: `update 车间生产管理工艺_零件工序 set 排产人员=${num},排产时间= GETDATE() where 工序流水号=${num2}` + } + }) +} +export function XuanChu(num) { + return request({ + url: '', + method: 'post', + data: { + type: '4', + name: `update 车间生产管理工艺_零件工序 set 排产人员= null,排产时间= null where 工序流水号=${num}` + } + }) +} diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue index 1cdd00e6..080f7ef2 100644 --- a/src/views/Inventory/OfflinePartsStorage/index.vue +++ b/src/views/Inventory/OfflinePartsStorage/index.vue @@ -237,6 +237,7 @@ export default { }, // 查询离线合同明细 async searchContractDetail() { + this.table1 = [] if (this.contractValue && this.searchType === '2') { this.qrCode = this.contractValue } else if (!this.supplierValue) { diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index b6e08907..72443dc2 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -4,17 +4,17 @@ - + - 移除 - 添加 + + - + - + - - + + - + - + - + - + @@ -121,10 +121,11 @@
- From a398554f264e986ea9ebc58f8af159d832225743 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 26 Oct 2019 18:23:40 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/ShopScheduling.svg | 1 + src/styles/element-ui.scss | 11 ++- .../ShopScheduling/index.vue | 99 ++++++++++--------- 3 files changed, 61 insertions(+), 50 deletions(-) create mode 100644 src/icons/svg/ShopScheduling.svg diff --git a/src/icons/svg/ShopScheduling.svg b/src/icons/svg/ShopScheduling.svg new file mode 100644 index 00000000..399e3967 --- /dev/null +++ b/src/icons/svg/ShopScheduling.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 cc10a203..b6a6d57b 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -48,11 +48,12 @@ .hover-row td{ background: RGB(236 245 255)!important; } - .el-table td, .is-leaf{ - background-color: rgb(255, 255, 255); - color: black; - font-weight:400 - } + //表格行颜色9745 + //.el-table td, .is-leaf{ + // background-color: rgb(255, 255, 255); + // color: black; + // font-weight:400 + //} .el-table--striped .el-table__body tr.el-table__row--striped td{ background-color: #d8dde6;/*修改斑马线表格背景*/ } diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index 72443dc2..3468285d 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -4,7 +4,7 @@ - + 移除--> - + - + @@ -30,7 +30,7 @@ {{ scope.row.零件名称 }} - + @@ -62,12 +62,7 @@ - - - - + @@ -77,19 +72,24 @@ {{ scope.row.零件名称 }} - + - + + + + - - + + @@ -99,17 +99,17 @@ {{ scope.row.工艺名称 }} - + - + - + @@ -169,7 +169,8 @@ export default { 零件名称: v.零件名称, 投产数量: v.投产数量, 计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '', - 计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '' + 计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '', + 状态: v.状态 }) }) this.total = response.data.total @@ -196,11 +197,14 @@ export default { this.loading3 = false }) }, - // ?? - tableRowClassName({ row, rowIndex }) { + tableData1ClassName({ row, rowIndex }) { + if (row.状态 === '1') { + return 'CJPClingjianjinxing' + } + }, + tableData3ClassName({ row, rowIndex }) { if (row.工序状态 === 4) { - console.log(row.工序状态) - return 'successsss' + return 'CJPCgongxuwancheng' } }, searchTableData2() { @@ -212,29 +216,31 @@ export default { }) }, XuanRu(row) { - XuanRu(this.PersonValue, row.工序流水号).then(response => { - if (response.data[0].result === '1') { - this.getParts() - this.loading3 = true - this.tableData3 = [] - getGongxu(this.工艺计划流水号).then(response => { - response.data.map(v => { - this.tableData3.push({ - 工序流水号: v.工序流水号, - 工序状态: v.工序状态, - 工序顺序: v.工序顺序, - 工艺名称: v.工艺名称, - 排产人员: v.排产人员, - 姓名: v.姓名, - 排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '', - 完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '' + if (row.工序状态 !== 4) { + XuanRu(this.PersonValue, row.工序流水号).then(response => { + if (response.data[0].result === '1') { + this.getParts() + this.loading3 = true + this.tableData3 = [] + getGongxu(this.工艺计划流水号).then(response => { + response.data.map(v => { + this.tableData3.push({ + 工序流水号: v.工序流水号, + 工序状态: v.工序状态, + 工序顺序: v.工序顺序, + 工艺名称: v.工艺名称, + 排产人员: v.排产人员, + 姓名: v.姓名, + 排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '', + 完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '' + }) }) + this.loading3 = false }) - this.loading3 = false - }) - this.searchTableData2() - } - }) + this.searchTableData2() + } + }) + } }, XuanChu(row) { XuanChu(row.工序流水号).then(response => { @@ -274,7 +280,10 @@ export default { From 1345515b680fd2af4e2b07f5f20c13e7646d0009 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 26 Oct 2019 20:09:48 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/ShopScheduling/index.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index 3468285d..f6d8fa58 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -125,6 +125,7 @@ import { getPerson, getParts, getGongxu, XuanRu, XuanChu, searchTableData2 } fro export default { data() { return { + index: 0, 工艺计划流水号: '', PersonValue: '', Person: [], @@ -180,6 +181,7 @@ export default { getGongxu(row) { this.loading3 = true this.tableData3 = [] + this.index = row.index this.工艺计划流水号 = row.工艺计划流水号 getGongxu(row.工艺计划流水号).then(response => { response.data.map(v => { @@ -198,6 +200,7 @@ export default { }) }, tableData1ClassName({ row, rowIndex }) { + row.index = rowIndex if (row.状态 === '1') { return 'CJPClingjianjinxing' } @@ -219,7 +222,8 @@ export default { if (row.工序状态 !== 4) { XuanRu(this.PersonValue, row.工序流水号).then(response => { if (response.data[0].result === '1') { - this.getParts() + // this.getParts() + this.tableData1[this.index].状态 = '1' this.loading3 = true this.tableData3 = [] getGongxu(this.工艺计划流水号).then(response => { @@ -245,7 +249,8 @@ export default { XuanChu(row) { XuanChu(row.工序流水号).then(response => { if (response.data[0].result === '1') { - this.getParts() + // this.getParts() + this.tableData1[this.index].状态 = '1' this.loading3 = true this.tableData3 = [] getGongxu(this.工艺计划流水号).then(response => { @@ -268,10 +273,12 @@ export default { }) }, handleSizeChange(val) { + this.tableData3 = [] this.pageSize = val this.getParts() }, handleCurrentChange(val) { + this.tableData3 = [] this.pageCurrent = val this.getParts() } From ee8518bce34cd76d98c63827d01cc3d52bbcbe13 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sun, 27 Oct 2019 15:13:29 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ShopScheduling.js | 24 +++++++++- .../ShopScheduling/index.vue | 46 +++++++++++-------- 2 files changed, 51 insertions(+), 19 deletions(-) diff --git a/src/api/ManufacturingCenter/ShopScheduling.js b/src/api/ManufacturingCenter/ShopScheduling.js index 779c6245..5cadceb2 100644 --- a/src/api/ManufacturingCenter/ShopScheduling.js +++ b/src/api/ManufacturingCenter/ShopScheduling.js @@ -38,7 +38,7 @@ export function searchTableData2(num) { method: 'post', data: { type: '3', - name: `select 姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} order by 工序顺序` + name: `select 工艺计划流水号,姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} and 工序状态<>4 order by 工序顺序` } }) } @@ -62,3 +62,25 @@ export function XuanChu(num) { } }) } +export function panDuan(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: ` select 状态,工艺计划流水号 from + ( + select 工艺计划流水号,零件名称,投产数量,机床图号,组号,(零件图号+' '+规格) as 图号及规格 + ,计划开始时间,计划结束时间,排产人员,排产时间, + (case when SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) = 0 then 2 else + case when COUNT(*) > SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) then 1 else 0 end end) as 状态 + from dbo.车间生产管理工艺_插件排产查询_视图 + where 工艺编号 is not null and 工艺编号<>0 and 工艺计划流水号 is not null and 考核状态 =6 + group by 工艺计划流水号,零件名称,投产数量,机床图号,组号,零件图号,规格,计划开始时间,计划结束时间,排产人员,排产时间 + ) as a + where 工艺计划流水号=${num} + order by 图号及规格 + ` + } + }) +} diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index f6d8fa58..d19a136d 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -11,8 +11,6 @@ :label="item.label" :value="item.value"/> - - + + + diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index d19a136d..78b7a2aa 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -59,7 +59,7 @@ - + - +