From d3b17f4a2a5d0993e45319dece591ea9b7ce9423 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Thu, 26 Mar 2020 09:53:13 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/BasicData/MenuManagement.js | 18 +++++++ src/views/BasicData/MenuManagement/index.vue | 1 - .../InitialProduction/index.vue | 48 +++++++++---------- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/api/BasicData/MenuManagement.js b/src/api/BasicData/MenuManagement.js index 1a121815..a2ea3311 100644 --- a/src/api/BasicData/MenuManagement.js +++ b/src/api/BasicData/MenuManagement.js @@ -110,3 +110,21 @@ export function submitAdd(name) { } }) } +// 查询二级模块分给那些角色 +export function searchJS(name) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '3', + name: ` select 角色功能,title from + 基础表_模块信息 inner join 基础表_角色模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id + inner join 菜单系统模块_项目角色 on 基础表_角色模块信息.角色编号 = 菜单系统模块_项目角色.角色编号 + order by title`, + param: `模块名称=${name}` + } + }) +} + diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue index 95b6274a..b97ecd55 100644 --- a/src/views/BasicData/MenuManagement/index.vue +++ b/src/views/BasicData/MenuManagement/index.vue @@ -377,4 +377,3 @@ export default { padding-right: 8px; } - diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 9b634a73..ce2e3de6 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -10,7 +10,7 @@ - + - + - - + + ～ - - + + - - + + ～ - - + + - - + + ～ - - + + - - + + ～ - - + + - - + + ～ - - + + @@ -371,7 +371,7 @@ - + @@ -1347,7 +1347,7 @@ export default { margin: 10px 0 10px 10px; } .time{ - width: 200px; + width: 150px; } .Time>.el-form-item{ margin:2px; From ab0d88b80a914f69b2f98010a4a4b32ef68c69e6 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Thu, 26 Mar 2020 11:25:14 +0800 Subject: [PATCH 2/7] ad --- src/utils/curd.js | 4 ++-- .../InitialProduction/index.vue | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/utils/curd.js b/src/utils/curd.js index 297b279a..db627302 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -13,8 +13,8 @@ export default { // 1）type：11查询；12增删改，必须 // 2）name：存储过程名，必须 // 3）data：存储过程参数名和对应值，例如： - // this.param[0] = ['设备类型编码', '3', 'string', '0'] - // this.param[1] = ['output', '3', 'int', '1']，必须 + // param[0] = ['设备类型编码', '3', 'string', '0'] + // param[1] = ['output', '3', 'int', '1']，必须 // 数组里四个分别对应：存储过程参数名（必须）；存储过程参数值（必须）；参数类型（若是output必须）；参数是否为output（0否1是） // 4）pageSize，pageList：分页使用，可选 Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) { diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index ce2e3de6..1b4dff03 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -394,6 +394,7 @@ import Cookie from 'js-cookie' export default { data() { return { + a: 0, checked_hebing: true, checked_UrgentItem: false, UrgentItem: 0, @@ -531,16 +532,16 @@ export default { // if (to.name === 'InitialProduction') { // _this.typeChange() // } + // }, + // '$route': { + // handler(route) { + // const _this = this + // console.log(route.name) + // if (route.name === 'InitialProduction') { + // _this.typeChange() + // } + // } // } - // // '$route': { - // // handler(route) { - // // const _this = this - // // console.log(route.name) - // // if (route.name === 'InitialProduction') { - // // _this.typeChange() - // // } - // // } - // // } // }, created() { this.typeChange() @@ -1373,4 +1374,3 @@ export default { margin-bottom: 13px; } - From 91ee113b387ab4ecf43e69b471a8035631b781d2 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Thu, 26 Mar 2020 11:26:00 +0800 Subject: [PATCH 3/7] a --- src/views/ManufacturingCenter/InitialProduction/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 1b4dff03..c2ec74fa 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -394,7 +394,6 @@ import Cookie from 'js-cookie' export default { data() { return { - a: 0, checked_hebing: true, checked_UrgentItem: false, UrgentItem: 0, From 6a66d78a61a160e31f5456d3af8cd41e0c4b588e Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Thu, 26 Mar 2020 13:42:21 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/curd.js | 4 ++-- .../ProjectPlanningManagementNew/index.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/utils/curd.js b/src/utils/curd.js index db627302..56851b61 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -13,8 +13,8 @@ export default { // 1）type：11查询；12增删改，必须 // 2）name：存储过程名，必须 // 3）data：存储过程参数名和对应值，例如： - // param[0] = ['设备类型编码', '3', 'string', '0'] - // param[1] = ['output', '3', 'int', '1']，必须 + // param[0] = ['工艺计划流水号', this.工艺计划流水号] 输入参数 + // param[1] = ['PageCurrent', '1111', 'int', '1'] output参数 // 数组里四个分别对应：存储过程参数名（必须）；存储过程参数值（必须）；参数类型（若是output必须）；参数是否为output（0否1是） // 4）pageSize，pageList：分页使用，可选 Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) { diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue index e9f97ea5..7a0743bc 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue @@ -496,6 +496,7 @@ export default { }) }, rowClick(row) { + this.radio = '' searchtable(1, row.项目流水号, 1, row.机床流水号, 0, 0, 0, '', '', 0, '', '', 1, 100).then(response => { if (response.data.total !== 0) { this.machineNum = row.机床图号 From 8410fb950bd41e38730431a6728b29a8247226e1 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Thu, 26 Mar 2020 15:47:16 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScheduleCompletionDetails/index.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue index 5d165062..220a7e4a 100644 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -19,7 +19,7 @@ 查询 - + @@ -32,7 +32,7 @@ {{ scope.row.总数量 }} - + @@ -42,7 +42,7 @@ - + @@ -58,10 +58,10 @@ - + - + @@ -86,12 +86,12 @@ - + - + @@ -101,7 +101,7 @@ {{ scope.row.修补工时 }} - + @@ -111,7 +111,7 @@ {{ scope.row.完成日期 }} - + From 6254e490baf15c635a5022ccb593f43a4be0c6f3 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Thu, 26 Mar 2020 16:46:38 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=B7=E6=AC=BE?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/layout/components/Navbar.vue | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 57e2369f..433377e8 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -127,20 +127,20 @@ export default { }) if (this.token.toString() === '2') { searchRequestFund(1, 9999, 0, 0, 0, 0, 0).then(res => { - if (res.data.length) { - this.noticeContract2 = null - this.noticeContract2 = this.$notify.success({ - title: '提示', - message: '有合同请款申请审批结果，点击查看', - onClick: () => { - setChakan().then(res => { - this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) - setTimeout(this.noticeContract2.close(), 1000) - }) - }, - duration: 1000 * 60 - }) - } + // if (res.data.length) { + // this.noticeContract2 = null + // this.noticeContract2 = this.$notify.success({ + // title: '提示', + // message: '有合同请款申请审批结果，点击查看', + // onClick: () => { + // setChakan().then(res => { + // this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) + // setTimeout(this.noticeContract2.close(), 1000) + // }) + // }, + // duration: 1000 * 60 + // }) + // } }) initApproval(1, 999, 1).then(res => { if (res.data.rows.length) { From 809d6049efb836214c7e538d66cfeb4b59503cd7 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Thu, 26 Mar 2020 17:06:38 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=B7=E6=AC=BE?= =?UTF-8?q?=E6=8F=90=E9=86=92=E9=87=8D=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseContractRequestFund.js | 25 ++++++++++++ src/views/layout/components/Navbar.vue | 38 +++++++++---------- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index 1d7928ef..b8b9fc57 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -113,3 +113,28 @@ export function searchPurchaseContract(check1, check, num) { } }) } +// 请款审批查看状态 +export function RequestFund() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_离线合同_请款查看状态_查询数据' + } + }) +} +export function setChakan2() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '采购管理_离线合同_更新查看状态_修改数据' + } + }) +} diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 433377e8..bb3b5976 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -32,7 +32,7 @@ import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCente import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval' import { searchUrgentItem } from '@/api/ManufacturingCenter/InitialProduction' import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove' -import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund' +import { RequestFund, setChakan2 } from '@/api/PurchasingCenter/PurchaseContractRequestFund' import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut' import { searchTable } from '@/api/PurchasingCenter/PurchaseMaterielModify' export default { @@ -126,21 +126,21 @@ export default { } }) if (this.token.toString() === '2') { - searchRequestFund(1, 9999, 0, 0, 0, 0, 0).then(res => { - // if (res.data.length) { - // this.noticeContract2 = null - // this.noticeContract2 = this.$notify.success({ - // title: '提示', - // message: '有合同请款申请审批结果，点击查看', - // onClick: () => { - // setChakan().then(res => { - // this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) - // setTimeout(this.noticeContract2.close(), 1000) - // }) - // }, - // duration: 1000 * 60 - // }) - // } + RequestFund().then(res => { + if (res.data[0].数量 > 0) { + this.noticeContract2 = null + this.noticeContract2 = this.$notify.success({ + title: '提示', + message: '有合同请款申请审批结果，点击查看', + onClick: () => { + setChakan2().then(res => { + this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) + setTimeout(this.noticeContract2.close(), 1000) + }) + }, + duration: 1000 * 60 + }) + } }) initApproval(1, 999, 1).then(res => { if (res.data.rows.length) { @@ -159,14 +159,14 @@ export default { } }) } else if (this.token.toString() === '3') { - searchRequestFund(1, 99999, 0, 0, 0, 0, 0).then(res => { - if (res.data.length) { + RequestFund().then(res => { + if (res.data[0].数量 > 0) { this.noticeContract4 = null this.noticeContract4 = this.$notify.success({ title: '提示', message: '有合同请款申请审批结果，点击查看', onClick: () => { - setChakan().then(res => { + setChakan2().then(res => { this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) setTimeout(this.noticeContract4.close(), 1000) })