Merge branch 'dev_wcy' of gitlab.33.cn:zl/source-trace-manage-go into dev_wcy

src/components/category/ProductList.vue

@@ -973,4 +973,4 @@ export default {
     max-height: none;
   }
 }
-</style>
+</style>
\ No newline at end of file

src/config/UrlPrefix.js

@@ -2,7 +2,7 @@ const configModules = {
   // 溯源>测试环境
   "sy_test": {
     CHAIN_BROWSER_URL_PREFIX: 'http://120.26.174.69:9032/',
-    INERFACE_URL_PREFIX: 'http://172.16.101.87:46789',
+    INERFACE_URL_PREFIX: 'http://172.16.101.87:46790',
     /**
      * 网站入口配置
      */

src/views/template/editTemplate.vue

@@ -285,7 +285,7 @@ export default class editTemplate extends Vue {
   public isShowBar: boolean = false; // 展开右栏
   public isShowBanner = false; //banner图组件显示or隐藏
   public SelectTemplateShow: Boolean = false; // 选择模板显示or隐藏
-  public personalTemplateId: number = 0; //个人存证id
+  public personalTemplateId: string = ''; //个人存证id
   public saveState: Number = 0; // 保存存证需要的状态
   public ShowPastData: Boolean = false; // 显示过往数据
   public isShowToChainDialog: Boolean = false; //控制上链弹窗显示or隐藏
@@ -296,8 +296,8 @@ export default class editTemplate extends Vue {
   public isModifyTitleShow: Boolean = false; //修改标题
   public modifyFormsShow: Boolean = false; // 改变表现形式
   public existingEvidenceList: any = []; //增量数据列表
-  public checkId: number = -1;
-  public incrementId: number = 0;
+  public checkId: string = '';
+  public incrementId: string = '';
   public isShowAddRootDialog: boolean = false;
   public displayData: any = [];
   public TemplateType: number = 0;
@@ -332,8 +332,8 @@ export default class editTemplate extends Vue {
       this.gettemplate(query.systemTemplateId);
     } else if (query.personalTemplateId && !query.childId) {
       // 个人存证进入
-      this.personalTemplateId = Number(query.personalTemplateId);
-      this.checkId = Number(query.personalTemplateId);
+      this.personalTemplateId = String(query.personalTemplateId);
+      this.checkId = String(query.personalTemplateId);
       this.information(3);
       this.saveState = 1;
       // 父存证>进入页面>获取数据>根据参数决定是否调用增量列表接口
@@ -342,9 +342,9 @@ export default class editTemplate extends Vue {
       query.childId &&
       query.personalTemplateName
     ) {
-      this.personalTemplateId = Number(query.personalTemplateId);
-      this.checkId = Number(query.childId);
-      this.incrementId = Number(query.childId);
+      this.personalTemplateId = String(query.personalTemplateId);
+      this.checkId = String(query.childId);
+      this.incrementId = String(query.childId);
       this.saveState = 2;
       this.information(1);
     }
@@ -469,7 +469,7 @@ export default class editTemplate extends Vue {
     }
   }
   // 获取增量的数据
-  public async getincrement(id: number) {
+  public async getincrement(id: string) {
     const res = await this.$ajax({
       type: "get",
       url: GO_URLS.incrementId + `/` + id,
@@ -638,7 +638,7 @@ export default class editTemplate extends Vue {
       type: "put",
       url: GO_URLS.update,
       params: {
-        id: Number(this.$route.query.personalTemplateId),
+        id: this.$route.query.personalTemplateId,
         name: this.templateName,
         detail: JSON.stringify(newDetail),
         note: this.localData,
@@ -775,13 +775,13 @@ export default class editTemplate extends Vue {
       child.startEdit();
       this.displayData = [];
       this.incrementId = item.id;
-      this.personalTemplateId = 0;
+      this.personalTemplateId = '';
       this.getincrement(item.id);
       this.saveState = 2;
     } else {
       // 切换至第一条数据
       this.personalTemplateId = item.id;
-      this.incrementId = 0;
+      this.incrementId = '';
       this.ShowPastData = true;
       this.saveState = 1;
       this.information(2);
@@ -824,7 +824,7 @@ export default class editTemplate extends Vue {
   }
   // 上链请求
   async uploadConfirm() {
-    this.incrementId === 0
+    this.incrementId === ''
       ? this.witnessTheChain()
       : this.incrementWitnessTheChain();
   }