From 248d9f8b01d9a395af66f2336cb0b1eeeff2bd0a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 19 二月 2025 10:10:03 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/rawMaterialInspection/index.vue | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 57674fb..3430970 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -26,9 +26,11 @@
@keyup.enter.native="refreshTable">
</el-input>
</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="small" icon="el-icon-search" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- <el-button size="small" @click="refresh()" icon="el-icon-refresh">閲� 缃�</el-button>
+ <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-form-item>
</el-row>
<el-row>
<el-form-item label="妫�楠岀姸鎬�" prop="inspectStatus" v-if="(tabIndex === 3 || tabIndex === 4) && more">
@@ -76,7 +78,7 @@
</div>
<!--寰呮姤妫�銆佸緟涓嬪崟-->
<div class="table">
- <lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0 || tabIndex === 1">
+ <lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0 || tabIndex === 1"
@pagination="pagination" :height="'calc(100vh - 290px)'"
:page="page" :tableLoading="tableLoading"></lims-table>
</div>
@@ -206,7 +208,25 @@
{label: '闆朵欢鍙�', prop: 'partNo'},
{label: '闆朵欢鎻忚堪', prop: 'partDesc'},
{label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName'},
- {label: '鐗╂枡绫诲瀷', prop: 'isExpire'},
+ {
+ dataType: 'tag',
+ label: '鐗╂枡绫诲瀷',
+ prop: 'isExpire',
+ formatData: (params) => {
+ if (params == 1) {
+ return '杩囨湡鐗╂枡'
+ } else {
+ return ''
+ }
+ },
+ formatType: (params) => {
+ if (params == 1) {
+ return 'info'
+ } else {
+ return ''
+ }
+ }
+ },
{label: '鍗曚綅', prop: 'buyUnitMeas'},
{label: '鎺ユ敹鏃堕棿', prop: 'receiverDate'},
{label: '鎶ユ鏃堕棿', prop: 'declareDate'},
@@ -214,7 +234,7 @@
dataType: 'action',
fixed: 'right',
label: '鎿嶄綔',
- width: '140px',
+ width: '150px',
operation: [
{
name: '鎶ユ',
@@ -271,7 +291,25 @@
{label: '鏍峰搧鍚嶇О', prop: 'sampleName'},
{label: '鏍峰搧鍨嬪彿', prop: 'sampleModel'},
{label: '妫�楠屼汉', prop: 'userName'},
- {label: '鐗╂枡绫诲瀷', prop: 'isExpire'},
+ {
+ dataType: 'tag',
+ label: '鐗╂枡绫诲瀷',
+ prop: 'isExpire',
+ formatData: (params) => {
+ if (params == 1) {
+ return '杩囨湡鐗╂枡'
+ } else {
+ return ''
+ }
+ },
+ formatType: (params) => {
+ if (params == 1) {
+ return 'info'
+ } else {
+ return ''
+ }
+ }
+ },
{label: '鍗曚綅', prop: 'buyUnitMeas'},
{label: '鎺ユ敹鏃堕棿', prop: 'receiverDate'},
{label: '鎶ユ鏃堕棿', prop: 'declareDate'},
--
Gitblit v1.9.3