Merge remote-tracking branch 'origin/main'

src/views/inspection/inspectionobject.vue

@@ -109,6 +109,7 @@
             {
               label: "对象编号",
               prop: "objectNo",
+              search: true,
               span:4.5,
               rules: [{
                 required: true,
@@ -190,7 +191,6 @@
             {
               label: "KKS编号",
               prop: "kksNo",
-              search:true,
               rules: [{
                 required: true,
                 message: "请输入KKS编号",

src/views/inspection/inspectionobjectDetail.vue

@@ -237,11 +237,9 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          alert(this.form.istatus)
           if (this.form.istatus==1){
             this.form.cancelReason="";
           }
-          alert(this.form.cancelReason)
           update(this.form).then(() => {
             this.$router.push({
               path: "/inspection/inspectionobject",