修改bug

src/api/enterprise/recordCompany/types.ts

@@ -395,6 +395,9 @@ export interface RecordCompanyQuery extends PageQuery {
      */
     params?: any;
     supervisionType?: string;
+    cpyType?: string;
+
+    supervisionArea?: string;
 }
 
 /**

src/views/settled/control/index.vue

@@ -19,6 +19,31 @@
                                 <el-input v-model="queryParams.creditCode" placeholder="请输入信用代码" clearable @keyup.enter="handleQuery" />
                             </el-form-item>
                         </el-col>
+                        <el-col :xl="6" :lg="8" :sm="12">
+                            <el-form-item label="所在行政区" prop="adcdCode">
+                                <AreaCascader :zlevel="2" v-model="queryParams.adcdCode" checkStrictly></AreaCascader>
+                            </el-form-item>
+                        </el-col>
+                        <!-- 企业类型查询 -->
+                        <el-col :xl="6" :lg="8" :sm="12">
+                            <el-form-item label="企业类型" prop="cpyType">
+                                <el-select v-model="queryParams.cpyType" placeholder="请选择企业类型" clearable>
+                                    <el-option v-for="item in cpy_type" :key="item.value" :label="item.label" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :xl="6" :lg="8" :sm="12">
+                            <el-form-item label="监管类型" prop="supervisionType">
+                                <el-select v-model="queryParams.supervisionType" placeholder="请选择监管类型" clearable>
+                                    <el-option v-for="item in supervision_type" :key="item.value" :label="item.label" :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :xl="6" :lg="8" :sm="12">
+                            <el-form-item label="监管区域" prop="supervisionArea">
+                                <AreaCascader :zlevel="2" v-model="queryParams.supervisionArea" checkStrictly></AreaCascader>
+                            </el-form-item>
+                        </el-col>
                         <el-col :xl="6" :lg="8" :sm="12">
                             <el-form-item>
                                 <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -32,6 +57,11 @@
         <el-card shadow="never">
             <el-table v-loading="loading" :data="recordCompanyList" border @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55" align="center" />
+                <el-table-column label="企业类型" align="center">
+                    <template #default="{ row }">
+                        <span>{{ selectDictLabel(cpy_type, row.cpyType) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="企业名称" align="center" prop="cpyName" />
                 <el-table-column label="企业logo" align="center" prop="license" width="100">
                     <template #default="scope">
@@ -52,6 +82,13 @@
                         </template>
                     </template>
                 </el-table-column>
+                <!-- 监管区域 -->
+                <el-table-column label="监管类型" align="center">
+                    <template #default="{ row }">
+                        <span>{{ selectDictLabel(supervision_type, row.supervisionType) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="监管区域" align="center" prop="supervisionAreaName" />
                 <el-table-column label="所在行政区" align="center" prop="adcdCode">
                     <template #default="{ row }">
                         <AreaView :value="row.adcdCode"></AreaView>
@@ -67,23 +104,19 @@
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="280" fixed="right" class-name="small-padding fixed-width">
                     <template #default="{ row }">
-                        <el-button @click="handleUser(row)" type="primary"
-                            ><el-icon><User /></el-icon>维护成员</el-button
-                        >
-                        <el-button @click="$router.push({ path: '/enterprise/cpy-detail', query: { cpyid: row.id } })" type="primary"
-                            ><el-icon><View /></el-icon>查看企业信息</el-button
-                        >
+                        <el-button @click="handleUser(row)" type="primary">
+                            <el-icon><User /></el-icon>
+                            维护成员
+                        </el-button>
+                        <el-button @click="$router.push({ path: '/enterprise/cpy-detail', query: { cpyid: row.id } })" type="primary">
+                            <el-icon><View /></el-icon>
+                            查看企业信息
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
 
-            <pagination
-                v-show="total > 0"
-                :total="total"
-                v-model:page="queryParams.pageNum"
-                v-model:limit="queryParams.pageSize"
-                @pagination="getList"
-            />
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
         </el-card>
     </div>
     <Staff :info="formItem" v-model:show="showUser"></Staff>
@@ -92,10 +125,10 @@
 <script setup name="Control" lang="ts">
 import { listRecordCompany } from '@/api/enterprise/recordCompany';
 import { RecordCompanyVO, RecordCompanyQuery, RecordCompanyForm } from '@/api/enterprise/recordCompany/types';
-import { AreaView } from '@/views/components';
+import { AreaView, AreaCascader } from '@/views/components';
 import { Staff } from '@/views/settled';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { cpy_res_status, cpy_type } = toRefs<any>(proxy?.useDict('cpy_res_status', 'cpy_type'));
+const { cpy_res_status, cpy_type, supervision_type, supervision_area } = toRefs<any>(proxy?.useDict('cpy_res_status', 'cpy_type', 'supervision_type', 'supervision_area'));
 const recordCompanyList = ref<RecordCompanyVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -116,7 +149,9 @@ const initFormData: RecordCompanyForm = {
     adcdCode: undefined,
     address: undefined,
     contactPerson: undefined,
-    tel: undefined
+    tel: undefined,
+    supervisionType: undefined,
+    supervisionArea: undefined
 };
 const data = reactive<PageData<RecordCompanyForm, RecordCompanyQuery>>({
     form: { ...initFormData },
@@ -126,7 +161,11 @@ const data = reactive<PageData<RecordCompanyForm, RecordCompanyQuery>>({
         cpyName: undefined,
         tel: undefined,
         creditCode: undefined,
-        status: '1'
+        status: '1',
+        cpyType: undefined,
+        adcdCode: undefined,
+        supervisionArea: undefined,
+        supervisionType: undefined
     },
     rules: {
         storePhoto: [{ required: true, trigger: 'blur', message: '请上传企业logo' }],

src/views/settled/cpy/index.vue

@@ -3,9 +3,10 @@
         <el-card style="width: 100%;margin-bottom: 16px;" v-loading="qyxxLoadding">
             <el-descriptions title="企业信息" :column="4" border direction="vertical">
                 <template #extra>
-                    <el-button @click="eidtCpy" type="primary" text
-                        ><el-icon><EditPen /></el-icon>编辑</el-button
-                    >
+                    <el-button @click="eidtCpy" type="primary" text>
+                        <el-icon><EditPen /></el-icon>
+                        编辑
+                    </el-button>
                 </template>
                 <el-descriptions-item label="企业logo">
                     <template #default>
@@ -19,16 +20,26 @@
                         {{ '>' + selectDictLabel(supervision_type, form.supervisionType) }}
                     </template>
                 </el-descriptions-item>
+                <!-- 监管类型 -->
+                <el-descriptions-item label="监管类型">{{ selectDictLabel(supervision_type, form.supervisionType) }}</el-descriptions-item>
+                <el-descriptions-item label="监管区域">
+                    {{ form.supervisionAreaName || '-' }}
+                </el-descriptions-item>
+
                 <el-descriptions-item label="统一社会信用代码">{{ form.creditCode }}</el-descriptions-item>
                 <el-descriptions-item label="营业执照" class="d-flex a-c">
                     <template #default>
                         <FileLook v-model="form.license"></FileLook>
                     </template>
                 </el-descriptions-item>
-                <el-descriptions-item label="地址" class="d-flex a-c">
+                <el-descriptions-item label="所在行政区" class="d-flex a-c">
+                    <template #default>
+                        {{ form.adcdCodeName || '-'}}
+                    </template>
+                </el-descriptions-item>
+                <el-descriptions-item label="具体地址" class="d-flex a-c">
                     <template #default>
-                        <AreaView :value="form.adcdCode"></AreaView>
-                        <span>{{ form.address }}</span>
+                        {{ form.address || '-'}}
                     </template>
                 </el-descriptions-item>
                 <el-descriptions-item label="企业联系人">{{ form.contactPerson }}</el-descriptions-item>
@@ -44,9 +55,10 @@
         <el-card style="width: 100%;margin-bottom: 16px;">
             <div class="d-flex j-sb mb10">
                 <div class="f-14 f-w-b mb15">授权应用</div>
-                <el-button @click="addApp(authAppRef)" type="primary" text
-                    ><el-icon><Plus /></el-icon>新增应用</el-button
-                >
+                <el-button @click="addApp(authAppRef)" type="primary" text>
+                    <el-icon><Plus /></el-icon>
+                    新增应用
+                </el-button>
             </div>
             <authApp ref="authAppRef" :cpyid="(query.cpyid as string)"></authApp>
         </el-card>