提交修改

2020-09-24 11:34:12 +08:00 · 2020-09-24 11:34:12 +08:00 · e7d5277a7a
commit e7d5277a7a
parent 577410eb3e b02661f5eb
18 changed files with 612 additions and 50 deletions
--- a/config/index.js
+++ b/config/index.js
@ -13,7 +13,7 @@ module.exports = {
    assetsPublicPath: '/',
    proxyTable: {
      '/lz_management': {
-        target: 'http://localhost:8080',
+        target: 'https://tlzmanagement.ldxinyong.com',
        changeOrigin: true
      }
    },
--- a/src/api/api_equipment.js
+++ b/src/api/api_equipment.js
@ -137,3 +137,18 @@ export const apiResourceItuation = data => {
 export const handleNums = data => {
  return http({ url: `/lz_management/oneCode/get/nums`, method: 'post', data })
 }
+// 获取盘点次数
+export const apiGetTCounts = data => {
+  return http({ url: `/lz_management/modules/count/tCountList`, method: 'post', data })
+}
+
+// 新增盘点次数
+export const apiAddTCounts = () => {
+  return http({ url: `/lz_management/modules/count/newStart`, method: 'get',  })
+}
+
+// 删除盘点次数
+export const apiDelTCounts = data => {
+  return http({ url: `/lz_management/modules/count/tCountDelete`, method: 'post', data })
+}
+
--- a/src/api/api_report.js
+++ b/src/api/api_report.js
@ -1,6 +1,11 @@
 import http from '../utils/http'

-// 业绩报表
+// 业绩看板
 export const apiReportChart = data => {
-  return http({ url: '/lz_management/report/chart', method: 'get', params: data })
+  return http({ url: '/lz_management/result/chart', method: 'get', params: data })
+}
+
+// 业绩列表
+export const apiReportList = data => {
+  return http({ url: '/lz_management/result/report', method: 'post', params: data })
 }
--- a/src/views/layout/main-navbar.vue
+++ b/src/views/layout/main-navbar.vue
@ -54,6 +54,7 @@
 </template>

 <script>
+  import IconSvg from '@/components/icon-svg'
  import UpdatePassword from './main-navbar-update-password'
  import { clearLoginInfo } from '@/utils'
  import { apiLogout } from '@/api/api_sys'
@ -65,7 +66,7 @@
      }
    },
    components: {
-      UpdatePassword
+      UpdatePassword, IconSvg
    },
    computed: {
      navbarLayoutType: {
--- a/src/views/layout/main-sidebar-sub-menu.vue
+++ b/src/views/layout/main-sidebar-sub-menu.vue
@ -21,6 +21,7 @@
 </template>

 <script>
+  import IconSvg from '@/components/icon-svg'
  import SubMenu from './main-sidebar-sub-menu'
  export default {
    name: 'sub-menu',
@ -35,7 +36,7 @@
      }
    },
    components: {
-      SubMenu
+      SubMenu, IconSvg
    },
    computed: {
      sidebarLayoutSkin: {
--- a/src/views/layout/main-sidebar.vue
+++ b/src/views/layout/main-sidebar.vue
@ -23,6 +23,7 @@

 <script>
  import SubMenu from './main-sidebar-sub-menu'
+  import IconSvg from '@/components/icon-svg'
  import { isURL } from '@/utils/validate'
  export default {
    data () {
@ -31,7 +32,7 @@
      }
    },
    components: {
-      SubMenu
+      SubMenu, IconSvg
    },
    computed: {
      sidebarLayoutSkin: {
--- a/src/views/layout/main.vue
+++ b/src/views/layout/main.vue
@ -84,7 +84,8 @@
            this.loading = false
            this.userId = res.user.userId
            this.userName = res.user.username
-            this.$store.state.user = res.user
+            this.userId = res.user && res.user.id
+            this.userName = res.user && res.user.userName
            this.mobile = res.user.mobile

            this.$watermark.set(res.user.realName + ' ' + this.mobile.substr(7, 4))
--- a/src/views/modules/device-manage/device-brand-detail.vue
+++ b/src/views/modules/device-manage/device-brand-detail.vue
@ -129,7 +129,7 @@ export default {
            this.$message('添加成功')
            this.$emit('refreshDataList')
          } else {
-            this.$$message.error(data.msg)
+            this.$message.error(data.msg)
          }
        });
      } else {
@ -140,7 +140,7 @@ export default {
            this.$message('更新成功')
            this.$emit('refreshDataList')
          } else {
-            this.$$message.error(data.msg)
+            this.$message.error(data.msg)
          }
        });
      }
