Forráskód Böngészése

fix(bugs): 修改问题111

tangning 3 éve
szülő
commit
a95c38be32

+ 6 - 1
src/views/rightsEnterprises/addModal.vue

@@ -80,7 +80,7 @@
           edit: true,
           // slots: { customRender: 'subNum' },
           editRule: async (text) => {
-            if (text > 999 || text < 0) {
+            if (text > 999 || text < -1) {
               return t('routes.rightsEnterprises.maxlength');
             }
             return '';
@@ -223,13 +223,18 @@
         // let tableData = tableRef.value.getDataSource() || [];
         // let fromData = await validate();
         let tableData = getDataSource();
+        let SunNum = 0;
         const permList = tableData?.map((ele) => {
+          SunNum = SunNum + ele.muber;
           return {
             staffPermTypeId: ele.id,
             num: ele.muber || 0,
             // takeLookNum:50,
           };
         });
+        if (SunNum == 0) {
+          return createMessage.warning('不支持两个权益为空');
+        }
         let res = await saveRights({
           companyId: modelRef.companyId,
           permList,

+ 2 - 2
src/views/rightsEnterprises/camera.vue

@@ -85,7 +85,7 @@
       const userinfo = computed(() => userStore.getUserInfo);
       const modelRef = reactive({
         companyId: userinfo.value.companyId,
-        companyName: '0',
+        companyName: '',
         companyPhone: '',
       });
       const go = useGo();
@@ -161,7 +161,7 @@
         schemas: [
           {
             field: 'staffName',
-            label: t('routes.rightsEnterprises.staffName'),
+            label: t('routes.rightsEnterprises.companyName'),
             component: 'Input',
             componentProps: {
               maxLength: 15,

+ 4 - 1
src/views/rightsEnterprises/cameraList.vue

@@ -62,6 +62,7 @@
   import addModal from './addModal.vue';
   import { Time } from '/@/components/Time';
   import { useUserStore } from '/@/store/modules/user';
+  import { useTabs } from '/@/hooks/web/useTabs';
   import { useRouter } from 'vue-router';
   export default defineComponent({
     components: {
@@ -87,10 +88,12 @@
       const userinfo = computed(() => userStore.getUserInfo);
       const companyId = ref(userinfo.value.companyId);
       const go = useGo();
+      const { closeCurrent } = useTabs();
       const { t } = useI18n();
       console.log('companyId', companyId);
       if (companyId.value) {
-        router.replace(`detail/${companyId.value}`);
+        closeCurrent();
+        router.push(`detail/${companyId.value}`);
       }
       onMounted(() => {
         getNumByStaffData();

+ 4 - 8
src/views/rightsEnterprises/rightsList.vue

@@ -60,6 +60,7 @@
   import addModal from './addModal.vue';
   import { Time } from '/@/components/Time';
   import { useUserStore } from '/@/store/modules/user';
+  import { useTabs } from '/@/hooks/web/useTabs';
   import { useRouter } from 'vue-router';
   export default defineComponent({
     components: {
@@ -79,6 +80,7 @@
         shotNum: 0,
       });
       const { createConfirm, createMessage } = useMessage();
+      const { closeCurrent } = useTabs();
       const userStore = useUserStore();
       const { getCheckRole } = userStore;
       const userinfo = computed(() => userStore.getUserInfo);
@@ -87,6 +89,7 @@
       const { t } = useI18n();
       console.log('companyId', companyId);
       if (companyId.value) {
+        closeCurrent();
         router.replace(`detail/${companyId.value}`);
       }
       onMounted(() => {
@@ -160,7 +163,6 @@
           },
         ],
       };
-
       const [registerTable, { reload }] = useTable({
         title: t('routes.rightsEnterprises.menuList'),
         api: ListApi,
@@ -169,10 +171,8 @@
         formConfig: searchForm,
         showTableSetting: true,
         tableSetting: { fullScreen: true },
-        showIndexColumn: true,
+        showIndexColumn: false,
         pagination: { pageSize: 20 },
-        clickToRowSelect: false,
-        bordered: true,
         rowKey: 'companyId',
         fetchSetting: {
           pageField: 'page',
@@ -189,10 +189,6 @@
             endTime: T.fieldTime?.[1],
           };
         },
-        // sortFn: (sortInfo) => {
-        //   let order = sortInfo.order && sortInfo.order.replace('end', '');
-        //   return { ...sortInfo, sidx: sortInfo.field, order: order };
-        // },
       });
 
       function renderRoleType(type: number): string {