From 96762c0bc6ca9ee0f3d3329ea86bd3baaa301aa7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 13 Dec 2023 14:00:09 +0800
Subject: [PATCH] md

---
 src/views/emis/emisRegion/emisRegionForm.vue |  62 ++---
 src/views/emis/emisRegion/index.vue          | 252 +++++--------------
 2 files changed, 90 insertions(+), 224 deletions(-)

diff --git a/src/views/emis/emisRegion/emisRegionForm.vue b/src/views/emis/emisRegion/emisRegionForm.vue
index 9fe3da02..322119d2 100644
--- a/src/views/emis/emisRegion/emisRegionForm.vue
+++ b/src/views/emis/emisRegion/emisRegionForm.vue
@@ -17,46 +17,48 @@
               <el-input v-model="form.shortName" placeholder="请输入简称" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="8">
+            <el-form-item label="父区域" prop="parentId">
+              <el-input v-model="form.parentId" placeholder="请输入父区域" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="代码" prop="code">
               <el-input v-model="form.code" placeholder="请输入代码" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="类型" prop="regionType">
-              <el-input v-model="form.regionType" placeholder="请输入类型" />
+          <el-col :span="8">
+            <el-form-item label="国家id" prop="countryId">
+              <el-input v-model="form.countryId" placeholder="请输入国家id" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="8">
+            <el-form-item label="国家大区id" prop="countryAreaId">
+              <el-input v-model="form.countryAreaId" placeholder="请输入国家大区id" />
+            </el-form-item>
+          </el-col>
+        <el-col :span="8">
+            <el-form-item label="类型" prop="regionType">
+              <el-select v-model="form.regionType" placeholder="请选择类型">
+                <el-option
+                  v-for="dict in dict.type.emis_region_level_type"
+                  :key="dict.value"
+                  :label="dict.label"
+:value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+        </el-col>
+          <el-col :span="8">
             <el-form-item label="邮编" prop="zipCode">
               <el-input v-model="form.zipCode" placeholder="请输入邮编" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+        <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="删除标志（0代表存在" prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="区域名称" prop="areaName">
-              <el-input v-model="form.areaName" placeholder="请输入区域名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="国家代码" prop="countryCode">
-              <el-input v-model="form.countryCode" placeholder="请输入国家代码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="国家名称" prop="countryName">
-              <el-input v-model="form.countryName" placeholder="请输入国家名称" />
-            </el-form-item>
-          </el-col>
+        </el-col>
 
          <el-form-item label="上级字典">
               <treeselect
