From 6b35a453725b34422e5336b456f03b92b963f2d8 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 21 三月 2025 13:35:06 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable-before' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable-before
---
src/views/business/materialOrder/customsInspection.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 2404734..2a70ad4 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -157,9 +157,6 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="" style="margin-bottom: 6px;margin-top: 6px">
- <el-button type="primary" size="small">杞﹂棿闄勪欢鏌ョ湅</el-button>
- </el-form-item>
</el-form>
</div>
<div style="margin-bottom: 6px;margin-top: 6px">
@@ -197,9 +194,8 @@
</el-table-column>
<el-table-column v-if="!(active > 1)" align="center" label="鍨嬪彿鍙傛暟" prop="modelNum" width="130">
<template slot-scope="scope">
- <el-input v-model="scope.row.modelNum" :disabled="active > 1 || scope.$index !== 0" clearable
- placeholder="闈炲繀濉�" size="small"
- @input="methodChange(scope.row.standardMethodListId, scope.row)"></el-input>
+ <el-input v-model="scope.row.modelNum" :disabled="active > 1 || scope.$index !== 0" clearable placeholder="闈炲繀濉�"
+ size="small" @input="methodChange(scope.row.standardMethodListId, scope.row)"></el-input>
</template>
</el-table-column>
<el-table-column align="center" label="妫�楠屾爣鍑�" min-width="100" prop="standardMethodListId">
@@ -275,8 +271,8 @@
</el-table-column>
<el-table-column label="瑕佹眰鎻忚堪" min-width="220px" prop="tell">
<template slot-scope="scope">
- <el-input v-if="active == 1 && isAskOnlyRead" v-model="scope.row.tell"
- :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="瑕佹眰鎻忚堪" size="small" type="textarea"
+ <el-input v-if="active == 1 && isAskOnlyRead" v-model="scope.row.tell" :autosize="{ minRows: 1, maxRows: 3 }"
+ clearable placeholder="瑕佹眰鎻忚堪" size="small" type="textarea"
@change="e => requestChange(e, scope.row, 'tell')"></el-input>
<span v-else>
<template>{{ scope.row.tell }}</template>
@@ -318,8 +314,8 @@
<div class="search_label" style="width: 80px;">瑕佹眰鍊硷細</div>
<div class="search_input">
<el-radio-group v-model="item.bsm1Val" v-removeAriaHidden @input="upBsmAll(item)">
- <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai" :label="a">{{
- JSON.parse(item.bsmRow.askCopy)[ai] }}</el-radio>
+ <el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai"
+ :label="a">{{ JSON.parse(item.bsmRow.askCopy)[ai] }}</el-radio>
</el-radio-group>
</div>
</el-col>
@@ -738,8 +734,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
@@ -1859,4 +1855,8 @@
background-color: #ffffff;
}
+
+>>>.warning-row {
+ color: #1890FF;
+}
</style>
--
Gitblit v1.9.3