From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/business/rawMaterialInspection/index.vue | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 0a6bcdf..3bb5510 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -25,8 +25,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>
@@ -38,7 +38,7 @@
</el-form-item>
<el-form-item label="涓嬪彂鏃堕棿" prop="date" v-if="(tabIndex === 3 || tabIndex === 4) && more">
<el-date-picker v-model="componentData.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
- range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%;" type="daterange"
+ range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%;" type="daterange" @change="refreshTable()"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -54,8 +54,10 @@
<div class="table-tab">
<div>
<ul class="tab">
- <li v-for="m in tabList" :key="m.value" :class="{ active: m.value === tabIndex }" @click="handleTab(m)">
- {{ m.label }}</li>
+ <li :class="{ active: tabIndex === 0 }" @click="handleTab(0)">寰呮姤妫�</li>
+ <li :class="{ active: tabIndex === 1 }" @click="handleTab(1)">寰呬笅鍗�</li>
+ <li :class="{ active: tabIndex === 3 }" @click="handleTab(3)">宸插畬鎴�</li>
+ <li :class="{ active: tabIndex === 4 }" v-if="checkPermi(['get:Ifs:ByAll'])" @click="handleTab(4)">鍏ㄩ儴</li>
</ul>
</div>
<div>
@@ -92,7 +94,7 @@
</el-dialog>
<!-- 纭鎶ユ -->
<el-dialog :close-on-click-modal="false" :title="declareType === 'add' ? '鏂板鎶ユ淇℃伅' : '鍘熸潗鏂欐姤妫�'"
- :visible.sync="declareDialogVisible" width="800px" @close="resetForm">
+ :visible.sync="declareDialogVisible" width="800px" @close="resetFormData">
<el-form ref="declareObj" :inline="true" :model="declareObj" :rules="declareObjRules" label-width="130px"
label-position="right">
<el-form-item class="declareObj-form-item" label="璁㈠崟鍙�:" prop="orderNo">
@@ -142,7 +144,7 @@
</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>
@@ -189,6 +191,7 @@
import limsTable from "@/components/Table/lims-table.vue";
export default {
+ name: 'RawMaterialInspection',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, DataLookVisible },
data() {
@@ -262,6 +265,7 @@
{ label: '鎶ユ鏃堕棿', prop: 'declareDate' },
{
dataType: 'action',
+ fixed: 'right',
label: '鎿嶄綔',
operation: [
{
@@ -299,13 +303,12 @@
],
page: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
tableData1: [],
tableLoading1: false,
column1: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px' },
{
dataType: 'tag',
label: '妫�楠岀姸鎬�',
@@ -343,13 +346,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' },
@@ -374,7 +396,7 @@
},
{ label: '鍗曚綅', prop: 'buyUnitMeas' },
{ label: '鎺ユ敹鏃堕棿', prop: 'receiverDate' },
- { label: '鎶ユ鏃堕棿', prop: 'declareDate' },
+ { label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
{
dataType: 'action',
fixed: 'right',
@@ -421,7 +443,7 @@
],
page1: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
more: false,
@@ -444,7 +466,7 @@
partNo: null,
partDesc: null,
supplierName: null,
- date: '',
+ date: null,
entrustCode: '',
inspectStatus: '',
},
@@ -525,7 +547,7 @@
methods: {
// 鍒囨崲tab琛ㄦ牸
handleTab(m) {
- this.tabIndex = m.value;
+ this.tabIndex = m;
this.refreshTable()
},
// 鏌ヨ鍥炶皟
@@ -558,6 +580,13 @@
// 宸插畬鎴愰儴鏌ヨ
getIfsByFinishList() {
this.tableLoading1 = true
+ 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
if (res.code === 200) {
@@ -571,6 +600,13 @@
// 鍏ㄩ儴鏌ヨ
getIfsByAllList() {
this.tableLoading1 = true
+ 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
if (res.code === 200) {
@@ -746,7 +782,7 @@
});
}
},
- resetForm() {
+ resetFormData() {
this.$refs['declareObj'].resetFields();
this.declareDialogVisible = false
},
@@ -776,6 +812,7 @@
openIFS() {
this.btnLoading = true
getIfsOrder().then(res => {
+ this.resetForm('componentData')
this.refreshTable()
this.btnLoading = false
}).catch(err => {
@@ -785,11 +822,9 @@
},
// 鍏ㄩ儴瀵煎嚭
handleDown() {
- let entity = { ...this.componentData }
- delete entity.orderBy
this.outLoading = true
rawAllExport({
- entity: entity
+ ...this.componentData
}).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
--
Gitblit v1.9.3