Merge remote-tracking branch 'origin/main' into feature/v1.3_主agent_rxd

# Conflicts:
#	src/views/creative-generation-workshop/manuscript-writer/check-list/index.vue
#	src/views/creative-generation-workshop/manuscript-writer/list/index.vue
#	src/views/creative-generation-workshop/manuscript/check-list/index.vue
#	src/views/creative-generation-workshop/manuscript/list/index.vue

src/views/creative-generation-workshop/manuscript-writer/check-list/components/manuscript-check-table/index.vue

@@ -77,7 +77,7 @@
         <template
           #cell="{ record }"
           v-else-if="
-            ['updated_at', 'last_modified_at', 'audit_started_at', 'audit_passed_at'].includes(column.dataIndex)
+            ['created_at', 'last_modified_at', 'audit_started_at', 'audit_passed_at'].includes(column.dataIndex)
           "
         >
           <span class="cts num">{{ exactFormatTime(record[column.dataIndex]) }}</span>

src/views/creative-generation-workshop/manuscript-writer/check-list/index.vue

@@ -7,26 +7,61 @@
           <a-button type="outline" size="medium" @click="handleShareModal">分享内容稿件</a-button>
         </template> -->
       </a-tabs>
-      <FilterBlock v-model:query="query" :audit_status="query.audit_status" @search="handleSearch"
+      <FilterBlock
-        @reset="handleReset" />
+        v-model:query="query"
+        :audit_status="query.audit_status"
+        @search="handleSearch"
+        @reset="handleReset"
+      />
     </div>
+    <div class="table-wrap bg-#fff rounded-8px px-24px py-24px flex flex-col">
       <div
-      class="table-wrap bg-#fff rounded-8px  px-24px py-24px flex-1 flex flex-col">
+        class="flex justify-end mb-12px"
-      <div class="flex justify-end mb-12px"
+        v-if="[AuditStatus.Pending, AuditStatus.Auditing].includes(query.audit_status)"
-        v-if="[AuditStatus.Pending, AuditStatus.Auditing].includes(query.audit_status)">
+      >
-        <a-button type="outline" class="w-fit" size="medium" @click="handleBatchCheck"
+        <a-button
-          v-if="query.audit_status === AuditStatus.Pending">批量审核</a-button>
+          type="outline"
-        <a-button type="outline" class="w-fit" size="medium" @click="handleBatchView"
+          class="w-fit"
-          v-if="query.audit_status === AuditStatus.Auditing">批量查看</a-button>
+          size="medium"
+          @click="handleBatchCheck"
+          v-if="query.audit_status === AuditStatus.Pending"
+          >批量审核</a-button
+        >
+        <a-button
+          type="outline"
+          class="w-fit"
+          size="medium"
+          @click="handleBatchView"
+          v-if="query.audit_status === AuditStatus.Auditing"
+          >批量查看</a-button
+        >
       </div>
 
-      <ManuscriptCheckTable :key="query.audit_status" :tableColumns="tableColumns" :rowSelection="rowSelection"
+      <ManuscriptCheckTable
-        :selectedRowKeys="selectedRowKeys" :dataSource="dataSource" :audit_status="query.audit_status"
+        :key="query.audit_status"
-        @sorterChange="handleSorterChange" @delete="handleDelete" @edit="handleEdit" @select="handleSelect"
+        :tableColumns="tableColumns"
-        @selectAll="handleSelectAll" />
+        :rowSelection="rowSelection"
+        :selectedRowKeys="selectedRowKeys"
+        :dataSource="dataSource"
+        :audit_status="query.audit_status"
+        @sorterChange="handleSorterChange"
+        @delete="handleDelete"
+        @edit="handleEdit"
+        @select="handleSelect"
+        @selectAll="handleSelectAll"
+      />
       <div v-if="pageInfo.total > 0" class="pagination-box">
-        <a-pagination :total="pageInfo.total" size="mini" show-total show-jumper show-page-size :current="pageInfo.page"
+        <a-pagination
-          :page-size="pageInfo.page_size" @change="onPageChange" @page-size-change="onPageSizeChange" />
+          :total="pageInfo.total"
+          size="mini"
+          show-total
+          show-jumper
+          show-page-size
+          :current="pageInfo.page"
+          :page-size="pageInfo.page_size"
+          @change="onPageChange"
+          @page-size-change="onPageSizeChange"
+        />
       </div>
     </div>
 

