Browse Source

代码比较

zhangqiOMG 2 years ago
parent
commit
31618004a3

+ 4 - 4
src/HManagement/archvies_mag/modules/modifyLocation.vue

@@ -19,7 +19,7 @@
     </el-alert>
     <div slot="footer" class="dialog-footer">
       <el-button @click="dialogTreeVisible = false" size="small">取 消</el-button>
-      <el-button type="primary" @click="changeAttachment"  size="small">确 定</el-button>
+      <el-button type="primary" @click="changeAttachment"  :disabled="errormsg" size="small">确 定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -71,14 +71,14 @@ export default {
       })
     },
     async handleNodeClick (val) {
-      if (this.checklist[0].attachmentid !== val.attachmentid) {
-        // alert('不能将文件移动到自身或其子文件夹下')
-        await this.queryAttachment(val.attachmentid)
+      if (this.checklist[0].attachmentid !== val.attachmentid) {        
         this.activeid = val.attachmentid
         this.errormsg = false
       } else {
         this.errormsg = true
       }
+      await this.queryAttachment(val.attachmentid)
+      
     },
     loadNode(node, resolve) {
       if (node.level === 0) {

+ 3 - 4
src/views/mediaStock/modules/modifyLocation.vue

@@ -19,7 +19,7 @@
     </el-alert>
     <div slot="footer" class="dialog-footer">
       <el-button @click="dialogTreeVisible = false" size="small">取 消</el-button>
-      <el-button type="primary" @click="changeAttachment"  size="small">确 定</el-button>
+      <el-button type="primary" @click="changeAttachment" :disabled="errormsg" size="small">确 定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -71,14 +71,13 @@ export default {
       })
     },
     async handleNodeClick (val) {
-      if (this.checklist[0].attachmentid !== val.attachmentid) {
-        // alert('不能将文件移动到自身或其子文件夹下')
-        await this.queryAttachment(val.attachmentid)
+      if (this.checklist[0].attachmentid !== val.attachmentid) {        
         this.activeid = val.attachmentid
         this.errormsg = false
       } else {
         this.errormsg = true
       }
+      await this.queryAttachment(val.attachmentid)
     },
     loadNode(node, resolve) {
       if (node.level === 0) {