From c43faa47954d820d3b92eb1db113197e4bea67a4 Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期一, 24 二月 2025 11:42:00 +0800 Subject: [PATCH] 纠正措施搬迁 --- src/views/business/inspectionTask/inspection.vue | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue index a633db3..bf4b3d9 100644 --- a/src/views/business/inspectionTask/inspection.vue +++ b/src/views/business/inspectionTask/inspection.vue @@ -94,8 +94,8 @@ </el-radio-group> </div> <div style="display: flex; align-items: center"> - <el-button v-if="state === 1" size="small" type="primary" @click="openAddUnpass">鏂板涓嶅悎鏍煎娴�</el-button> - <el-button v-if="state === 1" size="small" type="primary" @click="unpassCheck">涓嶅悎鏍煎娴�</el-button> + <el-button v-if="state == 1" size="small" type="primary" @click="openAddUnpass">鏂板涓嶅悎鏍煎娴�</el-button> + <el-button v-if="state == 1" size="small" type="primary" @click="unpassCheck">涓嶅悎鏍煎娴�</el-button> <el-button v-if="state > 1" size="small" type="primary" @click="viewUnpassCheck">鏌ョ湅涓嶅悎鏍煎娴�</el-button> <span v-if="cableTagList.length > 0"> 鐢电紗閰嶇疆锛�</span> <el-select v-if="cableTagList.length > 0" v-model="currentTab" clearable placeholder="璇烽�夋嫨" size="small" @@ -291,7 +291,7 @@ state == 1 "><span :style="`font-family:${n.v.ff} !important;`">{{ toFixed(n.v.v, n.v.ct) - }}</span></template> + }}</span></template> <template v-else-if=" n.v.ps != undefined && n.v.ps.value === '鏈�缁堝��' && @@ -338,7 +338,7 @@ </div> <el-upload v-if="state == 1" ref="upload" :action="action" :before-upload="beforeUpload" :data="{ orderId: id, - }" :headers="headers" :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false" + }" :headers="uploadHeader" :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false" accept=".jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar" style="width: 80px !important;margin-top: 10px;"> <el-button v-if="state == 1" size="small" type="primary">闄勪欢涓婁紶</el-button></el-upload> @@ -508,9 +508,9 @@ @resetAddUnPass="resetAddUnPass"></add-un-pass> <UnPassDialog v-if="unPassDialog" ref="unPassDialog" :orderId="orderId" :unPassDialog="unPassDialog" @resetForm="resetForm"></UnPassDialog> - <!-- <InspectionWord v-if="unPassCheck" :inspectorList="inspectorList" :orderId="orderId" + <InspectionWord v-if="unPassCheck" :inspectorList="inspectorList" :orderId="orderId" :rawMaterialTag="rawMaterialTag" :sonLaboratory="sonLaboratory" :state="state" :typeSource="typeSource" - :unPassCheck="unPassCheck" @closeUnPassCheckDialog="closeUnPassCheckDialog" @refreshView="refreshView" /> --> + :unPassCheck="unPassCheck" @closeUnPassCheckDialog="closeUnPassCheckDialog" @refreshView="refreshView" /> <purchase-verification v-if="purchaseDialog" ref="purchaseDialog" :orderId="orderId" :purchaseDialog="purchaseDialog" @resetPurchaseDialog="resetPurchaseDialog"></purchase-verification> </div> @@ -521,7 +521,7 @@ import limsTable from "@/components/Table/lims-table.vue"; import UnPassDialog from "../unpass/components/addUnPass.vue"; import AddUnPass from "../unpass/components/addUnPass.vue"; -// import InspectionWord from "./components/InspectionWord.vue"; +import InspectionWord from "./components/InspectionWord.vue"; import PurchaseVerification from "../unpass/components/PurchaseVerification.vue"; import { doInsOrder, @@ -547,12 +547,13 @@ import html2canvas from "html2canvas"; import { mapGetters } from "vuex"; export default { + name: 'inspection', components: { PurchaseVerification, AddUnPass, limsTable, UnPassDialog, - // InspectionWord, + InspectionWord, }, data() { return { @@ -768,11 +769,6 @@ // 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭� computed: { ...mapGetters(["userId"]), - headers() { - return { - token: sessionStorage.getItem("token"), - }; - }, action() { return this.javaApi + "/insOrderPlan/uploadFile"; }, -- Gitblit v1.9.3