优化-标签绑定管理多选框 类型管理-维修员,资产属性回显

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 = {

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="序号"