From d6e3826610b518a97c3622c61ffa4cafc3f0cd36 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 21 二月 2025 16:08:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/materialOrder/copperOrder.vue | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 07ecb07..18783ad 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -99,7 +99,7 @@
</el-col>
<el-col :span="6">
<el-form-item class="addObj-form-item" label="澶囨敞:">
- <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :placeholder="active>1 ? '' : '璇疯緭鍏�'" :readonly="active>1" clearable
+ <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :placeholder="active>1 ? '' : '璇疯緭鍏�'" :disabled="active>1" clearable
size="small" type="textarea"></el-input>
</el-form-item>
</el-col>
@@ -423,15 +423,10 @@
export default {
components: {},
dicts: ['check_type', 'urgency_level'],
- props: {
- currentId: {
- type: Number,
- default: () => 0
- }
- },
data() {
return {
active: '',
+ currentId: '',
sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
editTable:[],
noNeedCheckLoad: false, // 鍏嶆鎸夐挳loading
@@ -620,6 +615,7 @@
},
mounted() {
this.active = this.$route.query.active
+ this.currentId = this.$route.query.currentId
this.getUserNowInfo()
this.selectStandardTreeList()
this.selectStandardMethods()
--
Gitblit v1.9.3