fix(bugs): 修改2022 4 -1 问题

src/locales/lang/zh-CN/routes/devices.ts

@@ -47,7 +47,7 @@ export default {
   unbindWarning: '确定要解绑该账号？',
   addeduser: '已添加员工数',
   num: '设备数量',
-  subNum: '可添加员工数',
+  subNum: '可添加员工总数',
 
   // normalSales: '正常销售',
   // normalSales: '正常销售',

src/views/corporation/AddModal.vue

@@ -106,7 +106,7 @@
         });
 
         if (addTips) {
-          return createMessage.error('子账号已被该企业绑定');
+          return createMessage.error('员工账号已被绑定');
         }
         //TODO hack parameter
         let res = await checkUserAddAble({ phone: values.phone });
@@ -121,7 +121,7 @@
           closeModal();
           createMessage.success(t('layout.setting.operatingTitle'));
         } else {
-          createMessage.error('子账号已被该企业绑定');
+          createMessage.error('员工账号已被绑定');
         }
       };
       function handleVisibleChange(v) {

src/views/corporation/SubaccountModal.vue

@@ -143,7 +143,7 @@
                 let { addeduser } = getFieldsValue();
                 console.log('validator', value, addeduser);
                 if (value < addeduser) {
-                  return Promise.reject('可添加数量必须大于已添加数量');
+                  return Promise.reject('可添加员工总数应大于已添加员工数');
                 }
                 return Promise.resolve();
               },

src/views/corporation/chargeModal.vue

@@ -27,7 +27,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   const schemas: FormSchema[] = [
     {
-      field: 'managerPhone',
+      field: 'userName',
       component: 'Input',
       label: '充值账号',
       labelWidth: 100,

src/views/corporation/deviceModal.vue

@@ -201,7 +201,7 @@
           let childNameList: string[] = [];
           Object.keys(values).map((ele) => {
             if (ele.includes('ID')) {
-              childNameList.push(values[ele]);
+              childNameList.push(values[ele].replace(/\s*/g, ''));
             }
           });
 

src/views/corporation/index.vue

@@ -47,6 +47,7 @@
       </template>
       <template #expirationTime="{ record }">
         <Time
+          style="color: #0960bd"
           v-if="record.expirationTime"
           @click="openTimeModal(true, record)"
           :value="record.expirationTime"

src/views/devices/list.vue

@@ -39,6 +39,7 @@
             {
               icon: 'clarity:unlink-line',
               label: t('common.unbind'),
+              ifShow: !!record.userName,
               popConfirm: {
                 title: t('routes.corporation.isUnBind'),
                 confirm: handleUnbindDevice.bind(null, record),

src/views/feedback/list.vue

@@ -132,6 +132,10 @@
         // rowKey: 'userId',
         pagination: { pageSize: 20 },
         bordered: true,
+        sortFn: (sortInfo) => {
+          let order = sortInfo.order && sortInfo.order.replace('end', '');
+          return { ...sortInfo, sidx: sortInfo.field, order: order };
+        },
         fetchSetting: {
           pageField: 'page',
           sizeField: 'limit',

src/views/order/list.vue

@@ -306,6 +306,10 @@
           totalField: 'totalCount',
         },
         bordered: true,
+        sortFn: (sortInfo) => {
+          let order = sortInfo.order && sortInfo.order.replace('end', '');
+          return { ...sortInfo, sidx: sortInfo.field, order: order };
+        },
       });
 
       function renderOrderTypeLabel(type: number): string {

src/views/product/list.vue

@@ -110,6 +110,10 @@
           listField: 'list',
           totalField: 'totalCount',
         },
+        sortFn: (sortInfo) => {
+          let order = sortInfo.order && sortInfo.order.replace('end', '');
+          return { ...sortInfo, sidx: sortInfo.field, order: order };
+        },
       });
 
       function handleEdit(record: Recordable) {

src/views/scenes/live.vue

@@ -253,10 +253,15 @@
           listField: 'list',
           totalField: 'totalCount',
         },
-        defSort: {
-          field: 'order',
-          order: 'asc',
+        sortFn: (sortInfo) => {
+          console.log('sortInfo', sortInfo);
+          let order = sortInfo.order && sortInfo.order.replace('end', '');
+          return { ...sortInfo, sidx: sortInfo.field, order: order };
         },
+        // defSort: {
+        //   field: 'order',
+        //   order: 'asc',
+        // },
       });
 
       function handleBindAnchor(record: Recordable) {

src/views/scenes/liveDrawer.vue

@@ -164,6 +164,7 @@
           },
           componentProps: {
             accept: ['jpg', 'jpeg', 'gif', 'png'],
+            maxSize: 5,
             api: uploadLiveApi,
             onChange: async () => {
               await validateFields(['appListPicUrl']);
@@ -274,12 +275,13 @@
           field: 'picList',
           label: '直播间图片',
           component: 'Upload',
+          helpMessage: '推荐大小：400 * 400 像素',
           componentProps: {
             api: uploadLiveApi,
             maxSize: 5,
             emptyHidePreview: true,
             maxNumber: 15,
-            accept: ['image/*'],
+            accept: ['jpg', 'jpeg', 'gif', 'png'],
             afterFetch: function (data) {
               Reflect.set(data, 'url', data.message.url);
               return data;

src/views/staff/detailsModal.vue

@@ -86,22 +86,22 @@
         valueField: 'roleId',
       },
     },
-    {
-      field: 'status',
-      label: '状态',
-      component: 'RadioButtonGroup',
-      required: true,
-      defaultValue: 1,
-      itemProps: {
-        validateTrigger: 'blur',
-      },
-      componentProps: {
-        options: [
-          { label: '是', value: 1 },
-          { label: '否', value: 0 },
-        ],
-      },
-    },
+    // {
+    //   field: 'status',
+    //   label: '状态',
+    //   component: 'RadioButtonGroup',
+    //   required: true,
+    //   defaultValue: 1,
+    //   itemProps: {
+    //     validateTrigger: 'blur',
+    //   },
+    //   componentProps: {
+    //     options: [
+    //       { label: '是', value: 1 },
+    //       { label: '否', value: 0 },
+    //     ],
+    //   },
+    // },
     {
       field: 'id',
       component: 'Input',

src/views/system/account/account.data.ts

@@ -12,7 +12,7 @@ const { t } = useI18n();
 export const columns: BasicColumn[] = [
   {
     title: '用户名',
-    dataIndex: 'userName',
+    dataIndex: 'nickName',
     width: 120,
   },
   // {
@@ -65,15 +65,15 @@ export const searchFormSchema: FormSchema[] = [
     },
     colProps: { span: 8 },
   },
-  {
-    field: 'nickName',
-    label: '昵称',
-    component: 'Input',
-    componentProps: {
-      maxLength: 100,
-    },
-    colProps: { span: 8 },
-  },
+  // {
+  //   field: 'nickName',
+  //   label: '昵称',
+  //   component: 'Input',
+  //   componentProps: {
+  //     maxLength: 100,
+  //   },
+  //   colProps: { span: 8 },
+  // },
 ];
 
 export const accountFormSchema: FormSchema[] = [