From 0b89c49a1e3ab87368b689d985e28a977a9bb84e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 13:08:20 +0800
Subject: [PATCH] 合并冲突

---
 src/components/do/b1-ins-order/add.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 355ae0f..5de1787 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -245,7 +245,7 @@
 				</el-table-column>
 				<el-table-column prop="standardMethodListId" label="妫�楠屾爣鍑�" align="center" min-width="100">
 					<template slot-scope="scope">
-						<el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null" placeholder="妫�楠屾爣鍑�" size="small"
+						<el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null||active>1" placeholder="妫�楠屾爣鍑�" size="small"
 							:loading="methodLoad" @change="(value)=>methodChange(value, scope.row)" @focus="methodFocus" :readonly="active>1">
 							<el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
 							</el-option>

--
Gitblit v1.9.3