feat: dev

src/request/organization.ts

@@ -23,6 +23,9 @@ export type OrganizationType = {
     cityId?: number
     areaId?: number
     provinceId?: number
+    city?: string
+    area?: string
+    province?: string
 
 }
 

src/view/organization.vue

@@ -4,30 +4,17 @@
       <div class="search">
         <el-form label-width="100px" inline>
           <el-form-item label="单位名称">
-            <el-input
-              v-model.trim="pageProps.orgName"
-              clearable
-              style="width: 250px"
-              placeholder="请输入"
-            />
+            <el-input v-model.trim="pageProps.orgName" clearable style="width: 250px" placeholder="请输入" />
           </el-form-item>
           <el-form-item label="类型">
             <el-select style="width: 250px" v-model="pageProps.type" clearable>
-              <el-option
-                :value="Number(key)"
-                :label="type"
-                v-for="(type, key) in OrganizationTypeDesc"
-              />
+              <el-option :value="Number(key)" :label="type" v-for="(type, key) in OrganizationTypeDesc" />
             </el-select>
           </el-form-item>
 
           <el-form-item>
             <el-button type="primary" @click="refresh">查询</el-button>
-            <el-button
-              type="primary"
-              plain
-              @click="pageProps = { ...initProps }"
-            >
+            <el-button type="primary" plain @click="pageProps = { ...initProps }">
               重置
             </el-button>
             <el-button v-if="!isNotSuper" type="primary" @click="addHandler">
@@ -41,41 +28,28 @@
     <div class="relics-content">
       <el-table default-expand-all row-key="orgId" :data="relicsArray" border>
         <el-table-column label="单位名称" prop="orgName"></el-table-column>
-        <el-table-column
-          label="类型"
-          prop="type"
-          v-slot:default="{ row }: { row: OrganizationType }"
-        >
+        <el-table-column label="类型" prop="type" v-slot:default="{ row }: { row: OrganizationType }">
           {{ row.type ? OrganizationTypeDesc[row.type] : "" }}
+
+        </el-table-column>
+        <el-table-column label="行政区划" v-slot:default="{ row }: { row: OrganizationType }">
+          <template v-if="row.province">
+            {{ `${row.province}${row.city}${row.area}` }}
+          </template>
         </el-table-column>
         <el-table-column label="单位账号" prop="userName"></el-table-column>
         <el-table-column label="单位联系人" prop="contact"></el-table-column>
 
-        <el-table-column
-          label="创建时间"
-          prop="updateTime"
-          v-slot:default="{ row }"
-        >
+        <el-table-column label="创建时间" prop="updateTime" v-slot:default="{ row }">
           {{ row.updateTime && row.updateTime.substr(0, 16) }}
         </el-table-column>
         <el-table-column label="创建人" prop="createByName"></el-table-column>
         <el-table-column label="操作" width="100px" fixed="right">
           <template #default="{ row }: { row: OrganizationType }">
-            <el-button
-              link
-              type="primary"
-              @click="editHandler(row)"
-              size="small"
-            >
+            <el-button link type="primary" @click="editHandler(row)" size="small">
               编辑
             </el-button>
-            <el-button
-              link
-              type="danger"
-              v-if="!isNotSuper" 
-              @click="delOrganization(row)"
-              size="small"
-            >
+            <el-button link type="danger" v-if="!isNotSuper" @click="delOrganization(row)" size="small">
               删除
             </el-button>
           </template>
@@ -83,15 +57,9 @@
       </el-table>
     </div>
     <div class="pag-layout">
-      <el-pagination
-        background
-        layout="total, prev, pager, next, sizes, jumper"
-        v-model:page-size="pageProps.pageSize"
-        :page-sizes="[10, 20, 50, 100]"
-        :total="total"
-        @current-change="(data: number) => pageProps.pageNum = data"
-        :current-page="pageProps.pageNum"
-      />
+      <el-pagination background layout="total, prev, pager, next, sizes, jumper" v-model:page-size="pageProps.pageSize"
+        :page-sizes="[10, 20, 50, 100]" :total="total" @current-change="(data: number) => pageProps.pageNum = data"
+        :current-page="pageProps.pageNum" />
     </div>
   </div>
 </template>

src/view/relics.vue

@@ -55,12 +55,17 @@
           </a>
         </el-table-column>
 
-        <el-table-column
+        <!-- <el-table-column
           prop="unicode"
           label="文物编号"
           v-slot:default="{ row }: { row: Relics }"
         >
           <TexToolTip :text="row.unicode" v-if="row.unicode" />
+        </el-table-column> -->
+        <el-table-column label="行政区划" v-slot:default="{ row }: { row: OrganizationType }">
+          <template v-if="row.province">
+            {{ `${row.province}${row.city}${row.area}` }}
+          </template>
         </el-table-column>
 
         <el-table-column label="文物级别" v-slot:default="{ row }: { row: Relics }">