From 3a60529752a45a692e8bf9ef158c3956f36c8797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Tue, 10 Jun 2025 09:43:50 +0800
Subject: [PATCH 1/3] tijiao

---
 src/components/page/articleDetailEditor.vue   | 6 ++++--
 src/components/page/components/major/list.vue | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/page/articleDetailEditor.vue b/src/components/page/articleDetailEditor.vue
index 6362a60..769ba01 100644
--- a/src/components/page/articleDetailEditor.vue
+++ b/src/components/page/articleDetailEditor.vue
@@ -132,10 +132,11 @@
                                     </p>
                                 </el-collapse-item>
                             </el-collapse>
-                            <el-collapse class="auth_colla auth_collna_ew" style="margin-top: -15px">
+                            <el-collapse v-model="researchAreas" class="auth_colla auth_collna_ew" style="margin-top: -15px">
                                 <el-collapse-item title="Research areas" name="1">
                                     <div style="position: relative; height: 30px">
                                         <common-major
+                                        v-if="form.state==0"
                                             :articleId="editform.articleId"
                                             @load="initMajor()"
                                             style="position: absolute; top: 10px; right: 10px"
@@ -152,7 +153,7 @@
                                                     <span style="color: #006699; font-weight: bold; margin-right: 10px"
                                                         >Field {{ i + 1 }}:</span
                                                     >{{ v.str
-                                                    }}<i
+                                                    }}<i v-if="form.state==0"
                                                         class="el-icon-delete-solid"
                                                         style="color: #f56c6c !important; margin-left: 10px"
                                                         @click="handleDeleteMajor(v)"
@@ -553,6 +554,7 @@ export default {
     },
     data() {
         return {
+            researchAreas:['1'],
             AIcontent:'',
             previewData: {},
             baseUrl: this.Common.baseUrl,
diff --git a/src/components/page/components/major/list.vue b/src/components/page/components/major/list.vue
index f9af797..2c75f7d 100644
--- a/src/components/page/components/major/list.vue
+++ b/src/components/page/components/major/list.vue
@@ -20,7 +20,7 @@
                         ></el-cascader>
 
                         <!-- Delete button -->
-                        <el-button size="mini" type="danger" style="margin-left: 10px;" @click="handleDelete(index)"><i class="el-icon-delete"></i></el-button>
+                        <el-button v-if="!disabled" size="mini" type="danger" style="margin-left: 10px;" @click="handleDelete(index)"><i class="el-icon-delete"></i></el-button>
                     </div>
         <!-- <el-dialog title="Add Field " :visible.sync="coreVisible1" width="780px" :close-on-click-modal="false">
             <el-form :model="coreForm1" :rules="rules1" ref="core_Form1" label-width="140px" >
@@ -53,7 +53,11 @@ export default {
         list: {
             type: Array,
             default: []
-        }
+        },
+        disabled: {
+            type: Boolean,
+            default: false
+        },
     },
     watch: {
         list: {

From 2b3bd8a4a5e13a922b2c471083d877041a6b4ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Thu, 19 Jun 2025 15:22:03 +0800
Subject: [PATCH 2/3] tijiao

---
 src/components/page/articleListEditor_A.vue | 14 +++++++-------
 src/components/page/per_text.vue            |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/page/articleListEditor_A.vue b/src/components/page/articleListEditor_A.vue
index 67fb810..69ff442 100644
--- a/src/components/page/articleListEditor_A.vue
+++ b/src/components/page/articleListEditor_A.vue
@@ -2491,13 +2491,13 @@ export default {
         // 修改标记
         saveRemark() {
             console.log('this.remark at line 2212:', this.remark);
-            const mergedText = this.remark.contentList
-                .filter((item) => item.text && item.text.trim() !== '') // 过滤掉空或全空格项
-                .map((item) => {
-                    const text = item.text.trim();
-                    return text.endsWith('。') ? text : text + '。';
-                })
-                .join('');
+            var mergedText = this.remark.content
+                // .filter((item) => item.text && item.text.trim() !== '') // 过滤掉空或全空格项
+                // .map((item) => {
+                //     const text = item.text.trim();
+                //     return text.endsWith('。') ? text : text + '。';
+                // })
+                // .join('');
 
             console.log('拼接结果：', mergedText);
 
diff --git a/src/components/page/per_text.vue b/src/components/page/per_text.vue
index 475cebb..0c68f54 100644
--- a/src/components/page/per_text.vue
+++ b/src/components/page/per_text.vue
@@ -92,8 +92,8 @@
                     </el-card>
 
                     <el-card class="box-card" v-if="this.add_apply == 0">
-                        <common-review-article></common-review-article>
-                        <!-- <el-form :model="questionform" :rules="rules" ref="question" label-width="300px" label-position="top">
+                        <!-- <common-review-article></common-review-article> -->
+                       <el-form :model="questionform" :rules="rules" ref="question" label-width="300px" label-position="top">
                             <el-divider content-position="center">REFEREE'S ASSESSMENT</el-divider>
                             <el-row :gutter="24">
                                 <el-col :span="24">
@@ -345,7 +345,7 @@
                                     <el-button type="primary" @click="questionSubmit">submit</el-button>
                                 </el-form-item>
                             </el-collapse>
-                        </el-form> -->
+                        </el-form>
                     </el-card>
                 </el-col>
             </el-row>

From 5b11a952c0ff2cefd3068758d57bd6384bac7bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Thu, 19 Jun 2025 17:07:45 +0800
Subject: [PATCH 3/3] tijiao

---
 src/components/page/articleListEditor_E.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/page/articleListEditor_E.vue b/src/components/page/articleListEditor_E.vue
index 389be6b..b532aea 100644
--- a/src/components/page/articleListEditor_E.vue
+++ b/src/components/page/articleListEditor_E.vue
@@ -773,7 +773,7 @@ export default {
             this.$api
                 .post('api/Publish/getAllStages', this.queryType)
                 .then((res) => {
-                    this.stageList = res.data.stages;
+                    this.stageList = res.data.stages.reverse();
                     this.getDate();
                 })
                 .catch((err) => {