From fe2c38273024c74f28e59c24c867eb67c841be16 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 四月 2025 11:35:10 +0800
Subject: [PATCH] 原辅材修改
---
src/views/business/rawMaterialInspection/index.vue | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index d81420c..6f54e0b 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -20,8 +20,8 @@
<el-form-item label="鎶ユ绫诲瀷" prop="inspectionType">
<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-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>
@@ -100,7 +100,7 @@
</span>
</el-dialog>
<!-- 纭鎶ユ -->
- <el-dialog :close-on-click-modal="false" :title="declareType === 'add' ? '鏂板鎶ユ淇℃伅' : '鍘熻緟鏂欐姤妫�'"
+ <el-dialog :close-on-click-modal="false" :title="declareType === 'add' ? '鏂板鎶ユ淇℃伅' : '鍘熻緟鏉愭姤妫�'"
:visible.sync="declareDialogVisible" width="800px" @close="resetFormData">
<el-form ref="declareObj" :inline="true" :model="declareObj" :rules="declareObjRules" label-width="130px"
label-position="right">
@@ -155,8 +155,8 @@
<el-form-item class="declareObj-form-item" label="鎶ユ绫诲瀷:" prop="inspectionType">
<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-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>
<!--鏁版嵁鏌ョ湅寮规-->
@@ -260,7 +262,16 @@
}
}
},
- { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
+ {
+ label: '鎶ユ绫诲瀷', prop: 'inspectionType', dataType: 'tag',
+ formatType: (params) => {
+ if (params == '鍘熻緟鏉�') {
+ return 'success'
+ } else {
+ return 'warning'
+ }
+ }
+ },
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{ label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived', width: '140px', },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
@@ -292,6 +303,7 @@
{
dataType: 'action',
label: '鎿嶄綔',
+ fixed: 'right',
operation: [
{
name: '鎶ユ',
@@ -313,16 +325,16 @@
return this.tabIndex === 0
},
},
- {
- name: '鎾ら攢鎶ユ',
- type: 'text',
- clickFun: (row) => {
- this.cancelDeclare(row);
- },
- showHide: (row) => {
- return this.tabIndex === 1
- },
- },
+ // {
+ // name: '鎾ら攢鎶ユ',
+ // type: 'text',
+ // clickFun: (row) => {
+ // this.cancelDeclare(row);
+ // },
+ // showHide: (row) => {
+ // return this.tabIndex === 1
+ // },
+ // },
]
}
],
@@ -532,6 +544,9 @@
buyUnitMeas: [
{ required: false, message: '璇峰～鍐欏崟浣�', trigger: 'blur' }
],
+ inspectionType: [
+ { required: true, message: '璇峰～鍐欐姤妫�绫诲瀷', trigger: 'change' }
+ ],
},
tabList: [
{
@@ -705,7 +720,7 @@
},
// 鎻愬墠鍏ュ簱
advancedGodown(row) {
- this.$confirm('褰撳墠鍘熻緟鏂欐槸鍚︽彁鍓嶅叆搴�?', '鎻愮ず', {
+ this.$confirm('褰撳墠鍘熻緟鏉愭槸鍚︽彁鍓嶅叆搴�?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
@@ -863,7 +878,7 @@
}).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
- this.$download.saveAs(blob, "鍘熻緟鏂欐娴嬩俊鎭鍑�.xlsx");
+ this.$download.saveAs(blob, "鍘熻緟鏉愭娴嬩俊鎭鍑�.xlsx");
})
},
clear() {
--
Gitblit v1.9.3