Merge branch 'dev'
Showing
8 changed files
with
22 additions
and
15 deletions
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-05-17 10:30:58 | 4 | * @LastEditTime: 2024-01-22 17:12:09 |
5 | */ | 5 | */ |
6 | import request from '@/utils/request' | 6 | import request from '@/utils/request' |
7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) | 7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) |
... | @@ -11,7 +11,7 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap | ... | @@ -11,7 +11,7 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap |
11 | * @param data | 11 | * @param data |
12 | * @author ssq 2023年5月26日14点29分 | 12 | * @author ssq 2023年5月26日14点29分 |
13 | */ | 13 | */ |
14 | export function BatchInit(data){ | 14 | export function BatchInit (data) { |
15 | let apiUrl = ""; | 15 | let apiUrl = ""; |
16 | switch (data.get("djlx")) { | 16 | switch (data.get("djlx")) { |
17 | case "100": | 17 | case "100": | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | /* | 2 | /* |
3 | * @Description: 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器 | 3 | * @Description: 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器 |
4 | * @Autor: renchao | 4 | * @Autor: renchao |
5 | * @LastEditTime: 2023-09-20 14:20:39 | 5 | * @LastEditTime: 2024-01-22 17:02:42 |
6 | */ | 6 | */ |
7 | import axios from 'axios' | 7 | import axios from 'axios' |
8 | import Router from '@/router' | 8 | import Router from '@/router' |
... | @@ -18,7 +18,7 @@ const service = axios.create({ | ... | @@ -18,7 +18,7 @@ const service = axios.create({ |
18 | : window._config.baseUrl + "/", | 18 | : window._config.baseUrl + "/", |
19 | withCredentials: true, //是否允许跨域 | 19 | withCredentials: true, //是否允许跨域 |
20 | headers: { | 20 | headers: { |
21 | 'Content-Type': 'application/json; charset=utf-8' | 21 | 'Content-Type': 'application/json' |
22 | }, | 22 | }, |
23 | timeout: 15000 | 23 | timeout: 15000 |
24 | }) | 24 | }) | ... | ... |
... | @@ -530,6 +530,8 @@ | ... | @@ -530,6 +530,8 @@ |
530 | context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 725, 125); | 530 | context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 725, 125); |
531 | // 恢复原始字体设置 | 531 | // 恢复原始字体设置 |
532 | context.font = originalFont; | 532 | context.font = originalFont; |
533 | } else { | ||
534 | context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 170, 56); | ||
533 | } | 535 | } |
534 | 536 | ||
535 | context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123); | 537 | context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123); | ... | ... |
... | @@ -452,6 +452,8 @@ | ... | @@ -452,6 +452,8 @@ |
452 | context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 725, 125); | 452 | context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 725, 125); |
453 | // 恢复原始字体设置 | 453 | // 恢复原始字体设置 |
454 | context.font = originalFont; | 454 | context.font = originalFont; |
455 | } else { | ||
456 | context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 170, 56); | ||
455 | } | 457 | } |
456 | 458 | ||
457 | context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123); | 459 | context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123); | ... | ... |
... | @@ -38,7 +38,7 @@ | ... | @@ -38,7 +38,7 @@ |
38 | <!-- 内容框架 --> | 38 | <!-- 内容框架 --> |
39 | <div class="containerFrame"> | 39 | <div class="containerFrame"> |
40 | <!-- 左侧菜单栏 区分业务--> | 40 | <!-- 左侧菜单栏 区分业务--> |
41 | <segmentMenu v-if="['A0320099', 'A0330099'].includes(slsq.djqxbm)" | 41 | <segmentMenu v-if="['A0320099', 'A0330099','A04300S1','A04200S2','A0830S1'].includes(slsq.djqxbm)" |
42 | @getCurrentSelectProps="getCurrentSelectProps" /> | 42 | @getCurrentSelectProps="getCurrentSelectProps" /> |
43 | <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" /> | 43 | <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" /> |
44 | <div class="leftCon"> | 44 | <div class="leftCon"> | ... | ... |
... | @@ -26,7 +26,7 @@ | ... | @@ -26,7 +26,7 @@ |
26 | <!-- 内容框架 --> | 26 | <!-- 内容框架 --> |
27 | <div class="containerFrame"> | 27 | <div class="containerFrame"> |
28 | <!-- 左侧菜单栏 区分业务--> | 28 | <!-- 左侧菜单栏 区分业务--> |
29 | <segmentMenu v-if="['A0320099','A0330099' ].includes(slsq.djqxbm)" @getCurrentSelectProps="getCurrentSelectProps" /> | 29 | <segmentMenu v-if="['A0320099','A0330099' ,'A04300S1','A04200S2','A0830S1'].includes(slsq.djqxbm)" @getCurrentSelectProps="getCurrentSelectProps" /> |
30 | <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" /> | 30 | <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" /> |
31 | 31 | ||
32 | <div class="leftCon"> | 32 | <div class="leftCon"> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-07-19 14:08:17 | 4 | * @LastEditTime: 2024-01-23 09:44:44 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <dialogBox :isButton="false" :isFullscreen="false" width="50%" @closeDialog="closeDialog" v-model="myValue" | 7 | <dialogBox :isButton="false" :isFullscreen="false" width="50%" @closeDialog="closeDialog" v-model="myValue" |
8 | title="高级搜索"> | 8 | title="高级搜索"> |
9 | <el-form :model="ruleForm" ref="ruleForm" label-width="100px"> | 9 | <el-form :model="ruleForm" ref="ruleForm" label-width="100px"> |
10 | <el-row> | 10 | <el-row> |
11 | <el-col :span="8"> | 11 | <!-- <el-col :span="8"> |
12 | <el-form-item label="申请业务名称" prop="sqywmc"> | 12 | <el-form-item label="申请业务名称" prop="sqywmc"> |
13 | <el-input v-model.trim="ruleForm.sqywmc" clearable placeholder="请输入申请业务名称"></el-input> | 13 | <el-input v-model.trim="ruleForm.sqywmc" clearable placeholder="请输入申请业务名称"></el-input> |
14 | </el-form-item> | 14 | </el-form-item> |
15 | </el-col> | 15 | </el-col> --> |
16 | <el-col :span="8"> | 16 | <el-col :span="8"> |
17 | <el-form-item label="权利人" prop="qlrmc"> | 17 | <el-form-item label="权利人" prop="qlrmc"> |
18 | <el-input v-model.trim="ruleForm.qlrmc" clearable placeholder="请输入权利人"></el-input> | 18 | <el-input v-model.trim="ruleForm.qlrmc" clearable placeholder="请输入权利人"></el-input> |
... | @@ -23,8 +23,11 @@ | ... | @@ -23,8 +23,11 @@ |
23 | <el-input v-model.trim="ruleForm.ywrmc" clearable placeholder="请输入义务人"></el-input> | 23 | <el-input v-model.trim="ruleForm.ywrmc" clearable placeholder="请输入义务人"></el-input> |
24 | </el-form-item> | 24 | </el-form-item> |
25 | </el-col> | 25 | </el-col> |
26 | <el-col :span="8" class="btnColRight"> | ||
27 | <el-button type="primary" icon="el-icon-search" @click="submitForm('ruleForm')">查询</el-button> | ||
28 | </el-col> | ||
26 | </el-row> | 29 | </el-row> |
27 | <el-row> | 30 | <!-- <el-row> |
28 | <el-col :span="8"> | 31 | <el-col :span="8"> |
29 | <el-form-item label="受理时间" prop="slsj"> | 32 | <el-form-item label="受理时间" prop="slsj"> |
30 | <el-date-picker v-model="ruleForm.slsj" value-format="yyyy-MM-dd" class="width100" type="date" | 33 | <el-date-picker v-model="ruleForm.slsj" value-format="yyyy-MM-dd" class="width100" type="date" |
... | @@ -32,11 +35,11 @@ | ... | @@ -32,11 +35,11 @@ |
32 | </el-date-picker> | 35 | </el-date-picker> |
33 | </el-form-item> | 36 | </el-form-item> |
34 | </el-col> | 37 | </el-col> |
35 | </el-row> | 38 | </el-row> --> |
36 | <el-row class="search-btn"> | 39 | <el-row class="search-btn"> |
37 | <el-button type="text" @click.native="closeDialog">收起搜索</el-button> | 40 | <!-- <el-button type="text" @click.native="closeDialog">收起搜索</el-button> --> |
38 | <el-button type="primary" icon="el-icon-search" @click="submitForm('ruleForm')">查询</el-button> | 41 | <!-- <el-button type="primary" icon="el-icon-search" @click="submitForm('ruleForm')">查询</el-button> --> |
39 | <el-button icon="el-icon-refresh-left" @click="resetForm('ruleForm')">重置</el-button> | 42 | <!-- <el-button icon="el-icon-refresh-left" @click="resetForm('ruleForm')">重置</el-button> --> |
40 | </el-row> | 43 | </el-row> |
41 | </el-form> | 44 | </el-form> |
42 | </dialogBox> | 45 | </dialogBox> | ... | ... |
-
Please register or sign in to post a comment