Merge branch 'feature/zl' into 'release'

add callback map

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!428

src/views/education/edit-manager.vue

@@ -1741,13 +1741,19 @@ export default {
       if (option == "edit" || option == "storageEdit") {
         notifyData.notifyId = this.formData.notifyId;
       }
+      // 中医项目
+      const projectType = vm.getUrlSearch(window.location.href, "projectType");
+      console.log('--projectType', projectType);
+      if(projectType == 5){
+        projectModel.projectType = 5;
+      }
       let postData = {
         projectModel: JSON.stringify(projectModel),
         attachmentModel: JSON.stringify(attachmentModel),
         attachmentPDFModel: JSON.stringify(attachmentPDFModel),
         notifyData: JSON.stringify(notifyData)
       };
-      //console.log(postData);
+      console.log('JSON.stringify(projectModel)', projectModel, attachmentModel, attachmentPDFModel, notifyData);
       openLoading(vm);
       vm.POST("portal/portalInfo/insertOrUpdate", postData).then(res => {
         closeLoading(vm);

src/views/education/item-manager.vue

@@ -213,7 +213,7 @@
       <el-dialog
         title="请选择项目类型"
         :visible.sync="centerDialogVisible"
-        width="600px"
+        width="750px"
         :close-on-click-modal="false"
         @close="handleTypeClose"
         center
@@ -675,14 +675,16 @@ export default {
     },
     //改变状态
     changeStatus(row, type) {
+      console.log('--row', row);
       let projectId = row.id;
       let level = row.level;
       if (type === 0) {
         this.updateItemManager(this.formInline);
         //编辑
-        if (row.projectType === 1) {
+        if (row.projectType === 1 || row.projectType === 5 ) {
+
           this.$router.push(
-            "edit-manager?projectType=1&projectId=" +
+            "edit-manager?projectType=" + row.projectType +"&projectId=" +
               projectId +
               "&level=" +
               level +