From 6fe1caffebf43b41faf8614068730d656e686b59 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 06 五月 2025 13:36:02 +0800
Subject: [PATCH] 调整订单页面路由问题
---
src/views/CNAS/resourceDemand/device/component/management.vue | 2 +-
src/views/CNAS/resourceDemand/device/component/record.vue | 10 ++++++++--
src/views/business/productOrder/index.vue | 28 ++++++++++++++++++++--------
3 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 8d74156..7bfa710 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -477,7 +477,7 @@
{ label: "绠＄悊缂栧彿", prop: "managementNumber" },
{ label: "鎶�鏈寚鏍�", prop: "technicalIndicators" },
{ label: "璐疆鏃ユ湡", prop: "acquisitionDate" },
- { label: "鍚敤鏃ユ湡", prop: "activationDate" },
+ { label: "鏍″噯鏈夋晥鏈�", prop: "activationDate" },
{ label: "绠＄悊浜�", prop: "equipmentManagerUser" },
{ label: "瀛樻斁鐐�", prop: "storagePoint" },
{ label: "鎵�灞為儴闂�", prop: "laboratoryName" },
diff --git a/src/views/CNAS/resourceDemand/device/component/record.vue b/src/views/CNAS/resourceDemand/device/component/record.vue
index 869410d..5f3b83c 100644
--- a/src/views/CNAS/resourceDemand/device/component/record.vue
+++ b/src/views/CNAS/resourceDemand/device/component/record.vue
@@ -108,7 +108,8 @@
prop="useDateList">
<el-date-picker v-model="form.useDateList" :disabled="operationType === 'view'" end-placeholder="缁撴潫鏃ユ湡"
format="yyyy-MM-dd HH:mm:ss" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width:100%"
- type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss">
+ type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss"
+ :picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
@@ -213,7 +214,12 @@
dialogVisible: false,
operationType: '',
formParamList: [],
- tableLoading: false
+ tableLoading: false,
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() > Date.now();
+ }
+ }
}
},
mounted() {
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index b602274..b674f14 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -985,14 +985,26 @@
},
// 鐐瑰嚮鏍峰搧鍚嶇О
selectAllByOne(row) {
- this.$router.push({
- path: "/productOrder/addView", query: {
- examine: 1,
- active: 2,
- currentId: row.id,
- tabIndex: this.tabIndex,
- }
- });
+ if (this.tabIndex === 4) {
+ this.$router.push({
+ path: "/productOrder/addOrder", query: {
+ examine: 1,
+ active: 2,
+ currentId: row.id,
+ tabIndex: this.tabIndex,
+ }
+ });
+ } else {
+ this.$router.push({
+ path: "/productOrder/addView", query: {
+ examine: 1,
+ active: 2,
+ currentId: row.id,
+ tabIndex: this.tabIndex,
+ }
+ });
+ }
+
},
// 淇敼鏍峰搧鍨嬪彿
editSampleModel (row) {
--
Gitblit v1.9.3