Преглед на файлове

修改 平安期货 业务账号

huangbin преди 4 години
родител
ревизия
a63cd98c5c

Файловите разлики са ограничени, защото са твърде много
+ 608 - 448
src/assets/styles/index.css


+ 4 - 0
src/assets/styles/mixin.less

@@ -2125,6 +2125,10 @@ select:-webkit-autofill,
     -webkit-text-fill-color: @m-white1;
 }
 
+.dialogSpan {
+    color: @m-white1;
+}
+
 input:-internal-autofill-selected {
     background-color: @m-grey21  !important;
 }

+ 5 - 0
src/common/config/projectName.ts

@@ -16,3 +16,8 @@ export function getOem(): OemType {
 export function isOemByEnum(type: OemType): boolean {
     return getOem() === type
 }
+
+// 是否是平安项目
+export function isPingAnOem() {
+    return isOemByEnum(OemType.pingan)
+}

+ 10 - 1
src/views/information/account_info/compoments/add-business/index.vue

@@ -21,8 +21,11 @@
         <a-col :span="12">
           <a-form-item label="账户角色"
                        name="roleids">
+            <span v-if="isPingAnOem()"
+                  class="dialogSpan">业务员</span>
             <a-checkbox-group class="commonCheckboxGroup"
-                              v-model:value="formState.roleids">
+                              v-model:value="formState.roleids"
+                              v-else>
               <a-row>
                 <a-col :span="12">
                   <a-checkbox :value="22">业务员</a-checkbox>
@@ -85,6 +88,7 @@ import { loginAccountOperate } from '@/services/proto/accountinfo';
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
+import { isPingAnOem } from '@/common/config/projectName';
 
 export default defineComponent({
     name: 'add-business-info',
@@ -102,6 +106,10 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const { rules, formState, formRef, initFormData } = handleBusinessForm();
         formState.roleids = [props.selectedRow.roleid];
+        // 平安项目
+        if (isPingAnOem()) {
+            formState.roleids = [22];
+        }
         function submit() {
             validateAction<BusinessFormState>(formRef, formState).then((param) => {
                 const reqParam = {
@@ -126,6 +134,7 @@ export default defineComponent({
             closeAction,
             submit,
             loading,
+            isPingAnOem,
         };
     },
 });

+ 5 - 0
src/views/information/account_info/compoments/detail-commom-business/index.vue

@@ -2,7 +2,10 @@
   <!-- 账户角色-->
   <Des :list="desList"
        :slotDesName="'账户角色'">
+    <span v-if="isPingAnOem()"
+          class="dialogSpan">业务员</span>
     <a-checkbox-group class="commonCheckboxGroup"
+                      v-else
                       v-model:value="selectedRole">
       <a-row>
         <a-col :span="12"
@@ -23,6 +26,7 @@ import { defineComponent, PropType, watchEffect } from 'vue';
 import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
 import { Des, handleDesList } from '@/common/components/commonDes';
 import { handleRoles } from '../setup';
+import { isPingAnOem } from '@/common/config/projectName';
 
 export default defineComponent({
     name: 'business-comom-detail',
@@ -55,6 +59,7 @@ export default defineComponent({
             roleTypeList,
             selectedRole,
             desList,
+            isPingAnOem,
         };
     },
 });

+ 10 - 1
src/views/information/account_info/compoments/modify-business/index.vue

@@ -21,8 +21,11 @@
         <a-col :span="12">
           <a-form-item label="账户角色"
                        name="roleids">
+            <span v-if="isPingAnOem()"
+                  class="dialogSpan">业务员</span>
             <a-checkbox-group class="commonCheckboxGroup"
-                              v-model:value="formState.roleids">
+                              v-model:value="formState.roleids"
+                              v-else>
               <a-row>
                 <a-col :span="12">
                   <a-checkbox :value="22">业务员</a-checkbox>
@@ -78,6 +81,7 @@ import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
 import { getUserId } from '@/services/bus/account';
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
+import { isPingAnOem } from '@/common/config/projectName';
 
 export default defineComponent({
     name: 'account_info_business_btn_modify',
@@ -97,6 +101,10 @@ export default defineComponent({
         mergeTwoObj(formState, props.selectedRow);
         // roletype	:string;//角色类型(逗号隔开,如22,23), 22:业务员 23:跟单员 24:交易员
         formState.roleids = props.selectedRow.roletype.split(',').map((e) => +e);
+        // 平安项目
+        if (isPingAnOem()) {
+            formState.roleids = [22];
+        }
         function submit() {
             validateAction<BusinessFormState>(formRef, formState).then((param) => {
                 const name = param.loginname;
@@ -125,6 +133,7 @@ export default defineComponent({
             cancel,
             submit,
             loading,
+            isPingAnOem,
         };
     },
 });

+ 3 - 4
src/views/information/custom/compoments/add/index.vue

@@ -6,7 +6,7 @@
            @cancel="cancel"
            centered
            :maskClosable="false"
-           v-if="isOemByEnum(OemType.pingan)"
+           v-if="isPingAnOem()"
            width="890px">
     <template #footer>
       <a-button key="submit"
@@ -361,7 +361,7 @@ import { getUploadImg } from '@/common/setup/upload';
 import { addCustomerInfoOperate } from '@/services/proto/accountinfo';
 import { CustomerInfoOperateReq } from '@/services/proto/accountinfo/interface';
 import { getAreaUserId } from '@/services/bus/user';
-import { isOemByEnum, OemType } from '@/common/config/projectName';
+import { isPingAnOem } from '@/common/config/projectName';
 
 export default defineComponent({
     name: 'add-custom',
@@ -440,8 +440,7 @@ export default defineComponent({
             attachmentUpLoad,
             cardbackphotourlUpLoad,
             cardfrontphotourlUpLoad,
-            isOemByEnum,
-            OemType,
+            isPingAnOem,
         };
     },
 });

+ 2 - 2
src/views/information/custom/compoments/common-detail/index.vue

@@ -21,7 +21,7 @@ import { formatValue } from '@/common/methods';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import { Des, DescriptionsList, handleDesList } from '@/common/components/commonDes';
 import { handlePreviewImg } from '@/common/setup/upload';
-import { isOemByEnum, OemType } from '@/common/config/projectName';
+import { isPingAnOem } from '@/common/config/projectName';
 
 export default defineComponent({
     name: 'custom-detail-desc',
@@ -58,7 +58,7 @@ export default defineComponent({
         watchEffect(() => {
             // if (props.selectedRow.customername) {
             const data = props.selectedRow;
-            if (isOemByEnum(OemType.pingan)) {
+            if (isPingAnOem()) {
                 const person = [
                     { label: '客户类型', value: '个人' },
                     { label: '姓名', value: formatValue(data.username) },

+ 3 - 4
src/views/information/warehouse-info/compoments/add/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 平安 新增仓库信息 -->
-  <a-modal v-if="isOemByEnum(OemType.pingan)"
+  <a-modal v-if="isPingAnOem()"
            class="add-warehouse commonModal"
            title="新增仓库信息"
            v-model:visible="visible"
@@ -197,7 +197,7 @@ import { getWarehouseTypeEnumList } from '@/common/constants/enumsList';
 import { addWarehouseApply } from '@/services/proto/warehouse';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { validateAction } from '@/common/setup/form';
-import { isOemByEnum, OemType } from '@/common/config/projectName';
+import { isPingAnOem } from '@/common/config/projectName';
 
 export default defineComponent({
     name: 'warehouse_info_btn_add',
@@ -250,8 +250,7 @@ export default defineComponent({
             formState,
             rules,
             warehouseType,
-            isOemByEnum,
-            OemType,
+            isPingAnOem,
         };
     },
 });

+ 3 - 4
src/views/information/warehouse-info/compoments/detail/index.vue

@@ -41,7 +41,7 @@
         </a-col>
 
       </a-row>
-      <template v-if="!isOemByEnum(OemType.pingan)">
+      <template v-if="!isPingAnOem()">
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="联系电话">
@@ -80,7 +80,7 @@ import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface
 import { gerWareHouseStatusName, getAddressInfo, getWareHouseTypeName } from '@/views/information/warehouse-info/setup';
 import { formatValue } from '@/common/methods';
 import { getAddress } from '@/services/go/adress';
-import { isOemByEnum, OemType } from '@/common/config/projectName';
+import { isPingAnOem } from '@/common/config/projectName';
 
 export default defineComponent({
     name: 'warehouse_info_btn-detail',
@@ -112,8 +112,7 @@ export default defineComponent({
             getProvinceName,
             getCityName,
             getDistrictName,
-            isOemByEnum,
-            OemType,
+            isPingAnOem,
         };
     },
 });

+ 3 - 4
src/views/information/warehouse-info/compoments/disable/index.vue

@@ -46,7 +46,7 @@
         </a-col>
 
       </a-row>
-      <template v-if="!isOemByEnum(OemType.pingan)">
+      <template v-if="!isOemByEnum()">
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="联系电话">
@@ -88,7 +88,7 @@ import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo
 import { getSelectedAccountId } from '@/services/bus/account';
 import { WarehouseStateChangeReq } from '@/services/proto/warehouse/interface';
 import { warehouseStateChangeReq } from '@/services/proto/warehouse';
-import { isOemByEnum, OemType } from '@/common/config/projectName';
+import { isPingAnOem } from '@/common/config/projectName';
 
 export default defineComponent({
     name: 'warehouse_info_btn_disable',
@@ -135,8 +135,7 @@ export default defineComponent({
             gerWareHouseStatusName,
             getWareHouseTypeName,
             formatValue,
-            isOemByEnum,
-            OemType,
+            isPingAnOem,
         };
     },
 });

+ 3 - 4
src/views/information/warehouse-info/compoments/recover/index.vue

@@ -46,7 +46,7 @@
         </a-col>
 
       </a-row>
-      <template v-if="!isOemByEnum(OemType.pingan)">
+      <template v-if="!isPingAnOem()">
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="联系电话">
@@ -88,7 +88,7 @@ import { getSelectedAccountId } from '@/services/bus/account';
 import { WarehouseStateChangeReq } from '@/services/proto/warehouse/interface';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { warehouseStateChangeReq } from '@/services/proto/warehouse';
-import { isOemByEnum, OemType } from '@/common/config/projectName';
+import { isPingAnOem } from '@/common/config/projectName';
 
 export default defineComponent({
     name: 'warehouse_info_btn_recover',
@@ -135,8 +135,7 @@ export default defineComponent({
             gerWareHouseStatusName,
             getWareHouseTypeName,
             formatValue,
-            isOemByEnum,
-            OemType,
+            isPingAnOem,
         };
     },
 });

Някои файлове не бяха показани, защото твърде много файлове са промени