Merge branch 'master' of http://git.xinwangdao.com/china-resources-surgical/admin

src/App.vue

@@ -11,7 +11,6 @@
   import { AppProvider } from '/@/components/Application';
   import { useTitle } from '/@/hooks/web/useTitle';
   import { useLocale } from '/@/locales/useLocale';
-
   // support Multi-language
   const { getAntdLocale } = useLocale();
 

src/commonSchemaProperty/index.ts

@@ -5,13 +5,15 @@ import * as DistributorApi from '/@/api/system/distributorApi';
 import get from 'lodash.get';
 import * as HospitalApi from '/@/api/system/hospitalApi';
 import * as DoctorApi from '/@/api/system/doctorApi';
-
+import * as UserApi from '/@/api/system/userApi';
+import { StatusValEnum as DoctorStatusValEnum } from '/@/views/system/doctor/enum';
+import { StatusValEnum as UserStatusValEnum } from '/@/views/system/user/enum';
+import { RoleEnum } from '/@/views/system/role/enum';
 interface gerPropType {
   colProps?: any;
   onChange?: any;
 }
-
-export const getDistributorText = (text) => {
+const getDistributorText = (text) => {
   if (text === 0) {
     return '供应商创建';
   } else {
@@ -30,7 +32,9 @@ const getDistributorId = ({ colProps }) => {
       componentProps: {
         labelInValue: true,
         api: DistributorApi.all,
-        params: {},
+        params: {
+          status: UserStatusValEnum.PASSED,
+        },
         resultField: 'records',
         labelField: 'name',
         valueField: 'id',
@@ -99,7 +103,9 @@ const getDoctorId = ({ colProps }) => {
       componentProps: {
         labelInValue: true,
         api: DoctorApi.all,
-        params: {},
+        params: {
+          status: DoctorStatusValEnum.PASSED,
+        },
         resultField: 'records',
         labelField: 'name',
         valueField: 'id',
@@ -108,6 +114,7 @@ const getDoctorId = ({ colProps }) => {
         optionFilterProp: 'label',
         showSearch: true,
         disabled: true,
+        immediate: false,
       },
       colProps,
       component: 'ApiSelect',
@@ -124,16 +131,47 @@ const getHospitalIdAndDoctorId = ({ colProps }) => {
     getHospitalId({
       colProps,
       onChange: ({ formActionType, formModel, e }) => {
-        console.log('onChange', e);
         const { updateSchema } = formActionType;
-        updateSchema([
-          { field: 'doctorId', componentProps: { params: { hospitalId: e.value } } },
-          { field: 'doctorId', componentProps: { disabled: false } },
-        ]);
+        updateSchema([{ field: 'doctorId', componentProps: { params: { hospitalId: e.value, disabled: false } } }]);
         formModel.doctorId = undefined; //  清空医生
       },
     }),
     getDoctorId({ colProps }),
   ];
 };
-export { getDistributorId, getHospitalId, getDoctorId, getHospitalIdAndDoctorId };
+const getSaleUserId = ({ colProps }) => {
+  return {
+    field: 'saleUserId',
+    label: '业务员',
+    defaultValue: undefined,
+    form: {
+      itemProps: {
+        validateTrigger: 'blur',
+      },
+      componentProps: {
+        labelInValue: true,
+        api: UserApi.all,
+        params: {
+          role: RoleEnum.SALESMAN,
+          status: UserStatusValEnum.PASSED,
+        },
+        resultField: 'records',
+        labelField: 'realName',
+        valueField: 'id',
+        allowClear: false,
+        placeholder: '业务员',
+        optionFilterProp: 'label',
+        showSearch: true,
+      },
+      colProps,
+      component: 'ApiSelect',
+      rules: [{ required: true, type: 'object', message: '请选择业务员' }],
+    },
+    table: {
+      customRender: ({ record }) => {
+        return get(record, 'user.realName') || '（已删除/不存在）';
+      },
+    },
+  };
+};
+export { getDistributorText, getDistributorId, getHospitalId, getDoctorId, getHospitalIdAndDoctorId, getSaleUserId };

src/main.ts

@@ -17,14 +17,12 @@ import { registerGlobComp } from '/@/components/registerGlobComp';
 import Antd from 'ant-design-vue';
 import 'ant-design-vue/dist/antd.css';
 import 'dayjs/locale/zh-cn';
-
 // Importing on demand in local development will increase the number of browser requests by around 20%.
 // This may slow down the browser refresh speed.
 // Therefore, only enable on-demand importing in production environments .
 if (import.meta.env.DEV) {
   import('ant-design-vue/dist/antd.less');
 }
-
 async function bootstrap() {
   const app = createApp(App);
 

src/views/order/operation-order/drawer.vue

@@ -21,12 +21,13 @@
   import { useAsyncState } from '@vueuse/core';
   import * as OperationOrderApi from '/@/api/order/operationOrderApi';
   import { OperationOrder } from '/@/api/model/operationOrder';
-
+  import { useUserStore } from '/@/store/modules/user';
+  const userStore = useUserStore();
   const emit = defineEmits(['success', 'register']);
   const isUpdate = ref(true);
   const entityId = ref(0);
 
-  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
     labelWidth: 120,
     schemas: formSchema,
     showActionButtonGroup: false,

src/views/order/operation-order/schema.ts

@@ -9,7 +9,7 @@
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { useUserStore } from '/@/store/modules/user';
-import { getDistributorId, getDoctorId, getHospitalId, getHospitalIdAndDoctorId } from '/@/commonSchemaProperty';
+import { getDistributorId, getHospitalIdAndDoctorId, getSaleUserId } from '/@/commonSchemaProperty';
 
 export enum YesNoEnum {
   YES = '是',
@@ -89,20 +89,7 @@ export const schema = {
       table: {},
     },
     ...getHospitalIdAndDoctorId({ colProps }),
-    {
-      field: 'saleUserId',
-      label: '业务员id',
-      defaultValue: undefined,
-      form: {
-        componentProps: {
-          allowClear: true,
-          placeholder: '业务员id',
-        },
-        colProps,
-        component: 'InputNumber',
-      },
-      table: {},
-    },
+    getSaleUserId({ colProps }),
     {
       field: 'saleUserName',
       label: '业务员名称',
@@ -361,7 +348,7 @@ export const schema = {
     },
     {
       field: 'createTime',
-      label: 'CreateTime',
+      label: '创建时间',
       defaultValue: undefined,
       form: {
         colProps,
@@ -372,13 +359,13 @@ export const schema = {
           showTime: false,
         },
         component: 'RangePicker',
-        rules: [{ required: true, message: '请输入CreateTime！' }],
+        rules: [{ required: true, message: '请输入创建时间！' }],
       },
       table: {},
     },
     {
       field: 'updateTime',
-      label: 'UpdateTime',
+      label: '更新时间',
       defaultValue: undefined,
       form: {
         colProps,
@@ -389,7 +376,7 @@ export const schema = {
           showTime: false,
         },
         component: 'RangePicker',
-        rules: [{ required: true, message: '请输入UpdateTime！' }],
+        rules: [{ required: true, message: '请输入更新时间！' }],
       },
       table: {},
     },
@@ -414,17 +401,17 @@ const queryFields = [
   'receiveName',
   'receivePhone',
   'status',
-  'type',
+  // 'type',
   'remark',
-  'deleteStatus',
-  'editorId',
+  // 'deleteStatus',
+  // 'editorId',
   'editorName',
   'createTime',
   'updateTime',
 ];
 const editFields = [
-  'distributorId',
-  'orderSn',
+  // 'distributorId',
+  // 'orderSn',
   'productLineName',
   'hospitalId',
   'saleUserId',
@@ -440,9 +427,9 @@ const editFields = [
   'receivePhone',
   'address',
   'status',
-  'type',
+  // 'type',
   'remark',
-  'deleteStatus',
+  // 'deleteStatus',
 ];
 const tableFields = [
   'id',
@@ -463,9 +450,9 @@ const tableFields = [
   'receivePhone',
   'address',
   'status',
-  'type',
+  // 'type',
   'remark',
-  'deleteStatus',
+  // 'deleteStatus',
   'editorId',
   'editorName',
   'createTime',
@@ -490,9 +477,9 @@ const descriptionFields = [
   'receivePhone',
   'address',
   'status',
-  'type',
+  // 'type',
   'remark',
-  'deleteStatus',
+  // 'deleteStatus',
   'editorId',
   'editorName',
   'createTime',

src/views/system/doctor/detail.vue

@@ -68,10 +68,10 @@
     isShowHandleReject,
     isShowHandleDelete,
     getVerifyParams,
-    StatusValEnum,
   } from './schema';
+  import { StatusValEnum } from './enum';
   import DoctorDrawer from './drawer.vue';
-  import { onMounted, computed, ref, reactive, toRef } from 'vue';
+  import { onMounted, computed, ref, reactive } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
   import { ComputedRef } from '@vue/reactivity';
   import { Descriptions, Card } from 'ant-design-vue';

src/views/system/doctor/drawer.vue

@@ -16,7 +16,8 @@
 <script lang="ts" setup name="DoctorDrawer">
   import { defineEmits, ref, computed, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { formSchema, StatusValEnum } from './schema';
+  import { formSchema } from './schema';
+  import { StatusValEnum } from './enum';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import * as DoctorApi from '/@/api/system/doctorApi';
   import { useAsyncState } from '@vueuse/core';

src/views/system/doctor/enum.ts

+export enum StatusValEnum {
+  PENDING_REVIEW = 'PENDING_REVIEW',
+  PASSED = 'PASSED',
+  REJECT = 'REJECT',
+  FORBIDDEN = 'FORBIDDEN',
+}

src/views/system/doctor/schema.ts

@@ -5,14 +5,14 @@
  * @Author: xiongwei
  * @Date: 2022-06-28 11:50:00
  */
-
+import { getDistributorId, getHospitalId } from '/@/commonSchemaProperty';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import { getDistributorId, getHospitalId } from '/@/commonSchemaProperty';
 import { usePermission } from '/@/hooks/web/usePermission';
 import { BatchVerifyParams } from '/@/api/model/doctor';
 import { useUserStore } from '/@/store/modules/user';
 import { phoneRule } from '/@/commonSchemaProperty/formRules';
+import { StatusValEnum } from './enum';
 const userStore = useUserStore();
 const { hasPermission } = usePermission();
 export enum SexEnum {
@@ -38,12 +38,6 @@ export enum StatusColorEnum {
   REJECT = 'error',
   FORBIDDEN = 'default',
 }
-export enum StatusValEnum {
-  PENDING_REVIEW = 'PENDING_REVIEW',
-  PASSED = 'PASSED',
-  REJECT = 'REJECT',
-  FORBIDDEN = 'FORBIDDEN',
-}
 
 export const isShowHandlePassed = (status: string): boolean => {
   return (

src/views/system/receiver/detail.vue

@@ -63,6 +63,7 @@
   </div>
 </template>
 <script lang="ts" setup name="DeviceDetail">
+  import { StatusValEnum } from './enum';
   import { ImagePreview } from '/@/components/Preview/index';
   import { Icon } from '/@/components/Icon';
   import {
@@ -72,7 +73,6 @@
     isShowHandleReject,
     isShowHandleDelete,
     getVerifyParams,
-    StatusValEnum,
   } from './schema';
   import ReceiverDrawer from './drawer.vue';
   import { onMounted, computed, ref, reactive } from 'vue';

src/views/system/receiver/drawer.vue

@@ -16,12 +16,12 @@
 <script lang="ts" setup name="ReceiverDrawer">
   import { defineEmits, ref, computed, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { formSchema, StatusValEnum } from './schema';
+  import { formSchema } from './schema';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import * as ReceiverApi from '/@/api/system/receiverApi';
   import { useAsyncState } from '@vueuse/core';
   import { Receiver } from '/@/api/model/receiver';
-
+  import { StatusValEnum } from './enum';
   const emit = defineEmits(['success', 'register']);
   const isUpdate = ref(true);
   const entityId = ref(0);

src/views/system/receiver/enum.ts

+export enum StatusValEnum {
+  PENDING_REVIEW = 'PENDING_REVIEW',
+  PASSED = 'PASSED',
+  REJECT = 'REJECT',
+  FORBIDDEN = 'FORBIDDEN',
+}

src/views/system/receiver/index.vue

@@ -117,6 +117,7 @@
   import componentSetting from '/@/settings/componentSetting';
   import ReceiverDrawer from './drawer.vue';
   import { columns, searchFormSchema } from './schema';
+  import { StatusValEnum } from './enum';
   import {
     isShowHandleEdit,
     isShowHandlePassed,
@@ -124,7 +125,6 @@
     isShowHandleReject,
     isShowHandleDelete,
     getVerifyParams,
-    StatusValEnum,
     StatusColorEnum,
     StatusEnum,
   } from './schema';

src/views/system/receiver/schema.ts

@@ -14,6 +14,7 @@ import { usePermission } from '/@/hooks/web/usePermission';
 import { BatchVerifyParams } from '/@/api/model/receiver';
 import { useUserStore } from '/@/store/modules/user';
 import { phoneRule } from '/@/commonSchemaProperty/formRules';
+import { StatusValEnum } from './enum';
 const { hasPermission } = usePermission();
 const userStore = useUserStore();
 export enum YesNoEnum {
@@ -40,12 +41,6 @@ export enum StatusColorEnum {
   REJECT = 'error',
   FORBIDDEN = 'default',
 }
-export enum StatusValEnum {
-  PENDING_REVIEW = 'PENDING_REVIEW',
-  PASSED = 'PASSED',
-  REJECT = 'REJECT',
-  FORBIDDEN = 'FORBIDDEN',
-}
 
 export const StatusOptions: any[] = [];
 for (const key in StatusEnum) {

src/views/system/role/enum.ts

+export enum RoleEnum {
+  SALESMAN = 'salesman',
+}

src/views/system/user/drawer.vue

@@ -16,7 +16,8 @@
 <script lang="ts" setup name="UserDrawer">
   import { defineEmits, ref, computed, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { formSchema, StatusValEnum, PASSWORD } from './schema';
+  import { formSchema, PASSWORD } from './schema';
+  import { StatusValEnum } from './enum';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import * as UserApi from '/@/api/system/userApi';
   import { useAsyncState } from '@vueuse/core';

src/views/system/user/enum.ts

+export enum StatusValEnum {
+  PENDING_REVIEW = 'PENDING_REVIEW',
+  PASSED = 'PASSED',
+  REJECT = 'REJECT',
+  FORBIDDEN = 'FORBIDDEN',
+}

src/views/system/user/index.vue

@@ -96,6 +96,7 @@
   </div>
 </template>
 <script lang="ts" setup name="AUTH_SYSTEM_USER">
+  import { StatusValEnum } from './enum';
   import {
     isShowHandleEdit,
     isShowHandlePassed,
@@ -103,7 +104,6 @@
     isShowHandleReject,
     isShowHandleDelete,
     getVerifyParams,
-    StatusValEnum,
     StatusColorEnum,
     StatusEnum,
     BatchVerifyParams,

src/views/system/user/schema.ts

@@ -12,6 +12,7 @@ import * as RoleApi from '/@/api/system/roleApi';
 import { getDistributorId } from '/@/commonSchemaProperty';
 import { usePermission } from '/@/hooks/web/usePermission';
 import { phoneRule } from '/@/commonSchemaProperty/formRules';
+import { StatusValEnum } from './enum';
 const { hasPermission } = usePermission();
 export interface BatchVerifyParams {
   /**
@@ -57,12 +58,6 @@ export enum StatusColorEnum {
   REJECT = 'error',
   FORBIDDEN = 'default',
 }
-export enum StatusValEnum {
-  PENDING_REVIEW = 'PENDING_REVIEW',
-  PASSED = 'PASSED',
-  REJECT = 'REJECT',
-  FORBIDDEN = 'FORBIDDEN',
-}
 
 export const isShowHandlePassed = (status: string): boolean => {
   return (