From a7dd838394ad36cadb74d6bdd379d4d098ab8d8c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 28 三月 2025 09:13:57 +0800
Subject: [PATCH] 外购件检验提交
---
src/views/business/rawMaterialInspection/index.vue | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 7485483..05311d4 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -18,10 +18,10 @@
</el-input>
</el-form-item>
<el-form-item label="鎶ユ绫诲瀷" prop="inspectionType">
- <el-select v-model="componentData.inspectionType" clearable placeholder="璇烽�夋嫨" size="small"
+ <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>
@@ -153,10 +153,10 @@
size="small"></el-input>
</el-form-item>
<el-form-item class="declareObj-form-item" label="鎶ユ绫诲瀷:" prop="inspectionType">
- <el-select v-model="declareObj.inspectionType" :disabled="declareType !== 'add'" clearable class="addObj-info"
+ <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>
@@ -187,6 +187,15 @@
<el-button :loading="upLoad" type="primary" @click="submitDeclare1">纭� 瀹�</el-button>
</el-row>
</span>
+ </el-dialog>
+ <!-- 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>
+ </div>
</el-dialog>
<!--鏁版嵁鏌ョ湅寮规-->
<data-look-visible v-if="dataDialogVisible" ref="dataDialogVisible" :dataDialogVisible="dataDialogVisible"
@@ -253,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' },
@@ -285,6 +303,7 @@
{
dataType: 'action',
label: '鎿嶄綔',
+ fixed: 'right',
operation: [
{
name: '鎶ユ',
@@ -306,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
+ // },
+ // },
]
}
],
@@ -525,6 +544,9 @@
buyUnitMeas: [
{ required: false, message: '璇峰～鍐欏崟浣�', trigger: 'blur' }
],
+ inspectionType: [
+ { required: true, message: '璇峰～鍐欐姤妫�绫诲瀷', trigger: 'change' }
+ ],
},
tabList: [
{
@@ -557,7 +579,8 @@
{ label: '鏈笅鍗�', value: 3 },
{ label: '璁╂鏀捐', value: 4 },
],
- outLoading: false
+ outLoading: false,
+ ifsDialogVisible: false, // 娣诲姞 IFS 閫夋嫨寮规鏄剧ず鎺у埗
}
},
mounted() {
@@ -830,8 +853,13 @@
},
// 鑾峰彇IFS鎸夐挳鍥炶皟
openIFS() {
+ this.ifsDialogVisible = true
+ },
+ // 閫夋嫨澶勭悊鏂规硶
+ handleIfsSelect(type) {
this.btnLoading = true
- getIfsOrder().then(res => {
+ this.ifsDialogVisible = false
+ getIfsOrder({ type: type }).then(res => {
this.resetForm('componentData')
this.refreshTable()
this.btnLoading = false
--
Gitblit v1.9.3