1.生成科拖货时间修改为生产科拖货时间 2.跟单员只能看到客户单价和客户总金额

zhongnanhuang
1 parent edb42970
Showing 5 changed files with 41 additions and 23 deletions
.husky/commit-msg
.husky/common.sh
.vscode/settings.json
src/views/project/order/ProfitAnalysis.vue
src/views/project/order/tableData.tsx
-#!/bin/sh
+# #!/bin/sh
-# shellcheck source=./_/husky.sh
-. "$(dirname "$0")/_/husky.sh"
+# # shellcheck source=./_/husky.sh
+# . "$(dirname "$0")/_/husky.sh"
-PATH="/usr/local/bin:$PATH"
+# PATH="/usr/local/bin:$PATH"
-npx --no-install commitlint --edit "$1"
+# npx --no-install commitlint --edit "$1"
-#!/bin/sh
-command_exists () {
-  command -v "$1" >/dev/null 2>&1
-}
+# #!/bin/sh
+# command_exists () {
+#   command -v "$1" >/dev/null 2>&1
+# }
-# Workaround for Windows 10, Git Bash and Yarn
-if command_exists winpty && test -t 1; then
-  exec < /dev/tty
-fi
+# # Workaround for Windows 10, Git Bash and Yarn
+# if command_exists winpty && test -t 1; then
+#   exec < /dev/tty
+# fi
@@ -84,13 +84,13 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.fixAll.stylelint": true
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll.stylelint": "explicit"
   },
   "[vue]": {
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true,
-      "source.fixAll.stylelint": true
+      "source.fixAll.eslint": "explicit",
+      "source.fixAll.stylelint": "explicit"
     }
   },
   "i18n-ally.localesPaths": ["src/locales/lang"],
@@ -55,6 +55,7 @@
   import { useOrderStoreWithOut } from '/@/store/modules/order';
   import { getList } from '/@/api/sys/config';
   import { useOrderInfo } from '/@/hooks/component/order';
+  import { useUserStoreWithOut } from '/@/store/modules/user';
   export default defineComponent({
     components: { BasicModal, Description, Select, Space },
@@ -89,10 +90,12 @@
         {
           field: 'productionDepartmentTotalPrice',
           label: '包装费用',
+          show: isTracker,
         },
         {
           field: 'profitRate',
           label: '总利润率',
+          show: isTracker,
         },
       ];
@@ -102,6 +105,21 @@
           redoModalHeight();
         },
       );
+      const userStore = useUserStoreWithOut();
+      const user = userStore.getUserInfo;
+      const role = computed(() => {
+        return user?.roleSmallVO?.code;
+      });
+
+      /**
+       * 检查当前角色是否是跟单员
+       */
+      function isTracker() {
+        if (role.value === 'tracker_user') {
+          return false;
+        }
+        return true;
+      }
       function handleShow(visible: boolean) {
         if (visible) {
@@ -239,7 +239,7 @@ export const ORDER_LIST_PROFIT_FIELDS = [
         },
       },
       {
-        title: '生成科单价',
+        title: '生产科单价',
         width: 150,
         dataIndex: 'productionDepartmentPrice',
         customRender: (column) => {
@@ -250,7 +250,7 @@ export const ORDER_LIST_PROFIT_FIELDS = [
         },
       },
       {
-        title: '生成科总价',
+        title: '生产科总价',
         width: 150,
         dataIndex: 'productionDepartmentTotalPrice',
         customRender: (column) => {
@@ -725,7 +725,7 @@ export const FIELDS_BASE_INFO = [
     field: 'productionDepartmentConsignTime',
     component: 'DatePicker',
     labelWidth: 150,
-    label: '生成科拖货时间',
+    label: '生产科拖货时间',
     rules: [{ required: true }],
   },
   {
@@ -970,13 +970,13 @@ export const FIELDS_PROFIT_INFO = [
   {
     field: 'productionDepartmentPrice',
     component: 'InputNumber',
-    label: '生成科单价',
+    label: '生产科单价',
     rules: [{ required: true }],
   },
   {
     field: 'productionDepartmentCurrency',
     component: 'Select',
-    label: '生成科货币单位',
+    label: '生产科货币单位',
     rules: [{ required: true }],
     componentProps: {
       options: [
@@ -988,7 +988,7 @@ export const FIELDS_PROFIT_INFO = [
   // {
   //   field: 'productionDepartmentPrice',
   //   component: 'InputNumber',
-  //   label: '生成科总价￥',
+  //   label: '生产科总价￥',
   //   rules: [{ required: true }],
   // },
   {