From 0042dbfd410064ebfab00826f927ed73448db5ec Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 21 五月 2024 14:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/quality/rawMaterial/index.vue | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index fc085ef..1152cfb 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: [],
@@ -275,17 +285,19 @@
})
}
- this.table.operator = [{
- text: '瀹℃牳',
- type: 'text',
- size: 'small',
- fun: this.examineHandle,
- showFun: (row)=>{return row.type==='棣栨'},
- show: {
- key: 'checkState',
- val: ['0']
- }
- }]
+ if(this.permissions.quality_rawMaterial_check){
+ this.table.operator = [{
+ text: '瀹℃牳',
+ type: 'text',
+ size: 'small',
+ fun: this.examineHandle,
+ showFun: (row)=>{return row.type==='棣栨'&& row.insState==='1'},
+ show: {
+ key: 'checkState',
+ val: ['0','2']
+ }
+ }]
+ }
if(this.permissions.quality_rawMaterial_del){
this.table.operator.push({
text: '浣滃簾',
@@ -317,24 +329,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 +393,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