Browse Source

明天开工

East 4 years ago
parent
commit
dfb894e6e6
3 changed files with 168 additions and 11 deletions
  1. 8 8
      build/webpack.base.conf.js
  2. 159 2
      src/views/modules/basicdata/bunit.vue
  3. 1 1
      static/config/index.js

+ 8 - 8
build/webpack.base.conf.js

@@ -9,14 +9,14 @@ function resolve (dir) {
 }
 
 const createLintingRule = () => ({
-  test: /\.(js|vue)$/,
-  loader: 'eslint-loader',
-  enforce: 'pre',
-  include: [resolve('src'), resolve('test')],
-  options: {
-    formatter: require('eslint-friendly-formatter'),
-    emitWarning: !config.dev.showEslintErrorsInOverlay
-  }
+  // test: /\.(js|vue)$/,
+  // loader: 'eslint-loader',
+  // enforce: 'pre',
+  // include: [resolve('src'), resolve('test')],
+  // options: {
+  //   formatter: require('eslint-friendly-formatter'),
+  //   emitWarning: !config.dev.showEslintErrorsInOverlay
+  // }
 })
 
 module.exports = {

+ 159 - 2
src/views/modules/basicdata/bunit.vue

@@ -1,10 +1,167 @@
 <template>
-  <div>
-    单元管理
+  <div class="branch">
+    <el-form
+      :inline="true"
+      :model="dataForm"
+      @keyup.enter.native="getDataList()">
+      <el-form-item>
+        <el-input
+          v-model="dataForm.key"
+          placeholder="用户名/用户操作"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button v-if="isAuth('sys:role:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button v-if="isAuth('sys:role:delete')" type="danger" @click="deleteHandle()" :disabled="selectionDataList.length <= 0">批量删除</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      @selection-change="selectionChangeHandle"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        header-align="center"
+        align="center"
+        label="名称">
+      </el-table-column>
+      <el-table-column
+        prop="location"
+        header-align="center"
+        align="center"
+        label="地址">
+      </el-table-column>
+      <el-table-column
+        prop="principal"
+        header-align="center"
+        align="center"
+        label="负责人">
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        header-align="center"
+        align="center"
+        :show-overflow-tooltip="true"
+        label="建立日期">
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</el-button>
+          <el-button v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
 </template>
 <script>
 export default {
+  data () {
+    return {
+      dataForm: {
+        key: ''
+      },
+      dataList: [
+        {
+          name: '',
+          location: '',
+          principal: '',
+          date: undefined
+        }
+      ],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      dataListLoading: false,
+      selectionDataList: []
+    }
+  },
+  created () {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList () {
+      // this.dataListLoading = true
+      // this.$http({
+      //   url: this.$http.adornUrl("/sys/log/list"),
+      //   method: "get",
+      //   params: this.$http.adornParams({
+      //     page: this.pageIndex,
+      //     limit: this.pageSize,
+      //     key: this.dataForm.key,
+      //   }),
+      // }).then(({ data }) => {
+      //   if (data && data.code === 0) {
+      //     this.dataList = data.page.list;
+      //     this.totalPage = data.page.totalCount;
+      //   } else {
+      //     this.dataList = [];
+      //     this.totalPage = 0;
+      //   }
+      //   this.dataListLoading = false;
+      // });
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/management/unit/list'),
+        method: 'post',
+        params: this.$http.adornParams({
+          // page: this.pageIndex,
+          // limit: this.pageSize,
+          // key: this.dataForm.key,
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.dataList = data.page.list
+          this.totalPage = data.page.totalCount
+        } else {
+          this.dataList = []
+          this.totalPage = 0
+        }
+        this.dataListLoading = false
+      })
+    },
+    // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+    // 新增牧场
+    addOrUpdateHandle () {
+      // 显示牧场的那个啥
+    },
+    // 选择
+    selectionChangeHandle () {
+      // 选呗
+    },
+    // 删除牧场
+    deleteHandle () {
+      // 删除
+    }
+  }
 }
 </script>
 <style scoped>

+ 1 - 1
static/config/index.js

@@ -6,7 +6,7 @@
 
   // api接口请求地址
   // window.SITE_CONFIG['baseUrl'] = 'http://localhost:8080/renren-fast';
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.57:88/api';
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.54:88/api';
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名