From 6ec4ab163cff16c7ce0f4822efc224abe8e85410 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 24 三月 2025 09:51:00 +0800
Subject: [PATCH] 合并
---
src/views/business/rawMaterialInspection/index.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index d81420c..1025c82 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -21,7 +21,7 @@
<el-select v-model="componentData.inspectionType" clearable placeholder="璇烽�夋嫨" size="small"
@change="refreshTable" style="width: 100%">
<el-option label="鍘熻緟鏂�" value="鍘熻緟鏂�"></el-option>
- <el-option label="鍖呴噰" value="鍖呴噰"></el-option>
+ <el-option label="鍖呮潗" value="鍖呮潗"></el-option>
</el-select>
</el-form-item>
<el-form-item label="渚涘簲鍟�" prop="supplierName" v-if="(tabIndex === 3 || tabIndex === 4)">
@@ -71,7 +71,7 @@
<el-button v-show="tabIndex === 4" :loading="outLoading" size="small" type="primary"
@click="handleDown">瀵煎嚭</el-button>
<el-button v-if="tabIndex === 0" :loading="btnLoading" size="small" type="primary"
- @click="openIFS">鑾峰彇IFS璁㈠崟</el-button>
+ @click="openIFS">鑾峰彇璁㈠崟</el-button>
<el-button v-if="tabIndex === 0" size="small" type="primary" @click="declareS">鎶ユ</el-button>
<el-button v-if="tabIndex === 0" size="small" type="primary" @click="addDeclare">鏂板鎶ユ淇℃伅</el-button>
</div>
@@ -156,7 +156,7 @@
<el-select v-model="declareObj.inspectionType" :disabled="declareType !== 'add'" clearable class="addObj-info"
size="small" placeholder="璇烽�夋嫨鎶ユ绫诲瀷">
<el-option label="鍘熻緟鏂�" value="鍘熻緟鏂�"></el-option>
- <el-option label="鍖呴噰" value="鍖呴噰"></el-option>
+ <el-option label="鍖呮潗" value="鍖呮潗"></el-option>
</el-select>
</el-form-item>
</el-form>
@@ -191,8 +191,10 @@
<!-- IFS 閫夋嫨寮规 -->
<el-dialog title="閫夋嫨绫诲瀷" :visible.sync="ifsDialogVisible" width="30%" append-to-body>
<div style="text-align: center;">
- <el-button type="primary" size="medium" style="margin: 0 10px;" @click="handleIfsSelect('鍘熻緟鏂�')">鑾峰彇MES鍘熻緟鏂欐暟鎹�</el-button>
- <el-button type="primary" size="medium" style="margin: 0 10px;" @click="handleIfsSelect('鍖呴噰')">鑾峰彇MES鍖呴噰鏁版嵁</el-button>
+ <el-button type="primary" size="medium" style="margin: 0 10px;"
+ @click="handleIfsSelect('鍘熻緟鏂�')">鑾峰彇MES鍘熻緟鏂欒鍗�</el-button>
+ <el-button type="primary" size="medium" style="margin: 0 10px;"
+ @click="handleIfsSelect('鍖呮潗')">鑾峰彇MES鍖呮潗璁㈠崟</el-button>
</div>
</el-dialog>
<!--鏁版嵁鏌ョ湅寮规-->
@@ -292,6 +294,7 @@
{
dataType: 'action',
label: '鎿嶄綔',
+ fixed: 'right',
operation: [
{
name: '鎶ユ',
--
Gitblit v1.9.3