From 392b81a24c69be2f1d738df342f97729f07a1a75 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 19 三月 2025 14:23:00 +0800
Subject: [PATCH] 合并装备代码1
---
src/views/business/rawMaterialInspection/index.vue | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index d0f8df2..bc5b92f 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -141,10 +141,15 @@
<el-option :value="1" label="杩囨湡鐗╂枡"></el-option>
</el-select>
</el-form-item>
+ <!-- TODO:蹇呭～ -->
+ <el-form-item class="declareObj-form-item" label="渚涘簲鍟嗘壒鍙�:" prop="buyUnitMeas">
+ <el-input v-model="declareObj.buyUnitMeas" :disabled="declareType !== 'add'" clearable class="addObj-info"
+ size="small"></el-input>
+ </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>
@@ -191,6 +196,7 @@
import limsTable from "@/components/Table/lims-table.vue";
export default {
+ name: 'RawMaterialInspection',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, DataLookVisible },
data() {
@@ -301,7 +307,7 @@
],
page: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
tableData1: [],
@@ -351,7 +357,25 @@
{ 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: 'sampleName' },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
@@ -423,7 +447,7 @@
],
page1: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
more: false,
@@ -560,7 +584,7 @@
// 宸插畬鎴愰儴鏌ヨ
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 {
@@ -580,7 +604,7 @@
// 鍏ㄩ儴鏌ヨ
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 {
@@ -792,6 +816,7 @@
openIFS() {
this.btnLoading = true
getIfsOrder().then(res => {
+ this.resetForm('componentData')
this.refreshTable()
this.btnLoading = false
}).catch(err => {
--
Gitblit v1.9.3