From 3c7741162442c8bfd77a1fde0c16e20764855c9d Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 18 Jan 2024 15:59:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/unqualified.js | 9 ++ src/views/mes/prepare/index.vue | 6 +- src/views/mes/reportWork/index.vue | 5 +- src/views/plan/order/index.vue | 4 +- src/views/plan/workorder/index.vue | 5 +- src/views/quality/qcIncome/index.vue | 12 +- src/views/quality/qcProduce/index.vue | 15 +- .../quality/qcProduce/selectWorkOrder.vue | 12 +- src/views/quality/qcProduceAnalysis/index.vue | 8 +- src/views/quality/unqualified/index.vue | 48 ++++-- src/views/quality/unqualified/oaNode.vue | 148 ++++++++++++++++++ 11 files changed, 238 insertions(+), 34 deletions(-) create mode 100644 src/views/quality/unqualified/oaNode.vue diff --git a/src/api/quality/unqualified.js b/src/api/quality/unqualified.js index e21ea02..411e254 100644 --- a/src/api/quality/unqualified.js +++ b/src/api/quality/unqualified.js @@ -42,3 +42,12 @@ export function delUnqualified(id) { method: 'delete' }); } + + // 查询检测项列表 + export function getOAInfoList(query) { + return request({ + url: '/quality/unqualified/getOAInfoList', + method: 'get', + params: query + }); + } diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index 03fe8f4..75536f4 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -426,8 +426,10 @@ export default { }, //订单编码格式化 orderCodeFormate(row, column, cellValue){ - return cellValue.slice(3,18); //返回值 - }, + if(cellValue !=null){ + return cellValue.slice(3,18); //返回值 + } + }, // 打印 handlePrint(params) { printJS({ diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index ef4a191..b4c0068 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -803,7 +803,9 @@ export default { }, //订单编码格式化 orderCodeFormate(row, column, cellValue){ - return cellValue.slice(3,18); //返回值 + if(cellValue !=null){ + return cellValue.slice(3,18); //返回值 + } }, /**获取默认查询时间段**/ getDate() { @@ -1170,6 +1172,7 @@ export default { }, /** 报工损耗按钮操作 */ handleConsumeHz(row) { + debugger this.reset(); let sr = this.selectRow[0]; this.queryParams.workorderCode = sr.workorderCode; diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue index 20a9256..83f77a6 100644 --- a/src/views/plan/order/index.vue +++ b/src/views/plan/order/index.vue @@ -620,7 +620,9 @@ export default { }, //订单编码格式化 orderCodeFormate(row, column, cellValue){ - return cellValue.slice(3,18); //返回值 + if(cellValue !=null){ + return cellValue.slice(3,18); //返回值 + } }, // 新增-校验车数 diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index ac810a1..3c86680 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -830,7 +830,10 @@ export default { }, //订单编码格式化 orderCodeFormate(row, column, cellValue){ - return cellValue.slice(3,18); //返回值 + if(cellValue !=null){ + return cellValue.slice(3,18); //返回值 + } + }, // 新增-物料搜索 handleMaterielQuery() { diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue index d690793..bc066b3 100644 --- a/src/views/quality/qcIncome/index.vue +++ b/src/views/quality/qcIncome/index.vue @@ -133,12 +133,12 @@ - - + + diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue index d1a8d3e..1ed30d5 100644 --- a/src/views/quality/qcProduce/index.vue +++ b/src/views/quality/qcProduce/index.vue @@ -11,6 +11,14 @@ > + + + 0){ + if(this.queryParams.incomeTimeArray != null &&this.queryParams.incomeTimeArray.length>0){ this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); + }else{ + this.queryParams.incomeTimeStart = null; + this.queryParams.incomeTimeEnd = null; } - if(this.queryParams.checkTimeArray.length>0){ + if(this.queryParams.checkTimeArray != null &&this.queryParams.checkTimeArray.length>0){ this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); } diff --git a/src/views/quality/qcProduce/selectWorkOrder.vue b/src/views/quality/qcProduce/selectWorkOrder.vue index 6090c14..783ed5d 100644 --- a/src/views/quality/qcProduce/selectWorkOrder.vue +++ b/src/views/quality/qcProduce/selectWorkOrder.vue @@ -26,10 +26,10 @@ - + - - + + @@ -101,7 +101,9 @@ export default { }, //订单编码格式化 orderCodeFormate(row, column, cellValue){ - return cellValue.slice(3,18); //返回值 + if(cellValue !=null){ + return cellValue.slice(3,18); //返回值 + } }, /** 查询表格列表*/ getList() { @@ -126,7 +128,7 @@ export default { this.handleQuery(); }, - + // 多选框选中数据 handleBomSelectionChange(selection) { diff --git a/src/views/quality/qcProduceAnalysis/index.vue b/src/views/quality/qcProduceAnalysis/index.vue index 68ae450..8e7cbe5 100644 --- a/src/views/quality/qcProduceAnalysis/index.vue +++ b/src/views/quality/qcProduceAnalysis/index.vue @@ -189,7 +189,9 @@ export default { }, //订单编码格式化 orderCodeFormate(row, column, cellValue){ - return cellValue.slice(3,18); //返回值 + if(cellValue !=null){ + return cellValue.slice(3,18); //返回值 + } }, /**获取默认查询时间段**/ getDate() { @@ -204,7 +206,7 @@ export default { var m = dd.getMonth() + 1;//获取当前月份的日期 var d = dd.getDate(); return y + "-" + m + "-" + d; - }, + }, /**获取车间数据**/ getWorkCenterList(){ getWorkcenterList(this.queryParams).then(response => { @@ -328,7 +330,7 @@ export default { handleDetail(row) { this.reset(); let sr = row; - + this.queryParams.orderNo = sr.orderNo; getXJCheckTableDetail(this.queryParams).then(response => { this.pOrderTableList = response; diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue index 3adfa1d..05b3a0d 100644 --- a/src/views/quality/unqualified/index.vue +++ b/src/views/quality/unqualified/index.vue @@ -103,7 +103,7 @@ icon="el-icon-s-check" size="mini" :disabled="single" - @click="handleUpdate" + @click="handleViewOA" v-hasPermi="['quality:unqualified:edit']" >OA审批查看 @@ -126,27 +126,35 @@ - + - + + + + + + + + + + + - - - - + - 取 消 + + + @@ -288,16 +301,19 @@ import { listUnqualified, getUnqualified, delUnqualified, addUnqualified, updateUnqualified } from "@/api/quality/unqualified"; import { getCheckTypeList} from "@/api/quality/qcTable"; import { getCheckTypes } from "@/api/quality/qcProduce"; +import ItemOAInfo from "./oaNode.vue"; import moment from 'moment'; export default { name: "Unqualified", - dicts: ["do_result","check_type"], + dicts: ["do_result","check_type","oper_status"], + components: { ItemOAInfo}, data() { return { // 遮罩层 loading: true, // 选中数组 ids: [], + selectRow:{}, // 非单个禁用 single: true, // 非多个禁用 @@ -423,6 +439,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) + this.selectRow = selection this.single = selection.length!==1 this.multiple = !selection.length }, @@ -447,7 +464,6 @@ export default { this.$refs["form"].validate(valid => { if (valid) { updateUnqualified(this.form).then(response => { - this.$modal.msgSuccess("提交OA成功"); this.open = false; this.getList(); }); @@ -469,6 +485,12 @@ export default { this.download('quality/unqualified/export', { ...this.queryParams }, `unqualified_${new Date().getTime()}.xlsx`) + }, + //查看oa流程弹窗 + handleViewOA(){ + this.$refs.itemOaInfo.showFlag = true; + const row = this.selectRow[0]; + this.$refs.itemOaInfo.init(row); } } }; diff --git a/src/views/quality/unqualified/oaNode.vue b/src/views/quality/unqualified/oaNode.vue new file mode 100644 index 0000000..c2f25a9 --- /dev/null +++ b/src/views/quality/unqualified/oaNode.vue @@ -0,0 +1,148 @@ + +