Merge branch 'feature/4月-菜单和权限' into dev

menu-data/create-menu-json.js

@@ -54,7 +54,7 @@ function createMenuJson(data, parentCode) {
     const item = {
       menuName,
       menuCode: parentCode ? parentCode  + menuIndex : 'hb_m' + menuIndex,
-      parentCode,
+      parentCode: parentCode || '0',
       menuUrl,
       menuType: 0,
       iconUrl,
@@ -136,7 +136,7 @@ function createButtonJson(data, menuJson) {
         parentCode: menuCode,
         menuType: 5,
         isRight,
-        buttonType,
+        buttonType: buttonType == 1 ? 1 : 0,
         toUrl
       };
       result.push(item);

src/views/enterprise/salutatory.vue

@@ -57,7 +57,7 @@
             <template slot-scope="{ row }">{{ row.updateTime | formatTimeStamp }}</template>
           </el-table-column>
           <el-table-column prop="creatorName" label="创建人" width="120" show-overflow-tooltip> </el-table-column>
-          <el-table-column prop="operatorName" label="操作人" width="120" show-overflow-tooltip> </el-table-column>
+          <el-table-column prop="modifierName" label="操作人" width="120" show-overflow-tooltip> </el-table-column>
           <el-table-column prop="suitDepartmentName" label="适用范围" width="300">
             <template slot-scope="{ row }">
               <div v-if="row.defaultWelcomeFlag">