From abb54977315fb356de797195a8a3333ac4e08037 Mon Sep 17 00:00:00 2001
From: luochen <1335842475@qq.com>
Date: Wed, 1 Jan 2025 14:09:06 +0800
Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=E8=BF=87=E7=A8=8B=E6=A3=80?=
=?UTF-8?q?=E9=AA=8C=20=E7=A6=81=E7=94=A8=E4=B8=AA=E4=BA=BA=E6=A3=80?=
=?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1=E5=A4=8D=E9=80=89=E6=A1=86=EF=BC=8C?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mes/qms/inspec-job.js | 8 +++
.../mes/qms/inspec/content/inspec-process.vue | 57 +++++++++++++++++--
src/views/mes/qms/inspec/index.vue | 8 ++-
src/views/mes/qms/inspec/ui/search-ui.vue | 2 +-
4 files changed, 65 insertions(+), 10 deletions(-)
diff --git a/src/api/mes/qms/inspec-job.js b/src/api/mes/qms/inspec-job.js
index 35c312d..c3321a6 100644
--- a/src/api/mes/qms/inspec-job.js
+++ b/src/api/mes/qms/inspec-job.js
@@ -317,3 +317,11 @@ export function selectPreNc(query) {
params: query
})
}
+//图片删除
+export function deleteAttachment(param) {
+ return request({
+ url: qms('/inspec-attachment/minioDelete'),
+ method: 'get',
+ params: param
+ })
+}
diff --git a/src/views/mes/qms/inspec/content/inspec-process.vue b/src/views/mes/qms/inspec/content/inspec-process.vue
index da7e859..7b9d15c 100644
--- a/src/views/mes/qms/inspec/content/inspec-process.vue
+++ b/src/views/mes/qms/inspec/content/inspec-process.vue
@@ -723,7 +723,7 @@ import { checkTableRepeat, setSeq } from "@/util/table";
import { copyJSON } from "@/util/util";
import { closeForm, processForm } from "@/views/mes/qms/inspec/content/inspec";
import {
- closeInspec, getMinio,
+ closeInspec, deleteAttachment, getMinio,
getOneDetail, reInspec, saveAllInspecAndDetailResult,
saveInspecAndDetailResult,
saveNc,
@@ -882,14 +882,33 @@ export default {
//拍照预览
handlePreview(file) {
let me = this
- me.dialogImg = URL.createObjectURL(file.raw);
- //me.uploadList.push({url:me.dialogImg})
+ if (file.status === 'success') {
+ me.dialogImg = file.url
+ } else {
+ me.dialogImg = URL.createObjectURL(file.raw);
+ }
me.dialogImgVisible = true
},
//拍照删除
handleRemove(file) {
let me = this
- //me.uploadList.splice(me.uploadList.indexOf(file), 1)
+ let param = {
+ sid: file.sid,
+ url: file.url,
+ }
+ showLoading()
+ deleteAttachment(param).then(res => {
+ hideLoading()
+ if (res.status === 200) {
+ me.$message.success("已删除")
+ } else {
+ me.$message.error(res.data.message)
+ me.searchPhoto()
+ }
+ }).catch(e => {
+ hideLoading()
+ me.searchPhoto()
+ })
},
// 处理文件变化(如拍照)
handleChange(file, fileList) {
@@ -904,9 +923,26 @@ export default {
me.dialogForm = {}
me.dialogForm.inspecJobBo = row.inspecJobBo
me.dialogForm.inspecDetailBo = row.handle
- me.uploadList = []
+ me.searchPhoto()
me.cameraVisible = true
},
+ //拍照开窗检索
+ searchPhoto(){
+ let me = this
+ me.uploadList = []
+ let param = {
+ inspecJobBo: me.dialogForm.inspecJobBo,
+ inspecDetailBo: me.dialogForm.inspecDetailBo,
+ }
+ showLoading()
+ getMinio(param).then(res => {
+ hideLoading()
+ console.log(res.data)
+ me.uploadList = res.data.data
+ }).catch(e => {
+ hideLoading()
+ })
+ },
//上传
uploadPhoto(){
let me = this
@@ -914,12 +950,21 @@ export default {
if (files.length === 0) {
this.$message.error('请先选择要上传的文件');
return;
+ } else {
+ let file = files.filter(f => f.status !== 'success')
+ if (file.length === 0) {
+ this.$message.error('请先选择要上传的文件');
+ return;
+ }
}
me.uploadData.inspecJobBo = me.dialogForm.inspecJobBo
me.uploadData.inspecDetailBo = me.dialogForm.inspecDetailBo
const formData = new FormData();
files.forEach(file => {
- formData.append('files', file.raw); // 将每个文件添加到 formData 中
+ //不能上传已经上传过的文件
+ if (file.status !== 'success') {
+ formData.append('files', file.raw); // 将每个文件添加到 formData 中
+ }
});
formData.append('uploadData',JSON.stringify(me.uploadData));
showLoading()
diff --git a/src/views/mes/qms/inspec/index.vue b/src/views/mes/qms/inspec/index.vue
index 0e0f5f2..c8ba341 100644
--- a/src/views/mes/qms/inspec/index.vue
+++ b/src/views/mes/qms/inspec/index.vue
@@ -340,6 +340,7 @@ export default {
to: moment(new Date().setDate(new Date().getDate()+1)).format('YYYY-MM-DD HH:mm'),
isClickSearch:true,
changeSearch:true,
+ personal:true
},
site: getStore({ name: 'tenantId' }),
tableLoading: false,
@@ -1099,8 +1100,9 @@ export default {
searchReset() {
let me = this
me.searchForm = {
- from: '',
- to: '',
+ from: moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD HH:mm'),
+ to: moment(new Date().setDate(new Date().getDate()+1)).format('YYYY-MM-DD HH:mm'),
+ personal:true
}
this.tableData = []
this.qcTable = []
@@ -1108,7 +1110,7 @@ export default {
me.page.current = 1
me.params = {}
clear.call(me, me.$refs.tableData)
- me.searchChange()
+ //me.searchChange()
},
afterCloseJob(key) {
let init = {
diff --git a/src/views/mes/qms/inspec/ui/search-ui.vue b/src/views/mes/qms/inspec/ui/search-ui.vue
index a7721dc..99d2cd1 100644
--- a/src/views/mes/qms/inspec/ui/search-ui.vue
+++ b/src/views/mes/qms/inspec/ui/search-ui.vue
@@ -124,7 +124,7 @@
- {{ $t('mes.qms.personalTaskOrder') }}
From 3db220ba9a43bf7af349b1d32d8f9e0ec1fd882f Mon Sep 17 00:00:00 2001
From: luochen <1335842475@qq.com>
Date: Wed, 1 Jan 2025 14:09:53 +0800
Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=E6=A3=80=E9=AA=8C=E9=A2=91?=
=?UTF-8?q?=E7=8E=87=20=E9=9A=90=E8=97=8F=E4=B8=8D=E7=94=A8=E7=9A=84?=
=?UTF-8?q?=E9=A2=91=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/qms/inspec-freq/index.vue | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/views/mes/qms/inspec-freq/index.vue b/src/views/mes/qms/inspec-freq/index.vue
index eaa852c..b69de77 100644
--- a/src/views/mes/qms/inspec-freq/index.vue
+++ b/src/views/mes/qms/inspec-freq/index.vue
@@ -836,7 +836,16 @@ export default {
}
},
rowClassName: function ({ row }) {
- if (row.value == '7' || row.value == '8') {
+ if (row.value === '2'
+ || row.value === '3'
+ || row.value === '4'
+ || row.value === '5'
+ || row.value === '6'
+ || row.value === '7'
+ || row.value === '8'
+ || row.value === '9'
+ || row.value === '10'
+ ) {
return 'showRow'
} else {
return
@@ -920,7 +929,7 @@ export default {
this.freqData.forEach((f, index) => {
this.$set(this.freqData[index], 'item', key[this.freqData[index].value])
this.$set(this.freqData[index], 'val', '')
- this.$set(this.freqData[index], 'seq', this.freqData[index].value)
+ // this.$set(this.freqData[index], 'seq', this.freqData[index].value)
this.$set(this.freqData[index], 'openFreqSwitch',this.freqData[index].openFreqSwitch )
// if (index <= 6) {
// this.$set(this.freqData[index], 'seq', index + 1 + '')
@@ -929,6 +938,7 @@ export default {
// this.$set(this.freqData[index], 'seq', index - 1 + '')
// }
})
+ setSeq(this.freqData, 'seq')
this.freqData.sort((a, b) => a.seq - b.seq)
}
},
From 9d2f8e2eab41420cde205549af7f789144471572 Mon Sep 17 00:00:00 2001
From: liaohechuan
Date: Wed, 1 Jan 2025 14:09:53 +0800
Subject: [PATCH 03/11] =?UTF-8?q?fix=EF=BC=88IQC=E6=A3=80=E9=AA=8C?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=89=EF=BC=9A=E9=BB=98=E8=AE=A4=E5=8B=BE?=
=?UTF-8?q?=E9=80=89=E4=B8=AA=E4=BA=BA=E4=BB=BB=E5=8A=A1=E5=8D=95=E4=B8=94?=
=?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/qms/iqc-inspec/index.vue | 2 ++
src/views/mes/qms/iqc-inspec/ui/search-ui.vue | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/views/mes/qms/iqc-inspec/index.vue b/src/views/mes/qms/iqc-inspec/index.vue
index 2de02f3..283fe78 100644
--- a/src/views/mes/qms/iqc-inspec/index.vue
+++ b/src/views/mes/qms/iqc-inspec/index.vue
@@ -321,6 +321,7 @@ export default {
from: moment(new Date().setMonth(new Date().getMonth()-1)).format('YYYY-MM-DD HH:mm'),
to: moment(new Date()).format('YYYY-MM-DD HH:mm'),
seq: '',
+ personal:true
},
site: getStore({ name: 'tenantId' }),
tableLoading: false,
@@ -888,6 +889,7 @@ export default {
from: moment(new Date().setMonth(new Date().getMonth()-1)).format('YYYY-MM-DD HH:mm'),
to: moment(new Date()).format('YYYY-MM-DD HH:mm'),
seq: '',
+ personal:true
}
this.page.size = 10
this.page.current = 1
diff --git a/src/views/mes/qms/iqc-inspec/ui/search-ui.vue b/src/views/mes/qms/iqc-inspec/ui/search-ui.vue
index 71e7e56..5925c3a 100644
--- a/src/views/mes/qms/iqc-inspec/ui/search-ui.vue
+++ b/src/views/mes/qms/iqc-inspec/ui/search-ui.vue
@@ -135,7 +135,7 @@
-
+
{{ $t('mes.qms.personalTaskOrder') }}
From cf5bc6314c4db8a0161fa648ed77ee307523a3df Mon Sep 17 00:00:00 2001
From: luochen <1335842475@qq.com>
Date: Wed, 1 Jan 2025 14:10:14 +0800
Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=E5=93=81=E8=B4=A8=E5=A4=8D?=
=?UTF-8?q?=E5=88=A4=20=E4=BF=AE=E6=94=B9=E5=A4=8D=E5=88=A4=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/qms/rejudgment/index.vue | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/mes/qms/rejudgment/index.vue b/src/views/mes/qms/rejudgment/index.vue
index 7d3cd4e..32e5f8d 100644
--- a/src/views/mes/qms/rejudgment/index.vue
+++ b/src/views/mes/qms/rejudgment/index.vue
@@ -173,8 +173,6 @@
border
>
-
-
@@ -231,7 +229,11 @@
-
+
+
+ {{scope.row.rejudgCreator}}/{{scope.row.name}}
+ {{scope.row.rejudgCreator}}
+
From b06ac04d809e9ada1ae459da78e2e41b2d8b6229 Mon Sep 17 00:00:00 2001
From: luochen <1335842475@qq.com>
Date: Wed, 1 Jan 2025 19:46:12 +0800
Subject: [PATCH 05/11] =?UTF-8?q?feat:=20=E6=98=BE=E7=A4=BA=E6=96=B0?=
=?UTF-8?q?=E7=89=A9=E6=96=99=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=9C=AA=E5=AE=8C?=
=?UTF-8?q?=E6=88=90=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mes/qms/inspec/content/inspec-process.vue | 22 +++++++++++++++----
src/views/mes/qms/inspec/index.vue | 8 +++++--
src/views/mes/qms/inspec/ui/search-ui.vue | 13 ++++++++++-
3 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/views/mes/qms/inspec/content/inspec-process.vue b/src/views/mes/qms/inspec/content/inspec-process.vue
index 7b9d15c..a15b6ea 100644
--- a/src/views/mes/qms/inspec/content/inspec-process.vue
+++ b/src/views/mes/qms/inspec/content/inspec-process.vue
@@ -606,8 +606,9 @@
-
-
+
+ {{processForm.newItem}}
+
{
hideLoading()
diff --git a/src/views/mes/qms/inspec/index.vue b/src/views/mes/qms/inspec/index.vue
index c8ba341..ec270a8 100644
--- a/src/views/mes/qms/inspec/index.vue
+++ b/src/views/mes/qms/inspec/index.vue
@@ -340,7 +340,8 @@ export default {
to: moment(new Date().setDate(new Date().getDate()+1)).format('YYYY-MM-DD HH:mm'),
isClickSearch:true,
changeSearch:true,
- personal:true
+ personal:true,
+ statusCount:null
},
site: getStore({ name: 'tenantId' }),
tableLoading: false,
@@ -995,7 +996,9 @@ export default {
this.page.total = res.data.data.total
me.page.current = res.data.data.current
me.page.size = res.data.data.size
+ me.searchForm.statusCount = 0
if (this.tableData.length > 0) {
+ me.searchForm.statusCount = this.tableData[0].statusCount
this.tableData.forEach((t) => {
let s = this.jobStatusList.find((j) => j.value == t.status)
t.newStatus = s ? s.label : ''
@@ -1102,7 +1105,8 @@ export default {
me.searchForm = {
from: moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD HH:mm'),
to: moment(new Date().setDate(new Date().getDate()+1)).format('YYYY-MM-DD HH:mm'),
- personal:true
+ personal:true,
+ statusCount:null
}
this.tableData = []
this.qcTable = []
diff --git a/src/views/mes/qms/inspec/ui/search-ui.vue b/src/views/mes/qms/inspec/ui/search-ui.vue
index 99d2cd1..c1e0c8d 100644
--- a/src/views/mes/qms/inspec/ui/search-ui.vue
+++ b/src/views/mes/qms/inspec/ui/search-ui.vue
@@ -123,7 +123,7 @@
-
+
{{ $t('mes.qms.personalTaskOrder') }}
@@ -172,6 +172,17 @@
+
+
+
+
+
+
+
+
+ {{searchForm.statusCount}}
+
+
From 49ab769596d6cb5f98a931e483f3d97b32f64524 Mon Sep 17 00:00:00 2001
From: luochen <1335842475@qq.com>
Date: Wed, 1 Jan 2025 20:24:14 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feat:=20=E6=A3=80=E9=AA=8C=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=20=E7=82=B9=E5=87=BB=E4=BB=BB=E5=8A=A1=E6=9F=A5?=
=?UTF-8?q?=E7=9C=8B=E7=95=8C=E9=9D=A2=E5=88=A4=E5=AE=9A=E7=BB=93=E6=9E=9C?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/qms/inspec/content/inspec-view.vue | 15 ++++++++++-----
src/views/mes/qms/inspec/ui/search-ui.vue | 4 ++--
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/mes/qms/inspec/content/inspec-view.vue b/src/views/mes/qms/inspec/content/inspec-view.vue
index f50de3f..dc1d98f 100644
--- a/src/views/mes/qms/inspec/content/inspec-view.vue
+++ b/src/views/mes/qms/inspec/content/inspec-view.vue
@@ -53,11 +53,7 @@
{{ form.judgeDateTime }}
- NG
- OK
-
- {{ $t('mes.specialProcurement') }}
-
+ {{findLevelList(form.result)}}
- {{ $t('mes.qms.personalTaskOrder') }}
+
+ {{ $t('mes.qms.personalTaskOrder') }}
From 59861c047e0bcbaa70ea954be2435994190c6ad6 Mon Sep 17 00:00:00 2001
From: luochen <1335842475@qq.com>
Date: Wed, 1 Jan 2025 20:31:40 +0800
Subject: [PATCH 07/11] =?UTF-8?q?feat:=20=E6=A3=80=E9=AA=8C=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=20=E4=B8=AA=E4=BA=BA=E4=BB=BB=E5=8A=A1=E7=A6=81?=
=?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/qms/inspec/ui/search-ui.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/mes/qms/inspec/ui/search-ui.vue b/src/views/mes/qms/inspec/ui/search-ui.vue
index a4945a0..5c73792 100644
--- a/src/views/mes/qms/inspec/ui/search-ui.vue
+++ b/src/views/mes/qms/inspec/ui/search-ui.vue
@@ -124,7 +124,7 @@
-
+
{{ $t('mes.qms.personalTaskOrder') }}
From b552bba543cd0916c1396fe1816b3afedac291be Mon Sep 17 00:00:00 2001
From: syngna_qiao
Date: Thu, 2 Jan 2025 08:40:20 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95):=20ActiveMq=20to?=
=?UTF-8?q?pic=E5=8F=91=E9=80=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mes/print/topic-send-test.js | 10 +++++
src/router/views/index.js | 9 ++++
src/views/mes/print/topic-send-test/index.vue | 45 +++++++++++++++++++
3 files changed, 64 insertions(+)
create mode 100644 src/api/mes/print/topic-send-test.js
create mode 100644 src/views/mes/print/topic-send-test/index.vue
diff --git a/src/api/mes/print/topic-send-test.js b/src/api/mes/print/topic-send-test.js
new file mode 100644
index 0000000..0e87ce3
--- /dev/null
+++ b/src/api/mes/print/topic-send-test.js
@@ -0,0 +1,10 @@
+import request from '@/router/axios'
+import {nlv_print} from "@/api/prefix";
+
+export function send(query) {
+ return request({
+ url: nlv_print('/topic-send-test/send'),
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 29570bb..073760c 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -76,5 +76,14 @@ export default [
meta: {
keepAlive: true
}
+ }, {
+ path: '/test/topic-send-msg',
+ component: () =>
+ import(/* webpackChunkName: "page" */ '@/views/mes/print/topic-send-test'),
+ name: 'TOPIC发送测试',
+ meta: {
+ keepAlive: true,
+ isAuth: false,
+ }
},
]
diff --git a/src/views/mes/print/topic-send-test/index.vue b/src/views/mes/print/topic-send-test/index.vue
new file mode 100644
index 0000000..c7a3641
--- /dev/null
+++ b/src/views/mes/print/topic-send-test/index.vue
@@ -0,0 +1,45 @@
+
+
+
+ 发送测试
+
+
+
+
+
+
From 4bc7d39a79e406de118930e1e6f37468922e7d09 Mon Sep 17 00:00:00 2001
From: luochen <1335842475@qq.com>
Date: Thu, 2 Jan 2025 10:13:07 +0800
Subject: [PATCH 09/11] =?UTF-8?q?feat:=20=E5=86=BB=E7=BB=93/=E8=A7=A3?=
=?UTF-8?q?=E5=86=BB=201.=E5=88=A4=E5=AE=9A=E7=AD=89=E7=BA=A7=E7=9A=84?=
=?UTF-8?q?=E5=88=97=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=9A=841=EF=BC=8C0?=
=?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=8C=89=E5=AD=97=E5=85=B8=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E6=9D=A5=E8=BD=AC=E6=8D=A2=E6=88=90OK=E3=80=81NG=202.?=
=?UTF-8?q?=E5=86=BB=E7=BB=93/=E8=A7=A3=E5=86=BB=E4=BA=BA=E6=AD=A4?=
=?UTF-8?q?=E5=88=97=EF=BC=8C=E9=9C=80=E6=98=BE=E7=A4=BA=E6=88=90=20?=
=?UTF-8?q?=E5=B7=A5=E5=8F=B7/=E5=A7=93=E5=90=8D=203.=E8=BF=87=E6=BB=A4?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=9A=E4=BA=A7=E5=87=BA=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E3=80=82=E9=BB=98=E8=AE=A4=E6=98=8E=E5=A4=A9~=E5=BE=80?=
=?UTF-8?q?=E5=89=8D=E6=8E=A87=E5=A4=A9=E7=9A=84=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E3=80=82=E7=82=B9=E6=B8=85=E7=A9=BA=E6=97=B6=EF=BC=8C=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E6=8C=89=E6=AD=A4=E9=80=BB=E8=BE=91=E8=B5=8B=E4=BA=88?=
=?UTF-8?q?=E9=BB=98=E8=AE=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/qms/freezeAndThaw/index.vue | 17 ++++++++++++++++-
src/views/mes/qms/freezeAndThaw/init.js | 8 +++++---
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/views/mes/qms/freezeAndThaw/index.vue b/src/views/mes/qms/freezeAndThaw/index.vue
index 316c140..528dc0f 100644
--- a/src/views/mes/qms/freezeAndThaw/index.vue
+++ b/src/views/mes/qms/freezeAndThaw/index.vue
@@ -261,6 +261,9 @@
+
+ {{findLevelList(scope.row.inspecLevel)}}
+
@@ -268,7 +271,11 @@
-
+
+
+ {{scope.row.freedCreator}}/{{scope.row.name}}
+ {{scope.row.freedCreator}}
+
@@ -369,6 +376,14 @@ export default {
// .catch(() => {})
},
methods: {
+ findLevelList (result) {
+ let me = this
+ for (let i = 0; i < me.inspecLevelList.length; i++) {
+ if (me.inspecLevelList[i].value === result) {
+ return me.inspecLevelList[i].label
+ }
+ }
+ },
statusListFind(status) {
let me = this
return me.statusList.find(item => item.value === status).label
diff --git a/src/views/mes/qms/freezeAndThaw/init.js b/src/views/mes/qms/freezeAndThaw/init.js
index adc27a0..067b8f6 100644
--- a/src/views/mes/qms/freezeAndThaw/init.js
+++ b/src/views/mes/qms/freezeAndThaw/init.js
@@ -1,15 +1,17 @@
+import moment from "moment/moment";
+
export const init = {
sourceMasterLot:null,
storageBin: null,
- startTime: null,
item: null,
weight: null,
- endTime: null,
inspecLevel:null,
length:null,
status:null,
inventoryId:null,
- inventoryIdList:[]
+ inventoryIdList:[],
+ startTime: moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD HH:mm'),
+ endTime: moment(new Date().setDate(new Date().getDate()+1)).format('YYYY-MM-DD HH:mm'),
}
export const searchRules = {}
From 2250a0f3037ff4755e437f4d948258fe176765c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=9E=9D=E5=88=9A?=
Date: Thu, 2 Jan 2025 11:01:30 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E6=95=B4=E5=90=88=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?=E4=B8=AD=E6=96=B9=E6=B3=95=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../index.vue | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/views/mes/int/integrated-service-transaction-history-query/index.vue b/src/views/mes/int/integrated-service-transaction-history-query/index.vue
index 52100af..4635c2f 100644
--- a/src/views/mes/int/integrated-service-transaction-history-query/index.vue
+++ b/src/views/mes/int/integrated-service-transaction-history-query/index.vue
@@ -3,7 +3,7 @@
-
+
@@ -35,6 +35,9 @@
{{ resetStatusShow(scope.row.state) }}
+
+ {{ getValConvertShow(scope.row.functionName) }}
+
item.value === srcVal);
+ return obj != undefined ? obj.label : srcVal;
+ },
+
showHistory(row) {
this.selectedRowData = row // 存储选中的行数据
this.selectedRowData.request = JSON.parse(row.request);
From e57fa921f5d596186fa7568421d8e9534f667f0d Mon Sep 17 00:00:00 2001
From: syngna_qiao
Date: Thu, 2 Jan 2025 13:54:57 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix(POD):=20=E8=BD=A6=E9=97=B4=E4=BB=A3?=
=?UTF-8?q?=E5=8F=B7=E9=BB=98=E8=AE=A4=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/pod-nalinv/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/mes/pod-nalinv/index.vue b/src/views/mes/pod-nalinv/index.vue
index 3ad280a..9ad0611 100644
--- a/src/views/mes/pod-nalinv/index.vue
+++ b/src/views/mes/pod-nalinv/index.vue
@@ -588,6 +588,7 @@ export default {
},
getActivityOption(activityId) {
let me = this;
+ me.podActionForm.fab = ''
if (activityId) {
getByActivityOption(activityId, 'Z_FAB')
.then((response) => {