Merge remote-tracking branch 'origin/main'

src/views/inspection/inspectionobject.vue

@@ -200,6 +200,10 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "工器具编码",
+              prop: "toolsCodeId"
+            }
           ]
         },
         cancelForm: {},

src/views/inspection/inspectionobjectDetail.vue

@@ -107,7 +107,6 @@ export default {
                     }
                   }else{
                     const toolsCodeId = this.findObject(this.option.column, "toolsCodeId");
-                    this.form.toolsCodeId=' ';
                     toolsCodeId.display = false;
                     const kksNo = this.findObject(this.option.column, "kksNo");
                     kksNo.disabled = false;
@@ -207,6 +206,11 @@ export default {
               label: "toolsCodeId",
               value: "toolsCodeId",
             },
+            rules: [{
+              required: true,
+              message: "请输入工器具编码",
+              trigger: "blur"
+            }],
             event: {
               change: (val) => {
                 if (!val) return