src/views/creative-generation-workshop/manuscript-writer/check-list/style.scss

@@ -1,5 +1,5 @@
 .manuscript-check-wrap {
-  height: 100%;
+  // height: 100%;
   display: flex;
   flex-direction: column;
   .filter-wrap {

src/views/creative-generation-workshop/manuscript-writer/list/components/manuscript-table/index.vue

@@ -67,7 +67,7 @@
         <template v-else-if="['uploader', 'last_modifier'].includes(column.dataIndex)" #cell="{ record }">
           {{ record[column.dataIndex].name || record[column.dataIndex].mobile }}
         </template>
-        <template v-else-if="['updated_at', 'last_modified_at'].includes(column.dataIndex)" #cell="{ record }">
+        <template v-else-if="['created_at', 'last_modified_at'].includes(column.dataIndex)" #cell="{ record }">
           {{ exactFormatTime(record[column.dataIndex]) }}
         </template>
         <template v-else-if="column.dataIndex === 'cover'" #cell="{ record }">

src/views/creative-generation-workshop/manuscript-writer/list/index.vue

@@ -14,9 +14,7 @@
       </div>
       <FilterBlock v-model:query="query" @search="handleSearch" @reset="handleReset" />
     </div>
-    <div
+    <div class="table-wrap bg-#fff rounded-8px px-24px py-24px flex flex-col">
-      class="table-wrap bg-#fff rounded-8px  px-24px py-24px flex-1 flex flex-col"
-    >
       <ManuscriptTable :dataSource="dataSource" @sorterChange="handleSorterChange" @delete="handleDelete" />
       <div v-if="pageInfo.total > 0" class="pagination-box">
         <a-pagination
@@ -47,7 +45,10 @@ import UploadManuscriptModal from './components/upload-manuscript-modal';
 
 import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPagination';
 import { getWorksPageWriter } from '@/api/all/generationWorkshop-writer.ts';
-import { INITIAL_QUERY, EnumCheckStatus } from '@/views/creative-generation-workshop/manuscript-writer/list/constants.ts';
+import {
+  INITIAL_QUERY,
+  EnumCheckStatus,
+} from '@/views/creative-generation-workshop/manuscript-writer/list/constants.ts';
 
 const { dataSource, pageInfo, onPageChange, onPageSizeChange, resetPageInfo } = useTableSelectionWithPagination({
   onPageChange: () => {

src/views/creative-generation-workshop/manuscript/check-list/components/manuscript-check-table/index.vue

@@ -80,7 +80,7 @@
         <template
           #cell="{ record }"
           v-else-if="
-            ['updated_at', 'last_modified_at', 'audit_started_at', 'audit_passed_at'].includes(column.dataIndex)
+            ['created_at', 'last_modified_at', 'audit_started_at', 'audit_passed_at'].includes(column.dataIndex)
           "
         >
           <span class="cts num">{{ exactFormatTime(record[column.dataIndex]) }}</span>

src/views/creative-generation-workshop/manuscript/check-list/index.vue

@@ -7,26 +7,61 @@
           <a-button type="outline" size="medium" @click="handleShareModal">分享内容稿件</a-button>
         </template>
       </a-tabs>
-      <FilterBlock v-model:query="query" :audit_status="query.audit_status" @search="handleSearch"
+      <FilterBlock
-        @reset="handleReset" />
+        v-model:query="query"
+        :audit_status="query.audit_status"
+        @search="handleSearch"
+        @reset="handleReset"
+      />
     </div>
+    <div class="table-wrap bg-#fff rounded-8px px-24px py-24px flex flex-col">
       <div
-      class="table-wrap bg-#fff rounded-8px  px-24px py-24px flex-1 flex flex-col">
+        class="flex justify-end mb-12px"
-      <div class="flex justify-end mb-12px"
+        v-if="[AuditStatus.Pending, AuditStatus.Auditing].includes(query.audit_status)"
-        v-if="[AuditStatus.Pending, AuditStatus.Auditing].includes(query.audit_status)">
+      >
-        <a-button type="outline" class="w-fit" size="medium" @click="handleBatchCheck"
+        <a-button
-          v-if="query.audit_status === AuditStatus.Pending">批量审核</a-button>
+          type="outline"
-        <a-button type="outline" class="w-fit" size="medium" @click="handleBatchView"
+          class="w-fit"
-          v-if="query.audit_status === AuditStatus.Auditing">批量查看</a-button>
+          size="medium"
+          @click="handleBatchCheck"
+          v-if="query.audit_status === AuditStatus.Pending"
+          >批量审核</a-button
+        >
+        <a-button
+          type="outline"
+          class="w-fit"
+          size="medium"
+          @click="handleBatchView"
+          v-if="query.audit_status === AuditStatus.Auditing"
+          >批量查看</a-button
+        >
       </div>
 
-      <ManuscriptCheckTable :key="query.audit_status" :tableColumns="tableColumns" :rowSelection="rowSelection"
+      <ManuscriptCheckTable
-        :selectedRowKeys="selectedRowKeys" :dataSource="dataSource" :audit_status="query.audit_status"
+        :key="query.audit_status"
-        @sorterChange="handleSorterChange" @delete="handleDelete" @edit="handleEdit" @select="handleSelect"
+        :tableColumns="tableColumns"
-        @selectAll="handleSelectAll" />
+        :rowSelection="rowSelection"
+        :selectedRowKeys="selectedRowKeys"
+        :dataSource="dataSource"
+        :audit_status="query.audit_status"
+        @sorterChange="handleSorterChange"
+        @delete="handleDelete"
+        @edit="handleEdit"
+        @select="handleSelect"
+        @selectAll="handleSelectAll"
+      />
       <div v-if="pageInfo.total > 0" class="pagination-box">
-        <a-pagination :total="pageInfo.total" size="mini" show-total show-jumper show-page-size :current="pageInfo.page"
+        <a-pagination
-          :page-size="pageInfo.page_size" @change="onPageChange" @page-size-change="onPageSizeChange" />
+          :total="pageInfo.total"
+          size="mini"
+          show-total
+          show-jumper
+          show-page-size
+          :current="pageInfo.page"
+          :page-size="pageInfo.page_size"
+          @change="onPageChange"
+          @page-size-change="onPageSizeChange"
+        />
       </div>
     </div>
 

src/views/creative-generation-workshop/manuscript/check-list/style.scss

@@ -1,5 +1,5 @@
 .manuscript-check-wrap {
-  height: 100%;
+  // height: 100%;
   display: flex;
   flex-direction: column;
   .filter-wrap {

src/views/creative-generation-workshop/manuscript/list/components/manuscript-table/index.vue

@@ -51,7 +51,7 @@
         <template v-else-if="['uploader', 'last_modifier'].includes(column.dataIndex)" #cell="{ record }">
           {{ record[column.dataIndex].name || record[column.dataIndex].mobile }}
         </template>
-        <template v-else-if="['updated_at', 'last_modified_at'].includes(column.dataIndex)" #cell="{ record }">
+        <template v-else-if="['created_at', 'last_modified_at'].includes(column.dataIndex)" #cell="{ record }">
           {{ exactFormatTime(record[column.dataIndex]) }}
         </template>
         <template v-else-if="column.dataIndex === 'cover'" #cell="{ record }">

src/views/creative-generation-workshop/manuscript/list/index.vue

@@ -18,7 +18,7 @@
       <FilterBlock v-model:query="query" @search="handleSearch" @reset="handleReset" />
     </div>
     <div
-      class="table-wrap bg-#fff rounded-8px  px-24px py-24px flex-1 flex flex-col"
+      class="table-wrap bg-#fff rounded-8px px-24px py-24px flex flex-col"
     >
       <ManuscriptTable :dataSource="dataSource" @sorterChange="handleSorterChange" @delete="handleDelete" />
       <div v-if="pageInfo.total > 0" class="pagination-box">

src/views/creative-generation-workshop/manuscript/list/style.scss

@@ -1,5 +1,5 @@
 .manuscript-list-wrap {
-  height: 100%;
+  // height: 100%;
   display: flex;
   flex-direction: column;
   .filter-wrap {