From 41cad2434411b2eac1b9814d47d06e34c291f285 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 29 三月 2024 16:29:40 +0800
Subject: [PATCH] 完成首页等问题修改
---
src/views/quality/rawMaterial/index.vue | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index fc085ef..afa8ac8 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -187,12 +187,13 @@
},
{
minWidth: '120',
- prop: 'createTime',
+ prop: 'startTime',
label: '鎶ユ鏃ユ湡',
isTrue: true,
sort: true,
isSearch: true,
searchInfoType: 'text',
+ searchInfoType: 'datetimerange',
formatter: this.formatDateTime,
},
{
@@ -210,6 +211,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
+ searchInfoType: 'datetimerange',
formatter: this.formatDateTime,
},
{
@@ -235,6 +237,14 @@
optList: () => {
return this.StateList
}
+ },
+ {
+ minWidth: '120',
+ prop: 'remark',
+ label: '澶囨敞',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
},
],
toolbar: [],
@@ -317,24 +327,21 @@
cancelButtonText: '涓嶉�氳繃',
type: 'warning'
}).then(() => {
- checkPutIFS(val.id,{result: 1}).then(res=>{
- if(res.status===200){
- console.log(res)
- }
- }).catch(error=>{
- console.error(error)
- })
+ this.checkPutIFSFun(val.id,1);
}).catch((action) => {
if(action === 'cancel'){
- checkPutIFS(val.id,{result: 2}).then(res=>{
- if(res.status===200){
- console.log(res)
- }
- }).catch(error=>{
- console.error(error)
- })
+ this.checkPutIFSFun(val.id,2);
}
});
+ },
+ checkPutIFSFun(id,result){
+ checkPutIFS(id, result).then(res=>{
+ if(res.status===200){
+ this.getData()
+ }
+ }).catch(error=>{
+ console.error(error)
+ })
},
downloadReport(){
let selection = this.multipleSelection
@@ -384,7 +391,7 @@
type: "html",
// header: "鍘熸潗鏂欐娴嬫姤鍛�",
targetStyles: ["*"],
- style: `@page {margin: 0mm 5mm;size: A4;}
+ style: `@page {margin: 0mm 5mm;size: A4 landscape;}
html {zoom:100%;}
@media print {
html,body{
--
Gitblit v1.9.3