From 414a9c839061e06468138c9f662a4d9cf4225599 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 09 四月 2025 15:08:29 +0800
Subject: [PATCH] 完成二次报检，过期报检
---
src/views/business/materialOrder/customsInspection.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 4701bc9..d56ac0f 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -172,12 +172,16 @@
<i class="el-icon-document"></i>
杞﹂棿闄勪欢鏌ョ湅
</el-button>
- <el-dialog :visible.sync="fileDialogVisible" title="闄勪欢鏌ョ湅" width="80%">
- <fileList :currentNo="addObj.workShopId" v-if="fileDialogVisible" />
- </el-dialog>
</el-form-item>
</el-form>
</div>
+ <el-button type="text" @click="handleFileDialog" v-show="active != 1">
+ <i class="el-icon-document"></i>
+ 杞﹂棿闄勪欢鏌ョ湅
+ </el-button>
+ <el-dialog :visible.sync="fileDialogVisible" title="闄勪欢鏌ョ湅" width="80%">
+ <fileList :currentNo="addObj.workShopId" v-if="fileDialogVisible" :isLook="true" />
+ </el-dialog>
<div style="margin-bottom: 6px;margin-top: 6px">
<el-button v-show="active == 1" :disabled="sampleList.length === 2" size="small" type="primary"
@click="handleSplitCountNum">鎷嗗垎</el-button>
@@ -298,7 +302,7 @@
</span>
</template>
</el-table-column>
- <el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
+ <el-table-column label="璇曢獙鏉′欢" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
<el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
@@ -716,6 +720,11 @@
this.addObj.updateBatchNo = res.data.insOrderTemplate.updateBatchNo
this.addObj.type = String(this.addObj.type)
this.sampleList = this.HaveJson(res.data.sampleProduct)
+ this.sampleList.forEach(m => {
+ if (m.standardMethodListId) {
+ m.standardMethodListId = JSON.parse(m.standardMethodListId)
+ }
+ })
this.getProNum()
this.$nextTick(() => {
this.$refs.sampleTable.doLayout()
@@ -1048,6 +1057,7 @@
addInsOrder({
insOrder: this.addObj,
sampleList: sampleList.map(a => {
+ a.standardMethodListId = JSON.stringify(a.standardMethodListId)
if (a.insProduct.length > 0) {
a.insProduct.forEach(c => {
delete c.id
@@ -1472,11 +1482,11 @@
this.sample.insulating = null
this.sample.sheath = null
this.sample.quantity = 1
- if (codeLevel === '[5]') {
+ if (codeLevel === '[7]') {
this.sample.model = this.addObj.sample
- } else if (codeLevel === '[4]') {
+ } else if (codeLevel === '[6]') {
this.models = data.children2
- } else if (codeLevel === '[3]') {
+ } else if (codeLevel === '[5]') {
this.models = data.children1
}
this.sampleList.push(this.HaveJson(this.sample))
--
Gitblit v1.9.3