From 573265f7d79341298ba4287be38f00ddbc66e7ec Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期五, 07 三月 2025 12:00:51 +0800 Subject: [PATCH] 标准查新bug --- src/views/business/inspectionTask/index.vue | 44 ++++++++++++++++++++++++++++++++------------ 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue index 01fc535..d3505bf 100644 --- a/src/views/business/inspectionTask/index.vue +++ b/src/views/business/inspectionTask/index.vue @@ -181,6 +181,16 @@ </el-dialog> <el-dialog :visible.sync="dataDialogVisible" title="鏁版嵁鏌ョ湅" width="80%"> <div v-if="dataDialogVisible" style="height: 70vh; overflow-y: auto"> + <div> + <el-form :model="entity" :inline="true"> + <el-form-item label="妫�楠岄」" prop="outputWorkTime"> + <el-input v-model="entity.inspectionItem" clearable size="small"></el-input> + </el-form-item> + <el-form-item> + <el-button size="small" type="primary" @click="getLookList">鏌ヨ</el-button> + </el-form-item> + </el-form> + </div> <lims-table :tableData="lookTableData" :column="lookColumn" :page="lookPage" :tableLoading="lookTableLoading" :height="'60vh'" @pagination="lookPagination" key="tableData1"></lims-table> </div> @@ -232,7 +242,10 @@ ref="showInfoDialog" :showInfoDialog="showInfoDialog" ></ShowInfo> --> + <!--淇敼妫�楠屽�煎脊妗�--> <edit-inspection-item ref="editInspectionItem"></edit-inspection-item> + <!--鏌ョ湅宸ユ椂寮规--> + <viewManHourDia ref="viewManHourDia"></viewManHourDia> </div> </template> @@ -240,6 +253,7 @@ import { getYearAndMonthAndDays } from "@/utils/date"; import EditInspectionItem from "./components/EditInspectionItem.vue"; import limsTable from "@/components/Table/lims-table.vue"; +import viewManHourDia from "./components/viewManHourDia.vue" import { claimInsOrderPlan, upPlanUser2, @@ -258,6 +272,7 @@ components: { EditInspectionItem, limsTable, + viewManHourDia }, dicts: ["urgency_level", "inspection_task_state"], computed: { @@ -432,6 +447,16 @@ }, }, { + name: "鏌ョ湅宸ユ椂", + type: "text", + clickFun: (row) => { + this.viewManHour(row); + }, + showHide: (row) => { + return this.checkPermi(['get:working:hours:byOrder']) + }, + }, + { name: "妫�楠�", type: "text", clickFun: (row) => { @@ -496,6 +521,9 @@ }, ], // 鏁版嵁鏌ョ湅鐩稿叧瀛楁---寮�濮� + entity: { + inspectionItem: "", + }, lookTableData: [], lookColumn: [ { @@ -605,7 +633,7 @@ }, getLookList() { this.lookTableLoading = true; - let param = { id: this.lookInfo.id, ...this.lookPage }; + let param = { id: this.lookInfo.id, ...this.lookPage, inspectionItem: this.entity.inspectionItem }; delete param.total; selectSampleAndProductByOrderId({ ...param }) .then((res) => { @@ -629,9 +657,9 @@ editInspection(row) { this.$refs.editInspectionItem.showDialog(row.id); }, - // 鍒锋柊椤甸潰 - refreshView() { - this.getList(); + // 鏌ョ湅宸ユ椂 + viewManHour(row) { + this.$refs.viewManHourDia.showDialog(row.id, row.insState); }, // 鏁版嵁鏌ョ湅 handleDataLook(row) { @@ -905,10 +933,6 @@ this.bindCurrentInfo = row; getBindingProductByProductId({ productId: row.insProductId }) .then((res) => { - if (res.coe == 201) { - // this.$message.error('鏈粦瀹氭楠岄」') - return; - } // console.log(res) this.bindTableData = res.data; this.bindDialogVisible = true; @@ -922,10 +946,6 @@ productId: this.bindCurrentInfo.insProductId, }) .then((res) => { - if (res.coe == 201) { - // this.$message.error('鏈粦瀹氭楠岄」') - return; - } // console.log(res) this.bindAddTableData = res.data; this.bindAddDialogVisible = true; -- Gitblit v1.9.3