Merge branch 'dev'

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:30:58
+ * @LastEditTime: 2024-01-22 17:12:09
  */
 import request from '@/utils/request'
 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
  * @param data
  * @author ssq 2023年5月26日14点29分
  */
-export function BatchInit(data){
+export function BatchInit (data) {
   let apiUrl = "";
   switch (data.get("djlx")) {
     case "100":

@@ -2,7 +2,7 @@
 /*
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 14:20:39
+ * @LastEditTime: 2024-01-22 17:02:42
  */
 import axios from 'axios'
 import Router from '@/router'
@@ -18,7 +18,7 @@ const service = axios.create({
             : window._config.baseUrl + "/",
     withCredentials: true,  //是否允许跨域
     headers: {
-        'Content-Type': 'application/json; charset=utf-8'
+        'Content-Type': 'application/json'
     },
     timeout: 15000
 })

@@ -530,6 +530,8 @@
             context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 725, 125);
             // 恢复原始字体设置
             context.font = originalFont;
+          } else {
+            context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 170, 56);
           }
 
           context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123);

@@ -452,6 +452,8 @@
             context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 725, 125);
             // 恢复原始字体设置
             context.font = originalFont;
+          } else {
+            context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 170, 56);
           }
 
           context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123);

@@ -38,7 +38,7 @@
     <!-- 内容框架 -->
     <div class="containerFrame">
       <!-- 左侧菜单栏 区分业务-->
-      <segmentMenu v-if="['A0320099', 'A0330099'].includes(slsq.djqxbm)"
+      <segmentMenu v-if="['A0320099', 'A0330099','A04300S1','A04200S2','A0830S1'].includes(slsq.djqxbm)"
         @getCurrentSelectProps="getCurrentSelectProps" />
       <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" />
       <div class="leftCon">

@@ -26,7 +26,7 @@
     <!-- 内容框架 -->
     <div class="containerFrame">
       <!-- 左侧菜单栏 区分业务-->
-      <segmentMenu v-if="['A0320099','A0330099' ].includes(slsq.djqxbm)" @getCurrentSelectProps="getCurrentSelectProps" />
+      <segmentMenu v-if="['A0320099','A0330099' ,'A04300S1','A04200S2','A0830S1'].includes(slsq.djqxbm)" @getCurrentSelectProps="getCurrentSelectProps" />
       <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" />
 
       <div class="leftCon">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 14:08:17
+ * @LastEditTime: 2024-01-23 09:44:44
 -->
 <template>
   <dialogBox :isButton="false" :isFullscreen="false" width="50%" @closeDialog="closeDialog" v-model="myValue"
     title="高级搜索">
     <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
       <el-row>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="申请业务名称" prop="sqywmc">
             <el-input v-model.trim="ruleForm.sqywmc" clearable placeholder="请输入申请业务名称"></el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="8">
           <el-form-item label="权利人" prop="qlrmc">
             <el-input v-model.trim="ruleForm.qlrmc" clearable placeholder="请输入权利人"></el-input>
@@ -23,8 +23,11 @@
             <el-input v-model.trim="ruleForm.ywrmc" clearable placeholder="请输入义务人"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="8" class="btnColRight">
+          <el-button type="primary" icon="el-icon-search" @click="submitForm('ruleForm')">查询</el-button>
+        </el-col>
       </el-row>
-      <el-row>
+      <!-- <el-row>
         <el-col :span="8">
           <el-form-item label="受理时间" prop="slsj">
             <el-date-picker v-model="ruleForm.slsj" value-format="yyyy-MM-dd" class="width100" type="date"
@@ -32,11 +35,11 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row class="search-btn">
-        <el-button type="text" @click.native="closeDialog">收起搜索</el-button>
-        <el-button type="primary" icon="el-icon-search" @click="submitForm('ruleForm')">查询</el-button>
-        <el-button icon="el-icon-refresh-left" @click="resetForm('ruleForm')">重置</el-button>
+        <!-- <el-button type="text" @click.native="closeDialog">收起搜索</el-button> -->
+        <!-- <el-button type="primary" icon="el-icon-search" @click="submitForm('ruleForm')">查询</el-button> -->
+        <!-- <el-button icon="el-icon-refresh-left" @click="resetForm('ruleForm')">重置</el-button> -->
       </el-row>
     </el-form>
   </dialogBox>

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 16:19:51
+ * @LastEditTime: 2024-01-22 17:08:30
 -->
 <template>
   <div class="slxx">