Merge remote-tracking branch 'origin/master'

src/views/dms/dmsBaseDeviceBom/index.vue

@@ -204,6 +204,9 @@ const data = reactive<PageData<DmsBaseDeviceBomForm, DmsBaseDeviceBomQuery>>({
     activeFlag: [
       { required: false, message: "激活标识不能为空",trigger: 'blur' },
     ],
+    bomAmount: [
+      { required: false, message: "BOM数量不能为空",trigger: 'blur' },
+    ],
   }
 });
 

src/views/dms/dmsBillsFaultInstance/index.vue

@@ -190,9 +190,9 @@
               <el-button link type="info" icon="View" @click="handleWorkflowProgress(scope.row)"></el-button>
             </el-tooltip> -->
 
-            <el-tooltip content="修改" placement="top">
+<!--            <el-tooltip content="修改" placement="top">-->
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBillsFaultInstance:edit']"></el-button>
+<!--              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBillsFaultInstance:edit']"></el-button>-->
-            </el-tooltip>
+<!--            </el-tooltip>-->
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBillsFaultInstance:remove']"></el-button>
             </el-tooltip>