From fcbba75febaa36d23c6c49473ab5bcee0e1a2c04 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 08 四月 2025 09:37:11 +0800
Subject: [PATCH] 检验项目新增是否委托要求字段
---
src/views/business/materialOrder/customsInspection.vue | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index b409062..4c9dd8c 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -131,6 +131,11 @@
</el-form-item>
</el-col> -->
<el-col :span="6">
+ <el-form-item class="addObj-form-item" label="鎶ユ绫诲瀷:">
+ <el-input v-model="addObj.inspectionType" class="addObj-info" clearable disabled size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item class="addObj-form-item" label="澶囨敞:">
<el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2 }" :disabled="active > 1"
:placeholder="active > 1 ? '' : '璇疯緭鍏�'" clearable size="small" type="textarea"></el-input>
@@ -156,6 +161,15 @@
<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="partNo" v-if="fileDialogVisible" />
+ </el-dialog>
</el-form-item>
</el-form>
</div>
@@ -239,9 +253,8 @@
</el-table>
<el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName"
class="el-table" max-height="400px" style="margin-bottom: 10px;"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border tooltip-effect="dark"
- @select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
- <el-table-column v-if="active == 1" :selectable="selectable" type="selection" width="65"></el-table-column>
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border tooltip-effect="dark">
+ <!-- <el-table-column v-if="active == 1" :selectable="selectable" type="selection" width="65"></el-table-column> -->
<el-table-column label="妫�楠岄」" min-width="140" prop="inspectionItem" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
@@ -406,16 +419,19 @@
selectStandardProductList,
selectStandardTreeListByPartNo
} from "@/api/business/rawMaterialOrder";
+import fileList from "./commom/fileList.vue"
+import limsTable from "@/components/Table/lims-table.vue";
export default {
name: "CustomsInspection",
dicts: ['check_type', 'urgency_level'],
- components: {},
+ components: { limsTable, fileList },
props: {
},
data() {
return {
customsInspection: {},
+ fileDialogVisible: false,
orderType: '',
active: 0,
currentId: 0,
@@ -614,6 +630,10 @@
// this.getInfo() // 鑾峰彇鏁版嵁
// },
methods: {
+ handleFileDialog() {
+ this.fileDialogVisible = true
+ this.currentNo = addObj.partNo || customsInspection.partNo;
+ },
save1() {
if (this.bsm1DiaList.length > 0) {
this.bsm1DiaList.forEach(item => {
@@ -735,8 +755,8 @@
const str = res.data.treeName.split('-')
this.selectTreeTem = str.join(' - ')
this.selectTree = str.join(' - ')
- this.addListInfo(this.codeLevel, res.data) // 鍘熻緟鏂欐牱鍝佹槸鍥哄畾鐨勶紝灏遍粯璁よ祴鍊间竴鏉℃暟鎹紝鍙媶鍒�
- this.selectInsOrderTemplate() // 鍘熻緟鏂欐ā鏉垮垪琛ㄦ煡璇�
+ this.addListInfo(this.codeLevel, res.data) // 鍘熻緟鏉愭牱鍝佹槸鍥哄畾鐨勶紝灏遍粯璁よ祴鍊间竴鏉℃暟鎹紝鍙媶鍒�
+ this.selectInsOrderTemplate() // 鍘熻緟鏉愭ā鏉垮垪琛ㄦ煡璇�
} else {
this.dialogVisible = true
this.dialogMessage = res.message
@@ -951,19 +971,19 @@
})
this.getTotal(sampleList)
let trees = this.selectTree.split(" - ")
- if (trees.length < 3) {
+ if (trees.length < 5) {
this.$message.error('鏈�夋嫨瀵硅薄')
return
}
this.addObj.factory = trees[0]
this.addObj.laboratory = trees[1]
- this.addObj.sampleType = trees[2]
- if ((trees[3] === undefined || trees[3] === '') || trees.length === 4) {
- this.addObj.sample = trees[2]
+ this.addObj.sampleType = trees[3]
+ if ((trees[5] === undefined || trees[5] === '') || trees.length === 6) {
+ this.addObj.sample = trees[4]
} else {
- this.addObj.sample = trees[3]
+ this.addObj.sample = trees[5]
}
- this.addObj.model = (trees[4] == undefined ? null : trees[4])
+ this.addObj.model = (trees[6] == undefined ? null : trees[6])
this.addObj.ifsInventoryId = this.customsInspection.id
this.noNeedCheckLoad = true
addExemptionOrder({
@@ -997,19 +1017,19 @@
},
saveMethod(sampleList) {
let trees = this.selectTree.split(" - ")
- if (trees.length < 3) {
+ if (trees.length < 5) {
this.$message.error('鏈�夋嫨瀵硅薄')
return
}
this.addObj.factory = trees[0]
this.addObj.laboratory = trees[1]
- this.addObj.sampleType = trees[2]
- if ((trees[3] === undefined || trees[3] === '') || trees.length === 4) {
- this.addObj.sample = trees[2]
+ this.addObj.sampleType = trees[4]
+ if ((trees[5] === undefined || trees[5] === '') || trees.length === 6) {
+ this.addObj.sample = trees[4]
} else {
- this.addObj.sample = trees[3]
+ this.addObj.sample = trees[5]
}
- this.addObj.model = (trees[4] == undefined ? null : trees[4])
+ this.addObj.model = (trees[6] == undefined ? null : trees[6])
this.addObj.ifsInventoryId = this.customsInspection.id
this.saveLoad = true
if (this.addObj.createTime) {
@@ -1442,6 +1462,7 @@
this.sample.insulating = null
this.sample.sheath = null
this.sample.quantity = 1
+ console.log(2222, codeLevel, data)
if (codeLevel === '[5]') {
this.sample.model = this.addObj.sample
} else if (codeLevel === '[4]') {
@@ -1857,7 +1878,7 @@
}
->>>.warning-row {
+:deep(.warning-row) {
color: #1890FF;
}
</style>
--
Gitblit v1.9.3