From 1745146eee12a2d7cb1526604d713af903c298e7 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 17 Jun 2024 09:58:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=AE=A1=E7=90=86-=E5=B7=B2=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E7=8A=B6=E6=80=81=E4=B8=8D=E8=83=BD=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89=E7=BB=91=E5=AE=9A,=20=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=B4=E4=BF=AE=E5=91=98=20=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=B1=9E=E6=80=A7=20=E5=9B=9E=E6=98=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/warehouseManage/machinery/type/index.vue | 7 +++++++
 sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
index e85aa74a..d717878e 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
@@ -396,6 +396,7 @@
                             <el-select
                                 v-model="form.propId"
                                 filterable
+                                clearable
                                 placeholder="请选择资产属性"
                                 style="width: 100%"
                             >
@@ -856,6 +857,12 @@ export default {
             this.reset()
             const typeId = row.typeId || this.ids
             getMaType(typeId).then((response) => {
+                if (response.data.propId == 0) {
+                    response.data.propId = null
+                }
+                if (response.data.repairUserId == 0) {
+                    response.data.repairUserId = null
+                }
                 this.form = response.data
                 if (this.form.documentUrl) {
                     let file = {
diff --git a/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue b/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
index 294f38ea..1a2377d7 100644
--- a/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
@@ -182,7 +182,7 @@
                 :data="labelList"
                 @selection-change="handleSelectionChange"
             >
-                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column type="selection" width="55" align="center" :selectable="(row, index) => row.status != '1'" />
                 <el-table-column
                     align="center"
                     label="序号"