Merge remote-tracking branch 'origin/master'

src/views/manager/contractinfo/detail.vue

@@ -1006,6 +1006,7 @@ export default {
       this.pid = this.$route.query.pid;
       this.cid = this.$route.query.cid;
       this.contractForm.contractType=this.$route.query.contractType
+      await  this.getContractTypeList();//获取合同类型
       if (!this.cid) {
         this.contractForm.pid = this.pid;
       } else {
@@ -1021,7 +1022,7 @@ export default {
         console.log(this.$route.query.type);
         this.activeType = this.$route.query.type;
       }
-      this.getContractTypeList();//获取合同类型
+     
       this.getStoragePeriodList();//获取业务字典
       this.getSecurityLevelList();//获取安全等级
       this.setHeaders();