Browse Source

fix: change changetextbook

DESKTOP-USV654P\pc 2 weeks ago
parent
commit
d9b7f071dc

+ 1 - 1
.env.development

@@ -17,7 +17,7 @@ VITE_DROP_CONSOLE = false
 # 如果没有跨域问题,直接在这里配置即可
 # VITE_GLOB_API_URL=http://42.247.8.136:8007/tlapipre
 VITE_GLOB_API_URL=http://10.150.10.139:8888/api
-#VITE_GLOB_API_URL=http://10.4.120.110:8080
+#VITE_GLOB_API_URL=http://10.4.120.117:8080
 # 文件上传接口  可选
 VITE_GLOB_UPLOAD_URL =/system/oss/upload
 VITE_GLOB_APP_LOGO_TITLE = 数智铜职

+ 1 - 1
Makefile

@@ -12,7 +12,7 @@ build:
 
 commit:
 	git add . && \
-	git commit --no-verify -m "fix: change textbookPopManager"
+	git commit --no-verify -m "fix: change changetextbook"
 
 checkPre:
 	git checkout pre

+ 16 - 1
src/views/educational/textbookSubscription/components/changeTextBook.vue

@@ -76,7 +76,22 @@
   });
   const { createMessage } = useMessage();
   const handleSubmit = () => {
-    setTableData(getSelectRows());
+    const soruceData = getDataSource()[0];
+    const newData = getSelectRows()[0];
+
+    soruceData['bookName'] = newData['bookName'];
+    soruceData['courseSubjectId'] = newData['courseSubjectId'];
+    soruceData['courseSubjectIdCn'] = newData['courseName'];
+    soruceData['discount'] = newData['discount'];
+    soruceData['editorInChief'] = newData['editorInChief'];
+    soruceData['issn'] = newData['issn'];
+    soruceData['price'] = newData['price'];
+    soruceData['publishingHouse'] = newData['publishingHouse'];
+    soruceData['textbookId'] = newData['id'];
+    soruceData['textbookType'] = newData['textbookType'];
+    soruceData['textbookTypeCn'] = newData['textbookTypeCn'];
+    soruceData['useClassNum'] = newData['useType'];
+    setTableData([soruceData]);
     changeType.value = 2;
     handleCancel();
   };

+ 29 - 1
src/views/notice/components/config.ts

@@ -7,7 +7,25 @@ export const searchFormSchema: FormSchema[] = [
     field: 'fullHead',
     label: '公告标题',
     component: 'Input',
-    colProps: { span: 24 },
+    colProps: { span: 8 },
+  },
+  {
+    field: '[createDateStart,createDateEnd]',
+    label: '添加时间',
+    component: 'RangePicker',
+    colProps: { span: 8 },
+    componentProps: {
+      placeholder: ['开始日期', '结束日期'],
+      format: 'YYYY-MM-DD',
+      showTime: false,
+      getPopupContainer: () => document.body,
+    },
+  },
+  {
+    field: 'createUserName',
+    label: '添加人',
+    component: 'Input',
+    colProps: { span: 8 },
   },
 ];
 
@@ -88,6 +106,16 @@ export const columns: BasicColumn[] = [
     title: '发布时间',
     width: 150,
   },
+  {
+    dataIndex: 'createDate',
+    title: '添加时间',
+    width: 150,
+  },
+  {
+    dataIndex: 'createUserName',
+    title: '添加人',
+    width: 120,
+  },
   {
     dataIndex: 'status',
     title: '公告状态',

+ 12 - 0
src/views/prize/enroll/data.config.ts

@@ -119,4 +119,16 @@ export const searchFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
     },
   },
+  {
+    field: '[createDateStart,createDateEnd]',
+    label: '上传时间',
+    component: 'RangePicker',
+    colProps: { span: 8 },
+    componentProps: {
+      placeholder: ['开始日期', '结束日期'],
+      format: 'YYYY-MM-DD',
+      showTime: false,
+      getPopupContainer: () => document.body,
+    },
+  },
 ];

+ 12 - 0
src/views/prize/statistics/data.config.ts

@@ -64,6 +64,18 @@ export const searchFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
     },
   },
+  {
+    field: '[createDateStart,createDateEnd]',
+    label: '上传时间',
+    component: 'RangePicker',
+    colProps: { span: 8 },
+    componentProps: {
+      placeholder: ['开始日期', '结束日期'],
+      format: 'YYYY-MM-DD',
+      showTime: false,
+      getPopupContainer: () => document.body,
+    },
+  },
 ];
 
 export const tableDetailColumns: BasicColumn[] = [