--- a/src/views/modules/device-manage/device-list-detail.vue
+++ b/src/views/modules/device-manage/device-list-detail.vue
@ -203,7 +203,7 @@ export default {
          this.$message("更新成功");
          this.$emit("refreshDataList");
        } else {
-          this.$$message.error(data.msg);
+          this.$message.error(data.msg);
        }
      });
    },
--- a/src/views/modules/device-manage/device-spec-detail.vue
+++ b/src/views/modules/device-manage/device-spec-detail.vue
@ -198,7 +198,7 @@ export default {
            this.$message('添加成功')
            this.$emit('refreshDataList')
          } else {
-            this.$$message.error(data.msg)
+            this.$message.error(data.msg)
          }
        });
      } else {
@ -209,7 +209,7 @@ export default {
            this.$message('更新成功')
            this.$emit('refreshDataList')
          } else {
-            this.$$message.error(data.msg)
+            this.$message.error(data.msg)
          }
        });
      }
--- a/src/views/modules/device-manage/device-tcounts.vue
+++ b/src/views/modules/device-manage/device-tcounts.vue
@ -0,0 +1,226 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+
+      <el-form-item>
+        <el-button type="success" @click="addNewSpec()">新增一次盘点</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="dataListLoading" :data="data" style="width: 100%" @row-click="rowClick">
+      <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
+      <el-table-column prop="num" header-align="center" align="center" label="第几次盘点"></el-table-column>
+      <el-table-column prop="gmtCreate" header-align="center" align="center" label="创建时间"></el-table-column>
+      <el-table-column fixed="right" header-align="center" align="center" width="100" label="操作">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            @click="handleDelete(scope.row)"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="specReq.page"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="specReq.rows"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <device-type-detail v-if="isShowDetail" ref="deviceTypeDetail" @refreshDataList="getData"></device-type-detail>
+  </div>
+</template>
+<script>
+import { apiGetTCounts, apiAddTCounts, apiDelTCounts } from "@/api/api_equipment";
+import DeviceTypeDetail from './device-type-detail.vue'
+export default {
+  components: {
+      DeviceTypeDetail
+    },
+  data() {
+    
+    return {
+      isShowSearch: true,
+      data: [],
+      name: "",
+      categorys: "",
+      input: "",
+      dataListLoading: false,
+      typeIndex: 0, //0现在是1级 1二级2三级
+      showHeader: false,
+      totalPage: 1,
+      departmentReaderOnly: false,
+      specReq: {
+        page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: null,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        count: null
+      },
+      isShowDetail: false
+    };
+  },
+  created() {
+    // this.handleGetImgCaptcha()
+  },
+  
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    
+    addNewSpec(){
+      apiAddTCounts().then((data) =>{
+        if(data.code == 0){
+          this.$message(data.msg)
+          this.specReq.page = 1
+          this.getData()
+        }else{
+          this.$message.error(data.msg)
+        }
+      });
+      
+    },
+    changeDepartment(type) {
+      if(type == 1){
+        //获取品牌
+        this.getBrands()
+        this.specReq.brandId = null
+      }else{
+        this.specReq.page = 1
+        this.getData()
+      }
+    },
+    sizeChangeHandle(val) {
+      this.specReq.page = 1
+      this.specReq.rows = val
+      this.getData();
+    },
+    currentChangeHandle(val) {
+      this.specReq.page = val
+      this.getData();
+    },
+    
+    // 删除
+      handleDelete (val) {
+        
+        this.$confirm('确定删除第“' + val.num + '”次盘点吗？删除后该类型将无法使用。如果该次盘点有盘点记录,将无法删除成功', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.delTCount(val.id)
+        }).catch(() => {
+        })
+      },
+      delTCount(id){
+        apiDelTCounts({page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: id,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        count:null
+        }).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.$message('删除成功')
+          this.getData()
+        } else {
+          this.$message.error('删除失败' + data.msg)
+        }
+        this.dataListLoading = false;
+      });
+      },
+    getData() {
+      console.log("获取数据")
+      console.log(this.name)
+      console.log(this.categorys)
+      this.dataListLoading = true
+      apiGetTCounts(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.data = data.rows.list;
+          this.totalPage = data.rows.totalCount
+        } else {
+          this.data = [];
+        }
+        this.dataListLoading = false;
+      });
+    },
+    
+    btnSearch() {
+      this.specReq.page = 1
+      this.getData();
+    },
+
+    rowClick(row, event, column) {},
+  },
+};
+</script>
+
+<style>
+.el-row {
+  margin-bottom: 20px;
+}
+.el-col {
+  border-radius: 10px;
+}
+.bg-purple-dark {
+  background: #99a9bf;
+}
+.bg-purple {
+  background: #d3dce6;
+}
+.bg-purple-light {
+  background: #e5f2f1;
+}
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+}
+.row-bg {
+  padding: 10px 0;
+  background-color: #f9fafc;
+}
+.div_height {
+  height: 38px;
+}
+.div_width {
+  width: 100%;
+}
+.width_100 {
+  width: 100px;
+}
+.center {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+
+  padding: 1em;
+}
+.flex {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  border: 1px solid;
+}
+.flex_son {
+  width: 100%;
+  height: 100%;
+  border: 0x solid;
+}
+</style>
--- a/src/views/modules/device-manage/device-type-detail.vue
+++ b/src/views/modules/device-manage/device-type-detail.vue
@ -102,7 +102,7 @@ export default {
            this.$message('添加成功')
            this.$emit('refreshDataList')
          } else {
-            this.$$message.error(data.msg)
+            this.$message.error(data.msg)
          }
        });
      } else {
@ -113,7 +113,7 @@ export default {
            this.$message('更新成功')
            this.$emit('refreshDataList')
          } else {
-            this.$$message.error(data.msg)
+            this.$message.error(data.msg)
          }
        });
      }
