stjdydayou 4 년 전
부모
커밋
18b665fbae
2개의 변경된 파일25개의 추가작업 그리고 16개의 파일을 삭제
  1. 24 16
      src/views/category/organization/index.vue
  2. 1 0
      src/views/equipment/passenger/DialogForm.vue

+ 24 - 16
src/views/category/organization/index.vue

@@ -3,19 +3,19 @@
 
     <el-form :model="queryForm" inline size="small">
       <el-form-item label="公司名称">
-        <el-input v-model="queryForm.name" placeholder="公司名称" />
+        <el-input v-model="queryForm.name" placeholder="公司名称"/>
       </el-form-item>
       <el-form-item label="统一社会信用编码">
-        <el-input v-model="queryForm.socialCode" placeholder="统一社会信用编码" />
+        <el-input v-model="queryForm.socialCode" placeholder="统一社会信用编码"/>
       </el-form-item>
       <el-form-item label="法人姓名">
-        <el-input v-model="queryForm.legalPersonName" placeholder="法人姓名" />
+        <el-input v-model="queryForm.legalPersonName" placeholder="法人姓名"/>
       </el-form-item>
       <el-form-item label="联系人">
-        <el-input v-model="queryForm.contacts" placeholder="联系人" />
+        <el-input v-model="queryForm.contacts" placeholder="联系人"/>
       </el-form-item>
       <el-form-item label="联系电话">
-        <el-input v-model="queryForm.contactNumber" placeholder="联系电话" />
+        <el-input v-model="queryForm.contactNumber" placeholder="联系电话"/>
       </el-form-item>
     </el-form>
     <el-row class="action-bar-container" type="flex" justify="end">
@@ -37,16 +37,24 @@
       highlight-current-row
       @selection-change="selectionChange"
     >
-      <el-table-column type="selection" width="55" />
-      <el-table-column label="ID" prop="id" width="150" />
-      <el-table-column label="公司名称" prop="name" width="200" />
-      <el-table-column label="统一社会信用编码" prop="socialCode" width="200" />
-      <el-table-column label="法人姓名" prop="legalPersonName" width="150" />
-      <el-table-column label="联系人" prop="contacts" width="200" />
-      <el-table-column label="联系电话" prop="contactNumber" width="200" />
-      <el-table-column label="联系地址" prop="contactAddress" width="300" />
-      <el-table-column label="备注说明" prop="remark" min-width="300" />
-      <el-table-column label="创建时间" prop="createdTime" :formatter="dateTimeFormatter" width="180" />
+      <el-table-column type="selection" width="55"/>
+      <el-table-column label="ID" prop="id" width="150"/>
+      <el-table-column label="公司名称" prop="name" width="200">
+        <template slot-scope="scope">
+          {{ scope.row.name }}
+          <el-tooltip placement="top">
+            <div slot="content">{{ scope.row.remark }}</div>
+            <i class="el-icon-info"></i>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column label="统一社会信用编码" prop="socialCode" width="200"/>
+      <el-table-column label="法人姓名" prop="legalPersonName" width="150"/>
+      <el-table-column label="联系人" prop="contacts" width="200"/>
+      <el-table-column label="联系电话" prop="contactNumber" width="200"/>
+      <el-table-column label="联系地址" prop="contactAddress" width="300"/>
+<!--      <el-table-column label="备注说明" prop="remark" min-width="300"/>-->
+      <el-table-column label="创建时间" prop="createdTime" :formatter="dateTimeFormatter" width="180"/>
       <el-table-column label="操作" width="70" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="['category.organization.edit']" type="text" @click.native="$refs.dialogForm.open(scope.row)">编辑</el-button>
@@ -61,7 +69,7 @@
       :page-size="pageData.pageSize"
       @current-change="paginationChange"
     />
-    <dialog-form ref="dialogForm" @ok="fetchData" />
+    <dialog-form ref="dialogForm" @ok="fetchData"/>
   </div>
 </template>
 

+ 1 - 0
src/views/equipment/passenger/DialogForm.vue

@@ -3,6 +3,7 @@
     v-if="visible"
     :title="form.id?'编辑采集设备':'新建采集设备'"
     :visible.sync="visible"
+    width="1200px"
   >
     <el-form v-loading="isLoading" :model="form" label-width="100px" label-position="top">
       <el-row :gutter="24">