From 575f43e5b584cafa53be403dee1a384093923cd6 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 四月 2025 13:12:51 +0800
Subject: [PATCH] 修改不合格复测页面
---
src/views/business/materialOrder/customsInspection.vue | 85 +++++++++++++++---------------------------
1 files changed, 31 insertions(+), 54 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 4701bc9..3677dda 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -153,31 +153,21 @@
<div style="display: flex;justify-content: space-between;background-color: #F5F7FB;margin-bottom: 6px">
<div v-if="active == 1">
<el-form :inline="true" :model="addObj1" label-width="90px">
- <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px;margin-top: 6px">
- <el-select v-model="model" :placeholder="active > 1 ? '' : '璇疯緭鍏�'" allow-create clearable
- default-first-option filterable size="small" @change="changeModel">
- <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="妫�楠屾爣鍑�:" style="margin-bottom: 6px;margin-top: 6px">
- <el-select v-model="standardMethodListId" :loading="methodLoad" :placeholder="active > 1 ? '' : '璇疯緭鍏�'"
- clearable size="small" @change="changeStandardMethodListId" @focus="methodFocus" multiple>
- <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
<el-form-item label="闄勪欢鏌ョ湅:" style="margin-bottom: 6px;margin-top: 6px">
<el-button type="text" @click="handleFileDialog">
<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,8 +288,8 @@
</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="120" prop="methodS" show-overflow-tooltip>
+ <el-table-column label="璇曢獙鏉′欢" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
+ <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="method" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>璇曢獙鏂规硶</span>
@@ -716,6 +706,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()
@@ -906,7 +901,7 @@
item.insProduct = this.productList
})
this.getTotal(sampleList)
- let projectNum = this.totalArr.filter(a => a.state == 1).length
+ let projectNum = this.totalArr.length
if (projectNum == 0) {
this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
confirmButtonText: "纭畾",
@@ -1046,13 +1041,16 @@
delete this.addObj.createTime
}
addInsOrder({
- insOrder: this.addObj,
+ insOrder: {
+ ...this.addObj,
+ workShopId: this.addObj.workShopId || '' // 纭繚 workShopId 浼犻�掔粰鍚庣
+ },
sampleList: sampleList.map(a => {
- if (a.insProduct.length > 0) {
- a.insProduct.forEach(c => {
- delete c.id
- })
- }
+ a.standardMethodListId = JSON.stringify(a.standardMethodListId)
+ a.insProduct = this.fullProductList.map(item => ({
+ ...item,
+ state: 1
+ }))
if (a.modelNum) {
// 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
// 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
@@ -1067,7 +1065,6 @@
} else {
a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
}
- a.insProduct = a.insProduct.filter(b => b.state === 1)
return a
}),
}).then(res => {
@@ -1472,11 +1469,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))
@@ -1593,11 +1590,10 @@
ifsInventoryId: this.customsInspection.id
}).then(res => {
this.getProductLoad = false
- res.data.forEach(a => {
- a.state = 0
- })
- this.productList = this.HaveJson(res.data)
- this.productList0 = JSON.parse(JSON.stringify(this.productList))
+ // 鐩存帴灏嗘煡璇㈢粨鏋滆祴鍊肩粰 productList
+ this.fullProductList = res.data
+ this.productList = res.data
+ this.productList0 = res.data
this.$refs.sampleTable.setCurrentRow(row)
setTimeout(() => {
this.productList.forEach(a => {
@@ -1606,25 +1602,6 @@
}, 200)
}).catch(err => {
console.log('err-', err)
- })
- },
- // 閫夋嫨鏍峰搧鍨嬪彿鐨勫洖璋�
- changeModel() {
- this.sampleList.forEach(a => {
- let obj = this.sampleIds.find(b => b == a.id)
- if (obj) {
- a.model = this.model
- }
- })
- },
- // 閫夋嫨妫�楠屾爣鍑嗙殑鍥炶皟
- changeStandardMethodListId() {
- this.sampleList.forEach(a => {
- let obj = this.sampleIds.find(b => b == a.id)
- if (obj) {
- a.standardMethodListId = this.standardMethodListId
- this.methodChange(this.standardMethodListId, a)
- }
})
},
// 鎷兼帴鏍峰搧鏍戠殑瀛楃涓�
--
Gitblit v1.9.3