--- a/src/views/modules/device/device-detail.vue
+++ b/src/views/modules/device/device-detail.vue
@ -168,10 +168,7 @@
  </div>
 </template>>
 <script>
-import {
-  apiFindEquipmentByCode,
-  apiChangeEquipment,
-} from "@/api/api_equipment";
+import { apiFindEquipmentByCode, apiChangeEquipment } from "@/api/api_equipment";
 import * as dd from "dingtalk-jsapi";
 export default {
  data() {
@ -391,7 +388,8 @@ export default {
    getDeviceInfo() {
      this.dataListLoading = true;
      apiFindEquipmentByCode({}, this.deviceInfo.code).then((data) => {
-        console.log(data.data);
+        console.log(data);
+        
        if (data.code == 0) {
          if (typeof data.data == "undefined") {
            this.$message("未绑定设备");
@ -445,7 +443,7 @@ export default {
            }
          }
        } else {
-          this.$message.error("异常");
+          this.$message.error("异常" + data.msg);
        }

        this.dataListLoading = false;
--- a/src/views/modules/device/device-main.vue
+++ b/src/views/modules/device/device-main.vue
@ -30,36 +30,30 @@
 </template>>
 <script>
 export default {
-    data () {
-        return{
-            value: ''
-        }
-
-    },
-    mounted () {
-
-    },
-    methods: {
-        batchOperate(command) {
-            switch (command) {
-                case 'staff':
-                    //去搜索人员
-                    this.$router.push({name: 'devicestaffdepat', query: {type: 3}})
-                    break;
-                case "depat":
-                    //去搜索人员
-                    this.$router.push({name: 'devicestaffdepat', query: {type: 4}})
-                    break;
-           }
-        },
-        goto (type) {
-            this.$router.push({name: 'devicedetail'})
-            
-            
-        }
+  data () {
+    return{
+      value: ''
    }
+  },
+  mounted () {},
+  methods: {
+    batchOperate(command) {
+      switch (command) {
+        case 'staff':
+          //去搜索人员
+          this.$router.push({name: 'devicestaffdepat', query: {type: 3}})
+          break;
+        case "depat":
+          //去搜索人员
+          this.$router.push({name: 'devicestaffdepat', query: {type: 4}})
+          break;
+      }
+    },
+    goto (type) {
+      this.$router.push({name: 'devicedetail'})
+    }
+  }
 }
-
 </script>

 <style>
--- a/src/views/modules/device/device-staff-depat.vue
+++ b/src/views/modules/device/device-staff-depat.vue
@ -75,6 +75,10 @@ export default {
          if(this.typeIndex == 0 || this.typeIndex == 3){
              apiFindStaff(this.query).then(data => {
              console.log(data)
+              if(data.code != 0){
+                this.$message.error("异常" + data.msg);
+                return
+              }
              if(typeof data.data == 'undefined'){
              }else{
                this.query.currPage = data.data.currPage
@ -86,6 +90,10 @@ export default {
          }else {
            apiFindDepat(this.query).then(data => {
              console.log(data)
+              if(data.code != 0){
+                this.$message.error("异常" + data.msg);
+                return
+              }
              if(typeof data.data == 'undefined'){
              }else{
                this.query.currPage = data.data.currPage
--- a/src/views/modules/result/report/componments/query-form/index.vue
+++ b/src/views/modules/result/report/componments/query-form/index.vue
@ -0,0 +1,148 @@
+<!--  -->
+<template>
+  <div>
+    <div class="staff-archives-title"></div>
+    <el-form :inline="true" :model="formInline" class="demo-form-inline staff-archives-form">
+      <el-form-item label="选择部门">
+        <el-input
+          placeholder="请选择部门"
+          @focus="isChoose=true"
+          readonly
+          :value="formInline.departmentName"
+        ></el-input>
+      </el-form-item>
+
+      <el-form-item :label="`选择月份`">
+        <el-date-picker
+          type="month"
+          placeholder="选择月份"
+          v-model="selectMonthTime"
+          value-format="yyyy-MM"
+          @change="changeApplyMonth"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="primary" @click="restValue">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-dialog title="选择部门" :visible.sync="isChoose" width="30%">
+      <el-tree :data="menuList" :props="defaultProps" @node-click="handleNodeClick">
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <span>{{ data.departmentName }}</span>
+          <span>({{ data.memberCount }})人</span>
+        </span>
+      </el-tree>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="isChoose = false">取 消</el-button>
+        <el-button type="primary" size="mini" @click="onsumbit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import { apiOrganizationList } from '@/api/api_staff'
+  export default {
+    props: {
+      monthTime: {
+        type: String,
+        default: ''
+      }
+    },
+    data: function () {
+      return {
+        selectMonthTime: this.nowDate(),
+        isChooseObj: {},
+        isChoose: false,
+        menuList: [],
+        defaultProps: {
+          children: 'list',
+          label: 'name'
+        },
+        formInline: {
+          value: []
+        }
+      }
+    },
+    computed: {},
+    beforeMount () { },
+    created () {
+      this.handleGetMenuList()
+      this.handleChangeData()
+    },
+    mounted () {},
+    beforeUpdate () {
+      // this.selectMonthTime = this.monthTime
+    },
+    methods: {
+      async  handleChangeData () {
+        this.onSubmit()
+      },
+      // 获取侧边架构列表
+      async handleGetMenuList () {
+        let result = await apiOrganizationList()
+        this.menuList = result
+      },
+      // 修改月份
+      changeApplyMonth (val) {
+        this.selectMonthTime = val
+        console.log(val)
+      },
+      onSubmit () {
+        let obj = {
+          departmentId: this.formInline.departmentId,
+          selectMonthTime: this.selectMonthTime
+        }
+        this.$emit('submit', obj)
+      },
+      restValue () {
+        this.formInline = {}
+        this.selectMonthTime = ''
+      },
+      onsumbit () {
+        this.formInline = Object.assign({}, this.formInline, this.isChooseObj)
+        this.isChoose = false
+      },
+      handleNodeClick (a, b) {
+        this.isChooseObj = {
+          departmentId: a.departmentId,
+          departmentName: a.departmentName
+        }
+      },
+      nowDate () {
+        var data = new Date()
+        var month = data.getMonth() < 9 ? '0' + (data.getMonth() + 1) : data.getMonth() + 1
+        return data.getFullYear() + '-' + month
+      }
+    },
+    watch: {}
+
+  }
+</script>
+
+<style lang='scss'>
+  .el-range-separator {
+    width: 7% !important;
+  }
+  .el-input__icon {
+    transition: all 0.5s;
+  }
+  .staff-archives-choose {
+    margin: 2px;
+    height: 200px;
+    overflow: auto;
+    transition: all 0.3s;
+    position: relative;
+    border: 1px solid #dcdfe6;
+  }
+  .staff-archives-choose1 {
+    height: 0px;
+    opacity: 0;
+    overflow: hidden;
+  }
+</style>
+
--- a/src/views/modules/result/report/index.vue
+++ b/src/views/modules/result/report/index.vue
@ -0,0 +1,163 @@
+<template>
+  <div class="mod-log">
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="handleGetTableList()">
+      <el-card>
+        <query-form @submit="submit"/>
+        </el-card>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%">
+      <el-table-column
+        prop="staffName"
+        header-align="center"
+        align="center"
+        width="100"
+        label="姓名">
+      </el-table-column>
+
+      <el-table-column
+        prop="status"
+        header-align="center"
+        align="center"
+        width="100"
+        label="当前进度">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status === 0" size="small" type="danger">未提交</el-tag>
+          <el-tag v-if="scope.row.status === 4" size="small" type="success">已完成</el-tag>
+          <el-tag v-if="scope.row.status === 1 || scope.row.status === 3 || scope.row.status === 5 || scope.row.status === 6" size="small" type="primary">审核中</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="departmentName"
+        header-align="center"
+        align="center"
+        width="200"
+        label="部门">
+      </el-table-column>
+
+      <el-table-column
+        prop="position"
+        header-align="center"
+        align="center"
+        width="200"
+        :show-overflow-tooltip="true"
+        label="职位">
+      </el-table-column>
+
+      <el-table-column
+        prop="version"
+        header-align="center"
+        align="center"
+        width="100"
+        :show-overflow-tooltip="true"
+        label="业务得分70%">
+      </el-table-column>
+
+      <el-table-column
+        prop="deployTime"
+        header-align="center"
+        align="center"
+        width="100"
+        label="价值观得分30%">
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        width="100"
+        label="总分">
+      </el-table-column>
+
+      <el-table-column
+        header-align="center"
+        align="center"
+        width="100"
+        label="等级">
+      </el-table-column>
+
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  import { apiReportList } from '@/api/api_report'
+  import queryForm from './componments/query-form'
+  export default {
+    data () {
+      return {
+        dataForm: {
+          key: ''
+        },
+        imageSrc: '',
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        selectionDataList: [],
+        departmentId: '',
+        selectMonthTime: '',
+        status: 0,
+        type: 1
+      }
+    },
+    created () {
+      this.handleGetTableList()
+    },
+    components: {
+      queryForm
+    },
+    methods: {
+      // 获取数据列表
+      handleGetTableList () {
+        apiReportList({
+          'currPage': this.pageIndex,
+          'pageSize': this.pageSize,
+          'departmentId': this.departmentId,
+          'selectMonthTime': this.selectMonthTime,
+          'status': this.status,
+          'type': this.type
+        }).then(res => {
+          if (res && res.code === 0) {
+            this.dataList = res.page.list
+            this.totalPage = res.page.totalCount
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.handleGetTableList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.handleGetTableList()
+      },
+      submit (data) {
+        this.departmentId = data.departmentId
+        this.selectMonthTime = data.selectMonthTime
+        this.handleGetTableList()
+      }
+    }
+  }
+</script>
+<style>
+</style>
--- a/src/views/modules/sys/user/user-add-or-update.vue
+++ b/src/views/modules/sys/user/user-add-or-update.vue
@ -70,8 +70,7 @@
          <el-radio :label="0">停用</el-radio>
        </el-radio-group>
      </el-form-item>
-    </el-form>
-    <el-form-item label="关联角色" size="mini" prop="roleIdList">
+      <el-form-item label="关联角色" size="mini" prop="roleIdList">
      <el-checkbox-group v-model="dataForm.roleIdList">
        <el-checkbox
          v-for="role in roleList"
@ -80,6 +79,8 @@
        >{{ role.roleName }}</el-checkbox>
      </el-checkbox-group>
    </el-form-item>
+    </el-form>
+    
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>
      <el-button type="primary" @click="handleConfirm()">确定</el-button>