新增区域管理

src/api/ecw/bankAccount.js

@@ -18,6 +18,16 @@ export function updateBankAccount(data) {
   })
 }
 
+// 更新银行账户
+export function updateBankAccountStatus(data) {
+  return request({
+    url: '/ecw/bank-account/updateStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+
 // 删除银行账户
 export function deleteBankAccount(id) {
   return request({

src/api/ecw/currency.js

@@ -18,6 +18,15 @@ export function updateCurrency(data) {
   })
 }
 
+// 更新
+export function updateCurrencyStatus(data) {
+  return request({
+    url: '/ecw/currency/updateStatus',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除
 export function deleteCurrency(id) {
   return request({

src/api/ecw/region.js

+import request from '@/utils/request'
+
+// 创建区域设置
+export function createRegion(data) {
+  return request({
+    url: '/ecw/region/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新区域设置
+export function updateRegion(data) {
+  return request({
+    url: '/ecw/region/update',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 更新区域设置
+export function updateRegionStatus(data) {
+  return request({
+    url: '/ecw/region/updateStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除区域设置
+export function deleteRegion(id) {
+  return request({
+    url: '/ecw/region/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得区域设置
+export function getRegion(id) {
+  return request({
+    url: '/ecw/region/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得区域设置分页
+export function getRegionPage(query) {
+  return request({
+    url: '/ecw/region/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得区域设置分页
+export function getRegionList(query) {
+  return request({
+    url: '/ecw/region/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出区域设置 Excel
+export function exportRegionExcel(query) {
+  return request({
+    url: '/ecw/region/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/ecw/unit.js

@@ -18,6 +18,15 @@ export function updateUnit(data) {
   })
 }
 
+// 更新计量单位
+export function updateUnitStatus(data) {
+  return request({
+    url: '/ecw/unit/updateStatus',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除计量单位
 export function deleteUnit(id) {
   return request({

src/views/ecw/bankAccount/index.vue

@@ -155,7 +155,15 @@
 </template>
 
 <script>
-import { createBankAccount, updateBankAccount, deleteBankAccount, getBankAccount, getBankAccountPage, exportBankAccountExcel } from "@/api/ecw/bankAccount";
+import {
+  createBankAccount,
+  updateBankAccount,
+  deleteBankAccount,
+  getBankAccount,
+  getBankAccountPage,
+  exportBankAccountExcel,
+  updateBankAccountStatus
+} from "@/api/ecw/bankAccount";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import {CommonStatusEnum} from "@/utils/constants";
 import {changeUserStatus} from "@/api/system/user";
@@ -279,7 +287,7 @@ export default {
     handleStatusChange(row) {
       let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
       this.$modal.confirm('确认要' + text + '编号为' + row.id + '的数据吗?').then(function() {
-        return changeUserStatus(row.id, row.status);
+        return updateBankAccountStatus({id:row.id,status:!row.status?CommonStatusEnum.DISABLE:CommonStatusEnum.ENABLE});
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {

src/views/ecw/currency/index.vue

@@ -121,10 +121,19 @@
 </template>
 
 <script>
-import { createCurrency, updateCurrency, deleteCurrency, getCurrency, getCurrencyPage, exportCurrencyExcel } from "@/api/ecw/currency";
+import {
+  createCurrency,
+  updateCurrency,
+  deleteCurrency,
+  getCurrency,
+  getCurrencyPage,
+  exportCurrencyExcel,
+  updateCurrencyStatus
+} from "@/api/ecw/currency";
 import {CommonStatusEnum} from "@/utils/constants";
 import {changeUserStatus} from "@/api/system/user";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import {updateBankAccount} from "@/api/ecw/bankAccount";
 
 export default {
   name: "Currency",
@@ -224,7 +233,9 @@ export default {
     handleStatusChange(row) {
       let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
       this.$modal.confirm('确认要' + text + '"' + row.titleZh + '"吗?').then(function() {
-        return changeUserStatus(row.id, row.status);
+        // return changeUserStatus(row.id, row.status);
+        return updateCurrencyStatus({id:row.id,status:!row.status?CommonStatusEnum.DISABLE:CommonStatusEnum.ENABLE});
+
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {

src/views/ecw/region/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+      <el-form-item label="中文名称" prop="titleZh">
+        <el-input v-model="queryParams.titleZh" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="英文名称" prop="titleEn">
+        <el-input v-model="queryParams.titleZh" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="语言" prop="language">
+        <el-input v-model="queryParams.language" placeholder="请输入语言" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['ecw:region:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+  <!--列表-->
+    <el-table v-if="refreshTable" v-loading="loading" :data="regionList" row-key="id" :default-expand-all="isExpandAll"
+              :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column prop="titleZh" label="中文名称" width="260"></el-table-column>
+      <el-table-column prop="titleEn" label="英文名称" width="260"></el-table-column>
+      <el-table-column prop="shortName" label="简称"  width="120"/>
+      <el-table-column label="语言" align="center" prop="language" />
+      <el-table-column prop="sort" label="排序" width="200"></el-table-column>
+<!--      <el-table-column prop="parentId" label="父节点" width="200"></el-table-column>-->
+      <el-table-column prop="status" label="状态" width="100">
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>-->
+<!--        </template>-->
+        <template slot-scope="scope">
+          <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['ecw:region:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
+                     v-hasPermi="['ecw:region:create']">新增</el-button>
+          <el-button v-if="scope.row.parentId !== 0" size="mini" type="text" icon="el-icon-delete"
+                     @click="handleDelete(scope.row)" v-hasPermi="['ecw:region:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改部门对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="上级区域" prop="parentId">
+              <treeselect v-model="form.parentId" :options="regionOptions" :normalizer="normalizer" placeholder="选择上级区域" />
+            </el-form-item>
+          </el-col>
+          <el-form-item label="中文名称" prop="titleZh">
+            <el-input v-model="form.titleZh" placeholder="请输入中文名称" />
+          </el-form-item>
+          <el-form-item label="英文名称" prop="titleEn">
+            <el-input v-model="form.titleEn" placeholder="请输入英文名称" />
+          </el-form-item>
+          <el-form-item label="简称" prop="shortName">
+            <el-input v-model="form.shortName" placeholder="请输入简称" />
+          </el-form-item>
+          <el-form-item label="语言" prop="language">
+            <el-input v-model="form.language" placeholder="请输入语言" />
+          </el-form-item>
+          <el-form-item label="显示顺序" prop="sort">
+            <el-input v-model="form.sort" placeholder="请输入显示顺序" />
+          </el-form-item>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="部门状态" prop="status">-->
+<!--              <el-radio-group v-model="form.status">-->
+<!--                <el-radio v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">-->
+<!--                  {{dict.label}}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import { listDept, getDept, delDept, addDept, updateDept } from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+import {CommonStatusEnum} from '@/utils/constants'
+import { getDictDatas, DICT_TYPE } from '@/utils/dict'
+import {
+  getRegion,
+  getRegionList,
+  getRegionPage,
+  updateRegion,
+  createRegion,
+  deleteRegion,
+  updateRegionStatus
+} from "@/api/ecw/region";
+import {changeUserStatus} from "@/api/system/user";
+import {updateBankAccount} from "@/api/ecw/bankAccount";
+
+export default {
+  name: "Region",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 表格树数据
+      regionList: [],
+      // 部门树选项
+      regionOptions: [],
+      // 用户下拉列表
+      users: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 是否展开
+      expand: false,
+      // 状态数据字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        titleZh: undefined,
+        titleEn: undefined,
+        shortName: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        titleZh: [{ required: true, message: "中文名称不能为空", trigger: "blur" }],
+        titleEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }],
+        shortName: [{ required: true, message: "简称不能为空", trigger: "blur" }],
+        // language: [{ required: true, message: "语言不能为空", trigger: "blur" }],
+        // type: [{ required: true, message: "类型不能为空", trigger: "change" }],
+        // parentId: [{ required: true, message: "父区域id不能为空", trigger: "blur" }],
+        sort: [{ required: true, message: "显示顺序不能为空", trigger: "blur" }],
+      },
+
+      // 枚举
+      CommonStatusEnum: CommonStatusEnum,
+      // 数据字典
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
+    };
+  },
+  created() {
+    this.getList();
+    // 获得用户列表
+    listSimpleUsers().then(response => {
+      this.users = response.data;
+    });
+  },
+  methods: {
+    /** 查询部门列表 */
+    getList() {
+      this.loading = true;
+      getRegionList(this.queryParams).then(response => {
+        console.log("response:"+JSON.stringify(response.data));
+        this.regionList = this.handleTree(response.data, "id");
+        this.loading = false;
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      console.log("normalizer:"+JSON.stringify(node)+" node.children:"+JSON.stringify(node.children));
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.titleZh,
+        children: node.children
+      };
+    },
+    // 用户昵称展示
+    // userNicknameFormat(row, column) {
+    //   if (!row.leaderUserId) {
+    //     return '未设置';
+    //   }
+    //   for (const user of this.users) {
+    //     if (row.leaderUserId === user.id) {
+    //       return user.nickname;
+    //     }
+    //   }
+    //   return '未知【' + row.leaderUserId + '】';
+    // },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
+      this.$modal.confirm('确认要' + text + '编号为' + row.id + '的数据吗?').then(function() {
+        // return changeUserStatus(row.id, row.status);
+        return updateRegionStatus({id:row.id,status:!row.status?CommonStatusEnum.DISABLE:CommonStatusEnum.ENABLE});
+
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+          : CommonStatusEnum.ENABLE;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        parentId: undefined,
+        name: undefined,
+        sort: undefined,
+        leaderUserId: undefined,
+        phone: undefined,
+        email: undefined,
+        status: CommonStatusEnum.ENABLE,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      if (row !== undefined) {
+        this.form.parentId = row.id;
+      }
+      this.open = true;
+      this.title = "添加区域";
+      getRegionList().then(response => {
+        console.log("添加区域查询结果:"+JSON.stringify(response.data));
+        this.regionOptions = this.handleTree(response.data, "id");
+        console.log("regionOptions:"+JSON.stringify(this.regionOptions));
+      });
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      getRegion(row.id).then(response => {
+        this.form = response.data;
+        console.log("getRegion("+row.id+"):"+JSON.stringify(this.form));
+        if (this.form.parentId === 0) { // 无父部门时，标记为 undefined，避免展示为 Unknown
+          this.form.parentId = undefined;
+        }
+        this.open = true;
+        this.title = "修改区域";
+      });
+      getRegionList(row.id).then(response => {
+        console.log("getRegionList("+row.id+"):"+JSON.stringify(response.data));
+        this.regionOptions = this.handleTree(response.data, "id");
+        console.log("getRegionList("+row.id+"):  regionOptions"+JSON.stringify(this.regionOptions));
+
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updateRegion(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            createRegion(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除名称为"' + row.titleZh + '"的数据项?').then(function() {
+        return deleteRegion(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/ecw/unit/index.vue

@@ -108,10 +108,19 @@
 </template>
 
 <script>
-import { createUnit, updateUnit, deleteUnit, getUnit, getUnitPage, exportUnitExcel } from "@/api/ecw/unit";
+import {
+  createUnit,
+  updateUnit,
+  deleteUnit,
+  getUnit,
+  getUnitPage,
+  exportUnitExcel,
+  updateUnitStatus
+} from "@/api/ecw/unit";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import {CommonStatusEnum} from "@/utils/constants";
 import {changeUserStatus} from "@/api/system/user";
+import {updateBankAccount} from "@/api/ecw/bankAccount";
 
 export default {
   name: "Unit",
@@ -203,7 +212,9 @@ export default {
     handleStatusChange(row) {
       let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
       this.$modal.confirm('确认要' + text + '"' + row.titleZh + '"吗?').then(function() {
-        return changeUserStatus(row.id, row.status);
+        // return changeUserStatus(row.id, row.status);
+        return updateUnitStatus({id:row.id,status:!row.status?CommonStatusEnum.DISABLE:CommonStatusEnum.ENABLE});
+
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {