订单列表字段修改

src/views/super/clientSet/headerPage.vue

@@ -6,7 +6,7 @@
                 :fontDetailflag="true" :showIndentation="false" :fontWeightflag="false" @cancel="(data) => handleCancelEvent(data, 'oneLevel')"
                 @submit="(data) => handleSubmitEvent(data, 'oneLevel')" />
             <ClientForm ref="twoLevelRef" title="页码" :fontDetailflag="true" :lineSpaceShow="false" :showIndentation="false"
-                :init-data="twoFormData" @cancel="(data) => handleCancelEvent(data, 'twoLevel')" :outputStructure="['page_number','content']"
+                :init-data="twoFormData" @cancel="(data) => handleCancelEvent(data, 'twoLevel')" :outputStructure="['page_number','title']"
                 @submit="(data) => handleSubmitEvent(data, 'twoLevel')" />
         </div>
         <div class="flex-between mt12 flex-common" id="headerTwo">
@@ -31,28 +31,19 @@ export default {
     },
     data() {
         return {
-            oneFormData: {
-                fontSize: '12',
-                align: 1,
-            },
-            twoFormData: {
-                fontSize: '12',
-                align: 1,
-            },
         };
     },
     mounted() {
-        // this.getHeaderInfo();
     },
     computed: {
         ...mapState(['client_tpl_config']),
             // 为不同组件创建计算属性
-        level1HeadingData() {
-            return this.getDynamicDataSafe(['text', 'content']);
+        oneFormData() {
+            return this.getDynamicDataSafe(['page_number', 'content']);
         },
         
-        level2HeadingData() {
-            return this.getDynamicDataSafe(['text', 'content']);
+        twoFormData() {
+            return this.getDynamicDataSafe(['page_number', 'title']);
         },
         pageMarginData() {
             console.log(this.getDynamicDataSafe(['page_margin']),'===00099');

src/views/super/clientSet/mainTextPage.vue

@@ -4,17 +4,17 @@
         <div class="flex-between flex-common" id="mainTextTitle">
             <ClientForm ref="level_1_heading" title="一级标题" :key="time" :init-data="level1HeadingData" 
                 :fontDetailflag="true" @cancel="(data) => handleCancelEvent(data, 'level_1_heading')"
-                :outputStructure="['text','content','level_1_heading']"
+                :outputStructure="['title','content','level_1_heading']"
                 @submit="(data) => handleSubmitEvent(data, 'level_1_heading')" />
             <ClientForm ref="level_2_heading" title="二级标题" :fontDetailflag="true"
                 :init-data="level2HeadingData" @cancel="(data) => handleCancelEvent(data, 'level_2_heading')"
-                 :outputStructure="['text','content','level_2_heading']"
+                 :outputStructure="['title','content','level_2_heading']"
                 @submit="(data) => handleSubmitEvent(data, 'level_2_heading')" />
         </div>
         <div class="flex-between flex-common mt12" id="">
             <ClientForm ref="level_3_heading" title="三级标题" :fontDetailflag="true"
                 :init-data="level3HeadingData" @cancel="(data) => handleCancelEvent(data, 'level_3_heading')"
-                :outputStructure="['text','content','level_3_heading']"
+                :outputStructure="['title','content','level_3_heading']"
                 @submit="(data) => handleSubmitEvent(data, 'level_3_heading')" />
         </div>
         <div class="flex-between flex-common mt12" id="mainTextContent">
@@ -59,33 +59,18 @@ export default {
             time:Date.now(),
         };
     },
-    watch: {
-        // client_tpl_config: {
-        //     immediate: true,
-        //     deep: true,
-        //     handler(config) {
-        //         if (config?.text?.content) {
-        //             this.oneFormData.font = config.text.content.level_1_heading.font || '';
-        //             this.oneFormData.alignment = config.text.content.level_1_heading.alignment || '';
-        //             this.oneFormData.indentation = config.text.content.level_1_heading.indentation || '';
-        //             this.oneFormData.spacing = config.text.content.level_1_heading.spacing || '';
-        //             this.time = Date.now();
-        //         }
-        //     }
-        // }
-    },
     computed: {
         ...mapState(['client_tpl_review_status','client_tpl_type','client_tpl_id','client_tpl_config']),
             // 为不同组件创建计算属性
         level1HeadingData() {
-            return this.getDynamicDataSafe(['text', 'content', 'level_1_heading']);
+            return this.getDynamicDataSafe(['title', 'content', 'level_1_heading']);
         },
         
         level2HeadingData() {
-            return this.getDynamicDataSafe(['text', 'content', 'level_2_heading']);
+            return this.getDynamicDataSafe(['title', 'content', 'level_2_heading']);
         },
         level3HeadingData() {
-            return this.getDynamicDataSafe(['text', 'content', 'level_3_heading']);
+            return this.getDynamicDataSafe(['title', 'content', 'level_3_heading']);
         },
         
         // 正文内容数据

src/views/super/paiban/college.vue

@@ -262,9 +262,9 @@ export default {
         handleLunwen(id,type){
 
             // this.refuse_id = row.id
-            let url = 'supernew/down_paiban_template_require?template_id='
+            let url = '/supernew/down_paiban_template_require?template_id='
             if(type == 1){
-                url = 'supernew/down_paiban_template_paper?template_id='
+                url = '/supernew/down_paiban_template_paper?template_id='
             }
             window.open(url+id)
 

src/views/super/paiban/orderlist.vue

@@ -5,15 +5,21 @@
                 <div class="flex-between filter-area">
                     <label for="">订单管理</label>
                     <div class="flex gap12">
+                        <GuipSelect ref="GuipSelect" label="订单状态" placeholder="请选择订单状态" v-model="status"/>
                         <GuipInput ref="GuipInput" label="订单号" placeholder="请输入订单号" v-model="orderId" width="280px"/>
                         <GuipButton type="system">搜索</GuipButton>
                     </div>
                 </div>
                 <GuipTable :tableData="tableList" :key="tableKey" ref="multipleTable" autoColumn="true" :loading="tableLoading" style="flex:1">
                     <template>
-                        <el-table-column fixed="left" prop="school_name" label="ID" min-width="150"></el-table-column>
-                        <el-table-column prop="degree_name" label="订单号" min-width="200"></el-table-column>
-                        <el-table-column prop="college_name" label="支付方式" min-width="100"></el-table-column>
+                        <el-table-column fixed="left" prop="sale_id" label="ID" min-width="150"></el-table-column>
+                        <el-table-column prop="degree_name" label="订单号" min-width="200">
+                            <template slot-scope="scope">
+                                <div class="flex" v-for="item in scope.row.tids" :key="item">
+                                    {{ item }}
+                                </div>
+                                </template>
+                        </el-table-column>
                         <el-table-column prop="src" label="渠道" min-width="100">
                             <template slot-scope="scope">
                                 <div class="flex">
@@ -23,10 +29,17 @@
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="review_status_desc" label="IP" min-width="200"></el-table-column>
-                        <el-table-column prop="review_status_desc" label="销售时间" min-width="200"></el-table-column>
-                        <el-table-column prop="review_status_desc" label="订单收入" min-width="200"></el-table-column>
-                        <el-table-column prop="status_desc" label="状态" min-width="200">
+                        <el-table-column prop="pay_type" label="支付方式" min-width="100"></el-table-column>
+                        <el-table-column prop="agent_nick" label="代理商昵称" min-width="100"></el-table-column>
+                        <el-table-column prop="school_name" label="学校" min-width="100"></el-table-column>
+                        <el-table-column prop="degree_name" label="学历" min-width="100"></el-table-column>
+                        <el-table-column prop="college_name" label="学院" min-width="100"></el-table-column>
+                        <el-table-column prop="income" label="订单收入" min-width="100"></el-table-column>
+                        <el-table-column prop="page_number" label="页数" min-width="60"></el-table-column>
+                        <el-table-column prop="finish_time" label="上传/完成时间" min-width="200"></el-table-column>
+                        <el-table-column prop="pay_time" label="支付时间" min-width="200"></el-table-column>
+                        <el-table-column prop="ip" label="IP" min-width="200"></el-table-column>
+                        <el-table-column fixed="right" prop="status_desc" label="状态" min-width="120">
                             <template slot-scope="scope">
                                 <div class="flex">
                                     <div v-if="scope.row.status == 1" class="status-item divgreen">
@@ -58,16 +71,19 @@
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="status_desc" label="原论文" min-width="200">
+                        <el-table-column fixed="right"  prop="status_desc" label="原论文" min-width="90">
                             <template slot-scope="scope">
                                 <img src="@/assets/order_down.svg" @click="downLunwen(scope.row.id)" alt="">
                             </template>
 
                         </el-table-column>
-                        <el-table-column fixed="right" prop="tid" label="操作" min-width="100">
+                        <el-table-column fixed="right" prop="tid" label="操作" min-width="280">
                             <template slot-scope="scope">
-                                <GuipButton type="text" @click="handleShowInfo(scope.row.tid)">下载结果</GuipButton>
-                                <GuipButton type="text" v-if="false" @click="handleShowInfo(scope.row.tid)">重新生成</GuipButton>
+                                <div class="flex gap12">
+                                    <span class="resetBtn" @click="handleShowInfo(scope.row.tid)">重新提取</span>
+                                    <span class="resetBtn" @click="handleShowInfo(scope.row.tid)">重新排版</span>
+                                    <GuipButton type="text" @click="downLoadInfo(scope.row.tid)">下载</GuipButton>
+                                </div>
                             </template>
                         </el-table-column>
                     </template>
@@ -83,6 +99,7 @@
 
 
 import GuipButton from "@/components/GuipButton.vue";
+import GuipSelect from "@/components/GuipSelect.vue";
 import GuipTable from "@/components/GuipTable.vue";
 import GuipInput from "@/components/GuipInput.vue";
 import GuipToolTip from "@/components/GuipToolTip.vue";
@@ -93,11 +110,13 @@ export default {
         GuipInput,
         GuipTable,
         GuipButton,
+        GuipSelect
 
     },
     options: { styleIsolation: "shared" },
     data() {
         return {
+            status: '',
             tableLoading:false,
             tableKey: '',
             orderId:'',
@@ -142,7 +161,7 @@ export default {
                     pagesize: this.pageSize
                 }).then(response => {
                     this.$nextTick(() => {
-                        this.tableList = response.data.list
+                        this.tableList = Object.values(response.data.list)
                         this.total = response.data.count
                     })
                 }).catch(error => {
@@ -154,8 +173,26 @@ export default {
         },
         downLunwen(id){
             try {
-                this.$http('POST', '/supernew/down_paiban_template_paper', {
-                    template_id:id                }).then(response => {
+                this.$http('GET', `supernew/down_paiban_template_paper?template_id=${id}`, {
+
+                 },{
+                    headers: {
+                        'Content-Type':'multipart/form-data'
+                    }
+                 }).then(response => {
+                    console.log(response,'===000');
+                }).catch(error => {
+                    console.error(error, 'error')
+                })
+            } catch (error) {
+                console.error('数据加载失败:', error)
+            }
+        },
+        downLoadInfo(tid){
+            try {
+                this.$http('POST', '/supernew/down_paiban_template_require', {
+                    template_id:tid               
+                 }).then(response => {
                     this.$nextTick(() => {
                         this.tableList = response.data.list
                         this.total = response.data.count
@@ -164,7 +201,7 @@ export default {
                     console.error(error, 'error')
                 })
             } catch (error) {
-                console.error('数据加载失败:', error)
+                console.error('数据加载')
             }
         },
         handleSizeChange(val) {
@@ -196,6 +233,9 @@ export default {
 
 </script>
 <style lang="scss" scoped>
+    .resetBtn{
+        color: #8A9099;
+    }
 ::v-deep .el-form-item{
   margin: 0;
 }