From 073227f5aca751e1c2121c16416bf68207efc133 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 14 Jun 2024 14:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96-=E6=A0=87=E7=AD=BE=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E7=AE=A1=E7=90=86=E5=A4=9A=E9=80=89=E6=A1=86=20=20?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86-=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=91=98,=E8=B5=84=E4=BA=A7=E5=B1=9E=E6=80=A7=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/warehouseManage/machinery/type/index.vue | 6 ++++++
 sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue   | 2 +-
 2 files changed, 7 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 30827202..0939a569 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
@@ -868,6 +868,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 b1ffae28..f8537cbf 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="序号"