Merge branch 'feat' into 'master'

src/views/template/editTemplate.vue

@@ -30,7 +30,7 @@
             ref="editor"
           >
             <!-- 新增三个按钮 -->
-            <div class="header-btnbox" v-if="!ShowPastData && !systemTemplate && !personalTemplate">
+            <div class="header-btnbox" v-if="!ShowPastData && !enterFromTemplate">
               <div class="header-btnbox__btn" @click="UpperChain">
                 <span> <i class="iconfont iconshanglian"></i> </span>上链
               </div>
@@ -301,8 +301,8 @@ export default class editTemplate extends Vue {
   public showUncertified: Boolean = false;
   public ClassificationPopups: boolean = false;
   public MemoryCardType: String = ""; //存证类型
-  public systemTemplate: number = 0; // 系统模板进入的模板 id
   public personalTemplate: number = 0; // 个人模版的 id
+  public enterFromTemplate: boolean = false;
   // 系统模板>建立个人模板or建立存证
   // 个人模板>建立存证or更新模板
   // 建立存证>保存存证or保存模板
@@ -320,12 +320,12 @@ export default class editTemplate extends Vue {
     // 取值
     const query = this.$route.query;
     if (query.personalTemplate) {
-      this.personalTemplate = Number(query.personalTemplate);
+      this.enterFromTemplate = true;
       this.gettemplate(query.personalTemplate);
       this.TemplateType = 1;
     } else if (query.systemTemplateId) {
       // 模板进入
-      this.systemTemplate = Number(query.systemTemplateId);
+      this.enterFromTemplate = true;
       this.gettemplate(query.systemTemplateId);
     } else if (query.personalTemplateId && !query.childId) {
       // 个人存证进入
@@ -381,13 +381,12 @@ export default class editTemplate extends Vue {
     });
     if (res) {
       this.$message({
-        message: "创建成功",
+        message: "保存成功",
         type: "success",
       });
-      this.$router.push({
-        path: "/categoryManage",
-        query: { type: "MyTemplate" },
-      });
+      this.ClassificationPopups = false;
+      this.TemplateType = 1;
+      this.personalTemplate = res.data.id;
     }
   }
   // 创建个人模板
@@ -402,7 +401,7 @@ export default class editTemplate extends Vue {
       type: "put",
       url: GO_URLS.updateCustomize,
       params: {
-        id: Number(this.$route.query.personalTemplate),
+        id: Number(this.$route.query.personalTemplate) || this.personalTemplate,
         name: this.templateName,
         detail: JSON.stringify(formatApiJson(this.rootUnitList)),
       },
@@ -412,10 +411,12 @@ export default class editTemplate extends Vue {
         message: "更新成功",
         type: "success",
       });
-      this.$router.push({
-        path: "/categoryManage",
-        query: { type: "MyTemplate" },
-      });
+      if (this.$route.query.personalTemplate) {
+        this.$router.push({
+          path: "/categoryManage",
+          query: { type: "MyTemplate" },
+        });
+      }
     }
   }
   // 获取基础信息