diff --git a/src/views/super/clientSet/headerPage.vue b/src/views/super/clientSet/headerPage.vue index 2e9d928..0a5064b 100644 --- a/src/views/super/clientSet/headerPage.vue +++ b/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')" />
@@ -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'); diff --git a/src/views/super/clientSet/mainTextPage.vue b/src/views/super/clientSet/mainTextPage.vue index 50cd591..5e46e6a 100644 --- a/src/views/super/clientSet/mainTextPage.vue +++ b/src/views/super/clientSet/mainTextPage.vue @@ -4,17 +4,17 @@
@@ -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']); }, // 正文内容数据 diff --git a/src/views/super/paiban/college.vue b/src/views/super/paiban/college.vue index 980db68..ee0dcec 100644 --- a/src/views/super/paiban/college.vue +++ b/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) diff --git a/src/views/super/paiban/orderlist.vue b/src/views/super/paiban/orderlist.vue index a94478a..5e46049 100644 --- a/src/views/super/paiban/orderlist.vue +++ b/src/views/super/paiban/orderlist.vue @@ -5,15 +5,21 @@
+ 搜索
@@ -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 {