From 5250374a8999fd6144de64befa6fd6167ce50936 Mon Sep 17 00:00:00 2001
From: 罗媛媛 <2454262093@qq.com>
Date: 星期一, 01 四月 2024 15:25:19 +0800
Subject: [PATCH] 功能调整
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 3 ++-
src/components/view/b1-inspect-order-plan.vue | 15 ++++++++++-----
src/util/date.js | 7 ++++++-
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 87ce163..8328ad6 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -315,7 +315,8 @@
id(val) {
this.loading = true
this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
- id: val
+ id: val,
+ laboratory: this.sonLaboratory
}).then(res => {
this.insOrder = res.data.insOrder;
this.urgentList.forEach(m => {
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 2b397b2..c78d830 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -217,13 +217,17 @@
id: '',
font: '浜ゆ帴',
type: 'text',
- method: ''
+ disabFun: (row, index) => {
+ return row.userId == null
+ }
},
{
id: '',
font: '澶嶆牳',
type: 'text',
- method: ''
+ disabFun: (row, index) => {
+ return row.userId == null || row.insState != 4
+ }
}, {
id: '',
font: '璁ら',
@@ -274,12 +278,14 @@
currentId: null,
entityCopy: {},
orderId: 0,
+ currentTime: null
}
},
created() {
this.getLaboratoryDicts()
this.getTypeDicts()
this.getInsStateDicts()
+ this.currentTime = getYearAndMonthAndDays()
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
@@ -328,10 +334,9 @@
row,
rowIndex
}) {
- let currentTime = getYearAndMonthAndDays()
- if (currentTime === row.appointed) {
+ if (this.currentTime === row.appointed) {
return 'highlight-warning-row-border'
- } else if (currentTime > row.appointed) {
+ } else if (this.currentTime > row.appointed) {
return 'highlight-danger-row-border'
}
return ''
diff --git a/src/util/date.js b/src/util/date.js
index 867a406..5135a21 100644
--- a/src/util/date.js
+++ b/src/util/date.js
@@ -12,5 +12,10 @@
}
year = year + '-'
let days = date.getDate()
- return year + month + days
+ if (days < 10) {
+ days = '0' + days + '-'
+ } else {
+ days = days + '-'
+ }
+ return (year + month + days)
}
--
Gitblit v1.9.3