luowei 2 gadi atpakaļ
vecāks
revīzija
a40ab32d69

+ 1 - 1
.env.development

@@ -8,7 +8,7 @@ ENV = 'development'
 #测试地址
 #VUE_APP_BASE_API = 'http://10.87.10.91:8080'
 #罗俊
-VUE_APP_BASE_API = 'http://10.87.10.55:8080'
+#VUE_APP_BASE_API = 'http://10.87.10.55:8080'
 #罗伟
 VUE_APP_BASE_API = 'http://10.87.10.47:8080'
 #高雄

+ 6 - 3
src/views/system/area/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="名称" prop="name">
+      <el-form-item label="区域名称" prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="请输入名称"
@@ -118,7 +118,7 @@
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="名称" prop="name">
+        <el-form-item label="区域名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入名称" />
         </el-form-item>
 
@@ -156,6 +156,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      names:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -230,6 +231,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.names=selection.map(item => item.name)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -272,7 +274,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项?').then(function() {
+      const names=row.name || this.names;
+      this.$modal.confirm('是否确认删除区域名称为"' + names + '"的数据项?').then(function() {
         return delArea(ids);
       }).then(() => {
         this.getList();

+ 3 - 3
src/views/system/bind/index.vue

@@ -28,7 +28,7 @@
 
 
           <el-form-item label="状态" prop="enable">
-            <el-select v-model="form.orgType" placeholder="请选择机构类型">
+            <el-select v-model="queryParams.enable" placeholder="请选择状态">
               <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
                 :value=dict.value></el-option>
             </el-select>
@@ -110,9 +110,9 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="30">
-            <el-form-item label="归属部门" prop="orgId">
+            <el-form-item label="机构名称" prop="orgId">
               <treeselect v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
-                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属部门" />
+                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择机构" />
             </el-form-item>
           </el-col>
         </el-row>

+ 4 - 7
src/views/system/config/index.vue

@@ -80,14 +80,14 @@
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <!-- <el-button
           type="warning"
           plain
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:config:export']"
-        >导出</el-button>
+        >导出</el-button> -->
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -114,11 +114,8 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
+  
+       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button