@@ -91,6 +93,7 @@ export default {
   },
   components: {  },
   dicts: [
+        'emis_region_level_type',
   ],
   data() {
     return {
@@ -101,9 +104,6 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
-        ],
         regionName: [
           { required: true, message: "区域名称不能为空", trigger: "blur" }
         ],
diff --git a/src/views/emis/emisRegion/index.vue b/src/views/emis/emisRegion/index.vue
index dd13bfa7..981ac9ba 100644
--- a/src/views/emis/emisRegion/index.vue
+++ b/src/views/emis/emisRegion/index.vue
@@ -10,85 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="regionNameEn">
-        <el-input
-          v-model="queryParams.regionNameEn"
-          placeholder="英文名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="shortName">
-        <el-input
-          v-model="queryParams.shortName"
-          placeholder="简称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="" prop="regionType">
-        <el-input
-          v-model="queryParams.regionType"
-          placeholder="类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="zipCode">
-        <el-input
-          v-model="queryParams.zipCode"
-          placeholder="邮编"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          placeholder="删除标志（0代表存在"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="areaName">
-        <el-input
-          v-model="queryParams.areaName"
-          placeholder="区域名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="countryCode">
-        <el-input
-          v-model="queryParams.countryCode"
-          placeholder="国家代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="countryName">
-        <el-input
-          v-model="queryParams.countryName"
-          placeholder="国家名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.regionType" placeholder="类型" clearable>
+          <el-option
+            v-for="dict in dict.type.emis_region_level_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -107,7 +37,7 @@
           v-hasPermi="['emis:emisRegion:add']"
         >新增</el-button>
       </el-col>
-      <!-- 
+      <!--
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -143,55 +73,23 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="emisRegionList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="emisRegionList" @selection-change="handleSelectionChange"
+          row-key="id"
+          :default-expand-all="isExpandAll"
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-       <!--
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
-
-      <el-table-column label="结算状态" align="center" prop="settleStatus" min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
-      -->
-
       <el-table-column label="区域名称" align="center" prop="regionName" min-width="100" />
-      <el-table-column label="英文名称" align="center" prop="regionNameEn" min-width="100" />
-      <el-table-column label="简称" align="center" prop="shortName" min-width="100" />
-      <el-table-column label="代码" align="center" prop="code" min-width="100" />
-      <el-table-column label="类型" align="center" prop="regionType" min-width="100" />
-      <el-table-column label="邮编" align="center" prop="zipCode" min-width="100" />
-      <el-table-column label="备注" align="center" prop="remark" min-width="100" />
-      <el-table-column label="删除标志（0代表存在" align="center" prop="delFlag" min-width="100" />
-      <el-table-column label="区域名称" align="center" prop="areaName" min-width="100" />
-      <el-table-column label="国家代码" align="center" prop="countryCode" min-width="100" />
-      <el-table-column label="国家名称" align="center" prop="countryName" min-width="100" />
+      <el-table-column label="区域编码" align="center" prop="zipCode" min-width="100" />
+      <!-- <el-table-column label="英文名称" align="center" prop="regionNameEn" min-width="100" /> -->
+      <!-- <el-table-column label="简称" align="center" prop="shortName" min-width="100" /> -->
+      <el-table-column label="类型" align="center" prop="regionType" min-width="100" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_region_level_type" :value="scope.row.regionType"/>
+          </template>
+       </el-table-column>
+
+      <!-- <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -201,7 +99,7 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['emis:emisRegion:edit']"
           >修改</el-button>
-          <!-- 
+          <!--
           <el-button
             size="mini"
             type="text"
@@ -212,16 +110,6 @@
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page-sizes="[20,50,100,300,500,1000,2000,5000]"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-size="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改四级省市区镇表对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
@@ -242,53 +130,48 @@
               <el-input v-model="form.shortName" placeholder="请输入简称" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="8">
+            <el-form-item label="父区域" prop="parentId">
+              <el-input v-model="form.parentId" placeholder="请输入父区域" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="代码" prop="code">
               <el-input v-model="form.code" placeholder="请输入代码" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="类型" prop="regionType">
-              <el-input v-model="form.regionType" placeholder="请输入类型" />
+          <el-col :span="8">
+            <el-form-item label="国家id" prop="countryId">
+              <el-input v-model="form.countryId" placeholder="请输入国家id" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="8">
+            <el-form-item label="国家大区id" prop="countryAreaId">
+              <el-input v-model="form.countryAreaId" placeholder="请输入国家大区id" />
+            </el-form-item>
+          </el-col>
+        <el-col :span="8">
+            <el-form-item label="类型" prop="regionType">
+              <el-select v-model="form.regionType" placeholder="请选择类型">
+                <el-option
+                  v-for="dict in dict.type.emis_region_level_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+        </el-col>
+          <el-col :span="8">
             <el-form-item label="邮编" prop="zipCode">
               <el-input v-model="form.zipCode" placeholder="请输入邮编" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+        <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="删除标志（0代表存在" prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="区域名称" prop="areaName">
-              <el-input v-model="form.areaName" placeholder="请输入区域名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="国家代码" prop="countryCode">
-              <el-input v-model="form.countryCode" placeholder="请输入国家代码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="国家名称" prop="countryName">
-              <el-input v-model="form.countryName" placeholder="请输入国家名称" />
-            </el-form-item>
-          </el-col>
-
-         <!-- 
-         <el-col :span="24" v-show="moreInputVisible" >  </el-col>
-         <el-col :span="24">
-             <el-divider content-position="right"  @click="handleShowMoreInput" >更多信息[+]</el-divider>
-         </el-col> 
-         -->
+        </el-col>
 
         </el-form>
       </el-row>
@@ -321,6 +204,7 @@ export default {
   name: "emisRegion",
   components: { elDateSimplePicker,emisRegionView,emisRegionForm },
   dicts: [
+        'emis_region_level_type',
   ],
   data() {
     return {
@@ -358,9 +242,9 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-      // 国家名称时间范围
+      // 备注时间范围
       daterangeCreateTime: [],
-      // 国家名称时间范围
+      // 备注时间范围
       daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
@@ -369,22 +253,13 @@ export default {
         regionName: null,
         regionNameEn: null,
         shortName: null,
-        code: null,
         regionType: null,
         zipCode: null,
-        remark: null,
-        delFlag: null,
-        areaName: null,
-        countryCode: null,
-        countryName: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
-        ],
         regionName: [
           { required: true, message: "区域名称不能为空", trigger: "blur" }
         ],
@@ -405,17 +280,8 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.params = {};
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
       listEmisRegion(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
-        this.emisRegionList = response.rows;
-        this.total = response.total;
+        this.emisRegionList = this.handleTree(response.data, "id");
         this.loading = false;
       });
     },