diff --git a/vue/src/router/modules/jobtimedata.js b/vue/src/router/modules/jobtimedata.js index 8d246fff..1cbcd5f1 100644 --- a/vue/src/router/modules/jobtimedata.js +++ b/vue/src/router/modules/jobtimedata.js @@ -23,7 +23,7 @@ const JobTimeDataRouter = { meta: { title: '后台作业监控', - //roles: ['SettleAccount.HQSPNotConsignReports'], + roles: ['SettleAccount.Reports'], icon: '结算对比' } } diff --git a/vue/src/views/ux/basedata/centralizedControl/index.vue b/vue/src/views/ux/basedata/centralizedControl/index.vue index 4f5a92d6..22fe7223 100644 --- a/vue/src/views/ux/basedata/centralizedControl/index.vue +++ b/vue/src/views/ux/basedata/centralizedControl/index.vue @@ -24,6 +24,7 @@ size="mini" type="success" icon="el-icon-edit" + v-permission="['SettleAccount.CentralizedControls.Create']" @click="handleOK()" >批量启用 @@ -32,6 +33,7 @@ size="mini" type="info" icon="el-icon-edit" + v-permission="['SettleAccount.CentralizedControls.Create']" @click="handleStop()" >批量停用 diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index 78b9a239..d2ac6c6d 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -995,7 +995,7 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); + console.log("大众看板有条码出库单条件:" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index 9ddecbb3..2c9705c7 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -1095,7 +1095,7 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); + console.log("大众备件出库单条件:" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue index 0aa6bb50..97c4b900 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue @@ -370,7 +370,7 @@ export default { this.listOutPutQuery.outPutQty = row.outPutQty; } console.log( - "111111结算数量按钮:" + JSON.stringify(this.listOutPutQuery) + "结算数量按钮:" + JSON.stringify(this.listOutPutQuery) ); //"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0 this.$axios diff --git a/vue/src/views/ux/vw/dataInput/hq_f_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_f_report/index.vue index e45b7f1b..10a1da84 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_report/index.vue @@ -835,7 +835,7 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); + console.log("F平台出库单条件:" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue index 44056b1b..e90a1a4e 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue @@ -835,7 +835,7 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); + console.log("F平台出库单条件:" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", @@ -1153,12 +1153,12 @@ export default { } console.log( - "H平台备件明细-导出条件:" + + "F平台备件明细-导出条件:" + JSON.stringify(this.listExportQuery) ); this.$axios .posts( - "/api/settleaccount/ReportMakeService/HQFSettledDetailDiffExportService", + "/api/settleaccount/ReportMakeService/HQFSharePartSettledDetailDiffExportService", this.listExportQuery ) .then((res) => { @@ -1292,7 +1292,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "F平台核对明细"; + this.listQuery.name = "F平台备件核对明细"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue index 755986d7..9619fac9 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue @@ -838,7 +838,7 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); + console.log("H平台出库单条件:" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue index 40c0ef78..08762c12 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue @@ -834,7 +834,7 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); + console.log("H平台备件出库单条件:" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue index b0f96b94..451b195b 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m_report/index.vue @@ -839,7 +839,7 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); + console.log("M平台出库单条件:" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue index ff6aae67..f6939f7e 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue @@ -835,7 +835,7 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); + console.log("M备件出库单条件:" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue index 13c8a6ea..ca272671 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue @@ -837,7 +837,7 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); + console.log("一汽轿车出库单条件:" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", diff --git a/vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue index 5b797b42..70a903a6 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue @@ -803,7 +803,7 @@ export default { } this.listBillQuery.guids = params; this.listBillQuery.version = this.JobversionValue; - console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); + console.log("一汽轿车出库单条件:" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消",