Merge branch 'develop' of http://39.108.227.113:8001/zhusen/order-erp-front into develop

sanmu
2 parents c8423c0f e9ee7ce8
Showing 2 changed files with 6 additions and 2 deletions
.vscode/settings.json
src/views/project/order/index.vue
@@ -91,7 +91,8 @@
     "editor.codeActionsOnSave": {
       "source.fixAll.eslint": "explicit",
       "source.fixAll.stylelint": "explicit"
-    }
+    },
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "i18n-ally.localesPaths": ["src/locales/lang"],
   "i18n-ally.keystyle": "nested",
@@ -102,7 +102,10 @@
         <a-button type="primary" @click="handleExportModal" v-if="role !== ROLE.INSPECT"
           >导出</a-button
         >
-        <a-button type="primary" @click="handleProfitModal" v-if="role === ROLE.ADMIN"
+        <a-button
+          type="primary"
+          @click="handleProfitModal"
+          v-if="role === ROLE.ADMIN || role === ROLE.BUSINESS"
           >分析利润</a-button
         >
         <a-button