From 2a7d1dd7eff5a18eeca54ec9311050571a54f269 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期一, 24 二月 2025 20:16:08 +0800 Subject: [PATCH] 不合格处理搬迁 --- src/views/business/inspectionTask/index.vue | 129 +++++++++++++++++------------------------- 1 files changed, 52 insertions(+), 77 deletions(-) diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue index 6dccaa2..600e362 100644 --- a/src/views/business/inspectionTask/index.vue +++ b/src/views/business/inspectionTask/index.vue @@ -89,7 +89,7 @@ </style> <template> <div class="ins-order-plan-main"> - <div v-show="activeFace == 0" style="height: 100%"> + <div style="height: 100%"> <div class="search"> <div class="search_thing"> <div class="search_label">濮旀墭缂栧彿锛�</div> @@ -138,7 +138,8 @@ </el-row> </div> <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading" - :height="'calc(100vh - 300px)'" @pagination="pagination" key="tableData0"></lims-table> + :rowClassName="rowClassName" :height="'calc(100vh - 300px)'" @pagination="pagination" + key="tableData0"></lims-table> </div> </div> <el-dialog :visible.sync="claimVisible" title="鎻愮ず" width="400px"> @@ -178,31 +179,6 @@ <el-button :loading="loading" type="primary" @click="confirmConnect">纭� 瀹�</el-button> </span> </el-dialog> - <div v-if="activeFace > 0 && isCopper == null" style="width: 100%; height: 100%"> - <!-- <Add :active="activeFace" :currentId="currentId" :examine="examine" /> --> - </div> - <div v-if="activeFace > 0 && isCopper == 0" style="width: 100%; height: 100%"> - <!-- <CustomsInspection - :active="activeFace" - :currentId="currentId" - :customsInspection="customsInspection" - :isReport="isReport" - /> --> - </div> - <div v-if="activeFace > 0 && isCopper == 1" style="width: 100%; height: 100%"> - <!-- <CopperOrder :active="activeFace" :currentId="currentId"></CopperOrder> --> - </div> - <!--<Inspection - v-if="state > 0" - :key="InspectionKey" - :inspectorList="inspectorList" - :orderId="orderId" - :sonLaboratory="sonLaboratory" - :state="state" - :typeSource="typeSource" - @goback="goback" - @refreshView="refreshView" - />--> <el-dialog :visible.sync="dataDialogVisible" title="鏁版嵁鏌ョ湅" width="80%"> <div v-if="dataDialogVisible" style="height: 70vh; overflow-y: auto"> <lims-table :tableData="lookTableData" :column="lookColumn" :page="lookPage" :tableLoading="lookTableLoading" @@ -261,13 +237,7 @@ </template> <script> -import ValueTable from "@/components/Table/value-table.vue"; -// import Inspection from "../do/b1-inspect-order-plan/Inspection.vue"; -// import CustomsInspection from "../do/b1-material-ins-order/customs-inspection.vue"; import { getYearAndMonthAndDays } from "@/utils/date"; -// import Add from "../do/b1-ins-order/add.vue"; -// import ShowInfo from "../do/b1-material-ins-order/showInfo.vue"; -// import CopperOrder from "../do/b1-material-ins-order/copper-order.vue"; import EditInspectionItem from "./components/EditInspectionItem.vue"; import limsTable from "@/components/Table/lims-table.vue"; import { @@ -284,15 +254,10 @@ } from "@/api/business/inspectionTask.js"; import { mapGetters } from "vuex"; export default { + name: 'InspectionTask', components: { EditInspectionItem, - // CopperOrder, - // ShowInfo, - ValueTable, limsTable, - // Inspection, - // Add, - // CustomsInspection, }, dicts: ["urgency_level", "inspection_task_state"], computed: { @@ -384,14 +349,15 @@ { label: "濮旀墭缂栧彿", prop: "entrustCode", - width: "140px", + width: "160px", dataType: "link", linkMethod: "selectAllByOne", }, - { label: "鏍峰搧鍚嶇О", prop: "sample", width: "140px" }, + { label: "鏍峰搧鍚嶇О", prop: "sample", width: "160px" }, { label: "涓嬪崟绫诲埆", prop: "typeSource", + width: "100px", dataType: "tag", formatData: (params) => { if (params == 0) { @@ -413,6 +379,7 @@ { label: "妫�楠岀被鍨�", prop: "orderType", + width: "100px", dataType: "tag", formatData: (params) => { return this.orderTypeList.find((m) => m.value == params).label; @@ -600,7 +567,6 @@ }, mounted() { this.queryParams.userId = this.userId; - // this.getPower(); this.refreshTable(); }, methods: { @@ -660,40 +626,6 @@ this.lookInfo = row; this.getLookList(); }, - // 鏉冮檺鍒嗛厤 - getPower(radio) { - let power = JSON.parse(sessionStorage.getItem("power")); - let inspection = false; - let connect = false; - let review = false; - let claim = false; - for (var i = 0; i < power.length; i++) { - if (power[i].menuMethod == "doInsOrder") { - inspection = true; - } - if (power[i].menuMethod == "upPlanUser") { - connect = true; - } - if (power[i].menuMethod == "verifyPlan") { - review = true; - } - if (power[i].menuMethod == "claimInsOrderPlan") { - claim = true; - } - } - if (!claim) { - this.componentData.do.splice(3, 1); - } - if (!review) { - this.componentData.do.splice(2, 1); - } - if (!connect) { - this.componentData.do.splice(1, 1); - } - if (!inspection) { - this.componentData.do.splice(0, 1); - } - }, changeCheckBox(val) { this.queryParams.userId = val ? 0 : null; this.refreshTable(); @@ -742,7 +674,7 @@ this.loading = false; }); }, - changeRowClass({ row, rowIndex }) { + rowClassName({ row, rowIndex }) { if (this.currentTime == row.appointed) { return "highlight-warning-row-border"; } else if (this.currentTime > row.appointed) { @@ -794,6 +726,39 @@ this.examine = 1; this.isReport = 0; this.currentId = parseInt(row.id); + switch (row.isCopper) { + case 0: + // 鍘熸潗鏂� + this.$router.push({ + path: "/materialOrder/customsInspection", query: { + customsInspection: row, + active: this.activeFace, + currentId: this.currentId, + isReport: this.isReport + } + }); + break; + case null: + // 鎴愬搧 + this.$router.push({ + path: "/productOrder/add", query: { + examine: this.examine, + active: this.activeFace, + currentId: this.currentId + } + }); + break; + case 1: + // 閾滄潗 + this.$router.push({ + path: "/materialOrder/copperOrder", query: { + active: this.activeFace, + currentId: this.currentId + } + }); + break; + } + }, playOrder(num) { this.activeFace = num; @@ -843,6 +808,16 @@ this.state = 3; this.typeSource = row.typeSource; this.orderId = row.id; + this.$router.push({ + path: "/inspectionTask/inspection", + query: { + inspectorList: this.inspectorList, + sonLaboratory: this.sonLaboratory, + state: this.state, + typeSource: this.typeSource, + orderId: this.orderId, + }, + }); }, handleConnect(row) { this.orderId = row.id; -- Gitblit v1.9.3