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 | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 8c7d6a1..1025c82 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -17,6 +17,13 @@
@keyup.enter.native="refreshTable">
</el-input>
</el-form-item>
+ <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-select>
+ </el-form-item>
<el-form-item label="渚涘簲鍟�" prop="supplierName" v-if="(tabIndex === 3 || tabIndex === 4)">
<el-input v-model="componentData.supplierName" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="refreshTable">
@@ -64,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>
@@ -141,6 +148,17 @@
<el-option :value="1" label="杩囨湡鐗╂枡"></el-option>
</el-select>
</el-form-item>
+ <el-form-item class="declareObj-form-item" label="渚涘簲鍟嗘壒鍙�:" prop="supplierNumber">
+ <el-input v-model="declareObj.supplierNumber" :disabled="declareType !== 'add'" clearable class="addObj-info"
+ 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"
+ size="small" placeholder="璇烽�夋嫨鎶ユ绫诲瀷">
+ <el-option label="鍘熻緟鏂�" value="鍘熻緟鏂�"></el-option>
+ <el-option label="鍖呮潗" value="鍖呮潗"></el-option>
+ </el-select>
+ </el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-row>
@@ -169,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"
@@ -235,6 +262,7 @@
}
}
},
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{ label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived', width: '140px', },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
@@ -266,6 +294,7 @@
{
dataType: 'action',
label: '鎿嶄綔',
+ fixed: 'right',
operation: [
{
name: '鎶ユ',
@@ -459,6 +488,8 @@
receiverDate: '', // 鎺ユ敹鏃堕棿
buyUnitMeas: '', // 鍗曚綅
isExpire: '', // 鍗曚綅
+ supplierNumber: '', // 渚涘簲鍟嗘壒鍙�
+ inspectionType: '', // 鎶ユ绫诲瀷
},
componentData: { // 琛ㄦ牸鏁版嵁
updateBatchNo: null,
@@ -536,7 +567,8 @@
{ label: '鏈笅鍗�', value: 3 },
{ label: '璁╂鏀捐', value: 4 },
],
- outLoading: false
+ outLoading: false,
+ ifsDialogVisible: false, // 娣诲姞 IFS 閫夋嫨寮规鏄剧ず鎺у埗
}
},
mounted() {
@@ -809,8 +841,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
@@ -846,6 +883,8 @@
receiverDate: '', // 鎺ユ敹鏃堕棿
buyUnitMeas: '', // 鍗曚綅
isExpire: '', // 鍗曚綅
+ supplierNumber: '', // 渚涘簲鍟嗘壒鍙�
+ inspectionType: '', // 鎶ユ绫诲瀷
}
}
},
--
Gitblit v1.9.3