Merge remote-tracking branch 'origin/dev' into dev

src/views/teachingManager/textbookManagement/components/infoView.vue

@@ -19,10 +19,16 @@
     getTextbookInfoSubscriptionList,
     getTextbookInfoWarehouseList,
   } from '/@/services/apis/TextbookController';
+  import { getDataOption } from '/@/api/system/dic';
+
   const DescriptionsItem = Descriptions.Item;
   const TabPane = Tabs.TabPane;
   const dataInfo = ref();
-  const [modalReg, { closeModal }] = useModalInner((data) => {
+  const [modalReg, { closeModal }] = useModalInner(async (data) => {
+    const dicList = await getDataOption({ code: 'textbook_category' });
+    data['textbookCategory'] = dicList.filter(
+      (item) => item.value === data['textbookCategory'],
+    )[0]?.label;
     dataInfo.value = data;
   });
   const [tableReg, { setColumns, setTableData }] = useTable({