From 79c983e7fa924e43f9f2a2a11b6f69c546f051a6 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 13:06:50 +0800
Subject: [PATCH] 不合格复测
---
src/views/business/rawMaterialInspection/index.vue | 135 +++++++++++++++++++++++++++++++++++---------
1 files changed, 106 insertions(+), 29 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index d83ed77..6f54e0b 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">
@@ -25,8 +32,8 @@
<el-form-item>
<el-button v-if="tabIndex === 3 || tabIndex === 4" :icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
style="color: #3A7BFA;" type="text" @click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button>
- <el-button size="mini" icon="el-icon-search" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- <el-button size="mini" @click="refresh()" icon="el-icon-refresh">閲� 缃�</el-button>
+ <el-button size="mini" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ <el-button size="mini" @click="refresh()">閲� 缃�</el-button>
</el-form-item>
</el-row>
<el-row>
@@ -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>
@@ -93,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">
@@ -141,10 +148,21 @@
<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>
- <el-button @click="resetForm">鍙� 娑�</el-button>
+ <el-button @click="resetFormData">鍙� 娑�</el-button>
<el-button :loading="submitDeclareLoading" type="primary" @click="submitDeclare">纭� 瀹�</el-button>
</el-row>
</span>
@@ -161,14 +179,23 @@
</el-dialog>
<!-- 鎾ら攢鎶ユ -->
<el-dialog :visible.sync="declareDialogVisible1" title="鎶ユ鎾ら攢" width="30%">
- <p style="font-size:16px;color:#333333">鎵瑰彿<span
- style="color:#34BD66">{{ insOrderRow.updateBatchNo }}</span>鐨勪俊鎭槸鍚�<span style="color: #FF4902">鎾ら攢鎶ユ</span></p>
+ <p style="font-size:16px;color:#333333">鎵瑰彿<span style="color:#34BD66">{{ insOrderRow.updateBatchNo
+ }}</span>鐨勪俊鎭槸鍚�<span style="color: #FF4902">鎾ら攢鎶ユ</span></p>
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="declareDialogVisible1 = false">鍙� 娑�</el-button>
<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"
@@ -191,6 +218,7 @@
import limsTable from "@/components/Table/lims-table.vue";
export default {
+ name: 'RawMaterialInspection',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, DataLookVisible },
data() {
@@ -234,6 +262,16 @@
}
}
},
+ {
+ 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' },
@@ -265,6 +303,7 @@
{
dataType: 'action',
label: '鎿嶄綔',
+ fixed: 'right',
operation: [
{
name: '鎶ユ',
@@ -286,28 +325,27 @@
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
+ // },
+ // },
]
}
],
page: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
tableData1: [],
tableLoading1: false,
column1: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
{
dataType: 'tag',
label: '妫�楠岀姸鎬�',
@@ -345,13 +383,32 @@
},
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{ label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
- { label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
+ { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
{ label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName' },
{ label: '涓嶅悎鏍兼弿杩�', prop: 'unqualifiedDesc' },
- { label: '鍏嶆', prop: 'isExemption' },
+ {
+ dataType: 'tag',
+ label: '鍏嶆',
+ prop: 'isExemption',
+ formatData: (params) => {
+ if (params == 1) {
+ return '鍏嶆'
+ } else {
+ return null
+ }
+ },
+ formatType: (params) => {
+ if (params == 1) {
+ return 'success'
+ } else {
+ return null
+ }
+ }
+ },
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
{ label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
@@ -376,7 +433,7 @@
},
{ label: '鍗曚綅', prop: 'buyUnitMeas' },
{ label: '鎺ユ敹鏃堕棿', prop: 'receiverDate' },
- { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
+ { label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
{
dataType: 'action',
fixed: 'right',
@@ -423,7 +480,7 @@
],
page1: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
more: false,
@@ -440,6 +497,8 @@
receiverDate: '', // 鎺ユ敹鏃堕棿
buyUnitMeas: '', // 鍗曚綅
isExpire: '', // 鍗曚綅
+ supplierNumber: '', // 渚涘簲鍟嗘壒鍙�
+ inspectionType: '', // 鎶ユ绫诲瀷
},
componentData: { // 琛ㄦ牸鏁版嵁
updateBatchNo: null,
@@ -485,6 +544,9 @@
buyUnitMeas: [
{ required: false, message: '璇峰～鍐欏崟浣�', trigger: 'blur' }
],
+ inspectionType: [
+ { required: true, message: '璇峰～鍐欐姤妫�绫诲瀷', trigger: 'change' }
+ ],
},
tabList: [
{
@@ -517,7 +579,8 @@
{ label: '鏈笅鍗�', value: 3 },
{ label: '璁╂鏀捐', value: 4 },
],
- outLoading: false
+ outLoading: false,
+ ifsDialogVisible: false, // 娣诲姞 IFS 閫夋嫨寮规鏄剧ず鎺у埗
}
},
mounted() {
@@ -560,9 +623,12 @@
// 宸插畬鎴愰儴鏌ヨ
getIfsByFinishList() {
this.tableLoading1 = true
- if(null != this.componentData.date){
+ if (null != this.componentData.date) {
this.componentData.beginDeclareDate = this.componentData.date[0]
this.componentData.endDeclareDate = this.componentData.date[1]
+ } else {
+ this.componentData.beginDeclareDate = ''
+ this.componentData.endDeclareDate = ''
}
getIfsByFinish({ ...this.componentData, ...this.page1 }).then(res => {
this.tableLoading1 = false
@@ -577,9 +643,12 @@
// 鍏ㄩ儴鏌ヨ
getIfsByAllList() {
this.tableLoading1 = true
- if(null != this.componentData.date){
+ if (null != this.componentData.date) {
this.componentData.beginDeclareDate = this.componentData.date[0]
this.componentData.endDeclareDate = this.componentData.date[1]
+ } else {
+ this.componentData.beginDeclareDate = ''
+ this.componentData.endDeclareDate = ''
}
getIfsByAll({ ...this.componentData, ...this.page1 }).then(res => {
this.tableLoading1 = false
@@ -651,7 +720,7 @@
},
// 鎻愬墠鍏ュ簱
advancedGodown(row) {
- this.$confirm('褰撳墠鍘熸潗鏂欐槸鍚︽彁鍓嶅叆搴�?', '鎻愮ず', {
+ this.$confirm('褰撳墠鍘熻緟鏉愭槸鍚︽彁鍓嶅叆搴�?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
@@ -784,8 +853,14 @@
},
// 鑾峰彇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
}).catch(err => {
@@ -803,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() {
@@ -820,6 +895,8 @@
receiverDate: '', // 鎺ユ敹鏃堕棿
buyUnitMeas: '', // 鍗曚綅
isExpire: '', // 鍗曚綅
+ supplierNumber: '', // 渚涘簲鍟嗘壒鍙�
+ inspectionType: '', // 鎶ユ绫诲瀷
}
}
},
--
Gitblit v1.9.3