yangzhijie пре 4 година
родитељ
комит
aee2423d2c
2 измењених фајлова са 29 додато и 23 уклоњено
  1. 26 21
      src/trace/ProjectArchive.vue
  2. 3 2
      src/widget/GanttScale2.vue

+ 26 - 21
src/trace/ProjectArchive.vue

@@ -251,7 +251,7 @@
 
     <div>
       <Modal
-        ref="modal1"
+        v-model:show="modal1"
         :small="true"
         :show-ok-button="true"
         :show-canel-button="true"
@@ -271,7 +271,7 @@
       </Modal>
 
       <Modal
-        ref="modal4"
+        v-model:show="modal4"
         :small="true"
         :show-ok-button="true"
         :show-canel-button="true"
@@ -298,7 +298,7 @@
 
       <!-- 是否删除文件夹 -->
       <Modal
-        ref="modal5"
+        v-model:show="modal5"
         :small="true"
         :show-ok-button="true"
         :show-canel-button="true"
@@ -312,7 +312,7 @@
       </Modal>
       <!-- 是否删除归档项 -->
       <Modal
-        ref="modal6"
+        v-model:show="modal6"
         :small="true"
         :show-ok-button="true"
         :show-canel-button="true"
@@ -331,7 +331,7 @@
         描述:归档项新增和修改
       -->
       <Modal
-        ref="modal2"
+        v-model:show="modal2"
         :small="true"
         :show-ok-button="true"
         :show-canel-button="true"
@@ -460,6 +460,11 @@ export default {
       parentProjectArchiveFolderId: undefined, //上级文件夹Id
       data: undefined,
       loading: false,
+      modal1:false,
+      modal2:false,
+      modal4:false,
+      modal5:false,
+      modal6:false,
     };
   },
   watch: {
@@ -492,7 +497,7 @@ export default {
      */
     cleanFile: function (item) {
       var _self = this;
-      _self.$refs.modal2.show = false;
+      _self.modal2 = false;
       if (item.id != undefined) {
         $.ajax({
           url: Common.getApiURL('ProjectArchivesResource/cleanFile'),
@@ -556,21 +561,21 @@ export default {
      */
     cancel: function () {
       var _self = this;
-      _self.$refs.modal1.show = false;
+      _self.modal1 = false;
     },
     /**
      * 归档项取消
      */
     cancel1: function () {
       var _self = this;
-      _self.$refs.modal2.show = false;
+      _self.modal2 = false;
     },
     /**
      * 修改文件夹取消
      */
     cancel2: function () {
       var _self = this;
-      _self.$refs.modal4.show = false;
+      _self.modal4 = false;
     },
     /**
      * 打开新建文件夹弹窗
@@ -578,7 +583,7 @@ export default {
     openFolder: function () {
       var _self = this;
       _self.type = '新建';
-      _self.$refs.modal1.show = true;
+      _self.modal1 = true;
       _self.folderName = undefined;
     },
     /**
@@ -591,7 +596,7 @@ export default {
         Notify.error('提示', '请先选择文件夹', false);
         return;
       }
-      _self.$refs.modal2.show = true;
+      _self.modal2 = true;
       _self.cleanProjectArchivesDto();
     },
     /**
@@ -604,7 +609,7 @@ export default {
         Notify.error('提示', '请先选择归档项', false);
         return;
       }
-      _self.$refs.modal2.show = true;
+      _self.modal2 = true;
     },
     /**
      * 打开修改文件夹弹窗
@@ -616,7 +621,7 @@ export default {
         Notify.error('提示', '请先选择要修改的文件夹', false);
         return;
       }
-      _self.$refs.modal4.show = true;
+      _self.modal4 = true;
       _self.loadProjectFolder();
     },
     /**
@@ -671,7 +676,7 @@ export default {
      */
     saveProjectArchiveFolder: function () {
       var _self = this;
-      _self.$refs.modal1.show = false;
+      _self.modal1 = false;
       var projectItemFolder = {
         projectItemId: _self.projectId,
         name: _self.folderName,
@@ -702,7 +707,7 @@ export default {
      */
     updateProjectArchiveFolder: function () {
       var _self = this;
-      _self.$refs.modal4.show = false;
+      _self.modal4 = false;
       var projectItemFolder = {
         projectItemId: _self.projectId,
         name: _self.folderName,
@@ -758,7 +763,7 @@ export default {
      */
     saveProjectArchives: function () {
       var _self = this;
-      _self.$refs.modal2.show = false;
+      _self.modal2 = false;
       $.ajax({
         url: Common.getApiURL('ProjectArchivesResource/saveProjectArchives'),
         type: 'post',
@@ -898,7 +903,7 @@ export default {
         Notify.error('提示', '请选择要删除的文件夹!');
         return;
       }
-      _self.$refs.modal5.show = true;
+      _self.modal5 = true;
       _self.parentProjectArchiveFolderId = undefined;
     },
     /**
@@ -907,7 +912,7 @@ export default {
      */
     cancelFolder: function () {
       var _self = this;
-      _self.$refs.modal5.show = false;
+      _self.modal5 = false;
     },
     /**
      * 打开删除归档项提示
@@ -919,7 +924,7 @@ export default {
         Notify.error('提示', '请选择要删除的归档项!');
         return;
       }
-      _self.$refs.modal6.show = true;
+      _self.modal6 = true;
     },
     /**
      * 关闭删除文件提示
@@ -927,7 +932,7 @@ export default {
      */
     cancelProject: function () {
       var _self = this;
-      _self.$refs.modal6.show = false;
+      _self.modal6 = false;
     },
     /**
      * 删除文件夹
@@ -935,7 +940,7 @@ export default {
      */
     deleteFolder: function () {
       var _self = this;
-      _self.$refs.modal5.show = false;
+      _self.modal5 = false;
       $.ajax({
         url: Common.getApiURL(
           'ProjectArchiveFolderResource/deleteProjectArchiveFolder',

+ 3 - 2
src/widget/GanttScale2.vue

@@ -21,7 +21,7 @@
       <!-- 			<div id="output">
 				选择的网站是: {{selected}}
 			</div> -->
-      <Modal ref="create" large="true" @cancel="$refs.create.show = false" @ok="importTest">
+      <Modal v-model:show="create" large="true" @cancel="$refs.create.show = false" @ok="importTest">
         <template #header>
           选择模板进行导入
         </template>
@@ -68,6 +68,7 @@ module.exports = {
       templates: [],
       selected: '', //select选中的值
       canEdit:false, //是否可以编辑甘特图
+      create: false,
     };
   },
 
@@ -85,7 +86,7 @@ module.exports = {
       }
     },
     importTemplate: function() {
-      this.$refs.create.show = true;
+      this.create = true;
 
     },
     /**