From 8f246665b2ce3609ffb35342a5949bc52fe8da7b Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Sat, 6 Jul 2024 09:43:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=BE=93=E4=BF=9D=E9=9A=9C=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail.vue                     | 17 ++----
 .../components/list.vue                       | 58 +++++++++----------
 2 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/detail.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/detail.vue
index 6eb2a4d..48f12e5 100644
--- a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/detail.vue
+++ b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/detail.vue
@@ -8,7 +8,7 @@
         <el-button type="primary" @click="goBack">返回基本信息</el-button>
       </div>
     </div>
-    <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+    <el-table ref="multipleTable" :data="[form]" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="ORG_NAME" label="运输机构名称" />
       <el-table-column prop="ORG_TYPE" label="运输机构类型" />
@@ -17,7 +17,7 @@
       <el-table-column prop="POSTAL_CODE" label="邮编" />
       <el-table-column prop="SECURITY_LEVEL" label="机构密级" />
       <el-table-column prop="DUTY_PHONE" label="值班电话" />
-      <el-table-column prop="ADMINISTRATIVE_REGION" label="所属区域" />
+      <el-table-column prop="ADMINISTRATIVE_REGION_NAME" label="所属区域" />
       <el-table-column prop="LONGITUDE" label="经度" />
       <el-table-column prop="LATITUDE" label="纬度" />
       <el-table-column prop="EMERGENCY_TRANSPORT_MODE" label="应急运输方式" />
@@ -70,6 +70,7 @@ export default {
         SECURITY_LEVEL: '',
         DUTY_PHONE: '',
         ADMINISTRATIVE_REGION: '',
+        ADMINISTRATIVE_REGION_NAME: '',
         LONGITUDE: '',
         LATITUDE: '',
         EMERGENCY_TRANSPORT_MODE: '',
@@ -110,7 +111,6 @@ export default {
       this.Id = this.$parent.CASE_ID
       this.getDetail(this.Id)
     }
-    this.getList()
     this.getTreeList()
     this.getDepartmentList()
   },
@@ -118,7 +118,6 @@ export default {
     goBack() {
       this.$parent.activeName = 'list'
     },
-    //* *******************列表查询******************************
     getTreeList() {
       const params = {
         PARENT_ID: '5a5d2809ed644aa6ba97a5240ff35484'
@@ -139,11 +138,6 @@ export default {
         console.error('获取主管单位数据失败', e)
       })
     },
-    //* ****************************数据查看*******************************
-    handleDetail(id) {
-      this.dialogFormShow = true
-      this.getDetail(id)
-    },
     getDetail(Id) {
       const params = { Id: Id }
       requestFN('/major/transportation/detail', params).then((response) => {
@@ -157,6 +151,7 @@ export default {
           SECURITY_LEVEL: data.SECURITY_LEVEL,
           DUTY_PHONE: data.DUTY_PHONE,
           ADMINISTRATIVE_REGION: data.ADMINISTRATIVE_REGION,
+          ADMINISTRATIVE_REGION_NAME: data.ADMINISTRATIVE_REGION_NAME,
           LONGITUDE: data.LONGITUDE,
           LATITUDE: data.LATITUDE,
           EMERGENCY_TRANSPORT_MODE: data.EMERGENCY_TRANSPORT_MODE,
@@ -182,10 +177,6 @@ export default {
       }).catch((e) => {
         console.error('获取详情数据失败', e)
       })
-    },
-    getQuery() {
-      this.$refs.multipleTable.clearSelection()
-      this.getList()
     }
   }
 }
diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue
index c487381..df4b988 100644
--- a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue
@@ -1,10 +1,18 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
-        搜索
-      </el-button>
+      <el-form inline>
+        <el-form-item label="运输机构名称：" prop="KEYWORDS_ORG_NAME">
+          <el-input v-model="KEYWORDS_ORG_NAME" placeholder="运输机构名称" class="filter-item" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="运输机构类型：" prop="KEYWORDS_ORG_TYPE">
+          <el-input v-model="KEYWORDS_ORG_TYPE" placeholder="运输机构类型" class="filter-item" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
+          <el-button class="filter-item" type="default" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
     </div>
     <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
@@ -19,7 +27,7 @@
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('detail', row.ID, '1')">查看</el-button>
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
-          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.NAME)">删除</el-button>
+          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.ORG_NAME)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -154,6 +162,8 @@ export default {
       total: 0,
       varList: [],
       KEYWORDS: '',
+      KEYWORDS_ORG_NAME: '',
+      KEYWORDS_ORG_TYPE: '',
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
@@ -315,6 +325,11 @@ export default {
     this.getDepartmentList()
   },
   methods: {
+    resetQuery() {
+      this.KEYWORDS_ORG_NAME = ''
+      this.KEYWORDS_ORG_TYPE = ''
+      this.getQuery()
+    },
     goList(page, CASE_ID, ticketType) {
       this.$parent.activeName = page
       this.$parent.CASE_ID = CASE_ID
@@ -347,7 +362,8 @@ export default {
       requestFN(
         '/major/transportation/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          name: this.KEYWORDS
+          ORG_NAME: this.KEYWORDS_ORG_NAME,
+          ORG_TYPE: this.KEYWORDS_ORG_TYPE
         }
       ).then((data) => {
         this.listLoading = false
@@ -400,7 +416,7 @@ export default {
           CARGO_TRANSPORT_CAPACITY: data.CARGO_TRANSPORT_CAPACITY,
           EMERGENCY_CAPACITY_DESCRIPTION: data.EMERGENCY_CAPACITY_DESCRIPTION,
           REMARK: data.REMARK,
-          ID: data.ID
+          Id: data.ID
         }
       }).catch((e) => {
         console.error('获取详情数据失败', e)
@@ -413,27 +429,11 @@ export default {
       this.$refs.upload.clearFiles()
     },
     confirm() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          if (this.FFILE.length > 0) {
-            this.upload((v) => {
-              this.form.FILE_URL = v
-              this.$refs.upload.clearFiles()
-              this.dataSave()
-            })
-          } else {
-            this.dataSave()
-          }
-        } else {
-          return false
-        }
-      })
+      this.dataSave()
     },
     dataSave() {
       this.listLoading = true
-      requestFN(
-        '/major/transportation/save', this.form
-      ).then((data) => {
+      requestFN('/major/transportation/save', this.form).then((data) => {
         this.listLoading = false
         this.dialogFormEdit = false
         this.varList = []
@@ -444,15 +444,15 @@ export default {
       })
     },
     //* *****************************删除********************************
-    handleDelete(id, name) {
-      this.$confirm('确定要删除[' + name + ']吗?', {
+    handleDelete(id, ORG_NAME) {
+      this.$confirm('确定要删除[' + ORG_NAME + ']吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.listLoading = true
         requestFN(
-          '/caseLibrary/delete',
+          '/major/transportation/delete',
           {
             id: id
           }
@@ -489,7 +489,7 @@ export default {
       }).then(() => {
         this.listLoading = true
         requestFN(
-          '/caseLibrary/deleteAll',
+          '/major/transportation/deleteAll',
           {
             ids: ids
           }