fix conflict

client/src/views/qualityinspect/inspectTable.vue

@@ -97,14 +97,14 @@
         >
           <template slot-scope="scope">
             <el-button
-             :disabled="!checkPermission(['inspectTable'])"
+             :disabled="!checkPermission(['qualityinspect'])"
               type="primary"
               size="small"
               icon="el-icon-edit"
               @click="handleEdit(scope)"
             />
             <el-button
-             :disabled="!checkPermission(['inspectTable'])"
+             :disabled="!checkPermission(['qualityinspect'])"
               type="danger"
               size="small"
               icon="el-icon-delete"
@@ -406,6 +406,7 @@ export default {
             updateQualityinspect(this.inspectTable.id, this.inspectTable).then((res) => {
               if (res.code >= 200) {
                 this.dialogVisible = false;
+                 this.getLists();
                 this.$message.success("成功");
               }
             });
@@ -414,6 +415,7 @@ export default {
             createQualityinspect(this.inspectTable).then((res) => {
               if (res.code >= 200) {
                 this.dialogVisible = false;
+                 this.getLists();
                 this.$message.success("成功");
               }
             });

client/src/views/qualityinspect/inspecttaskdo.vue

@@ -315,7 +315,7 @@ export default {
     async confirm(form) {
      
       this.inspecttask.inspecttask=this.$route.params.id;
-      console.log(this.inspecttask)
+      
          createsubinspecttask(this.inspecttask).then((res) => {
              
                 this.dialogVisible = false;