From f0f1d45a0fd143d30a3f3aef34c50c124251c209 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 21 Sep 2020 17:04:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=8C=E5=93=81=E7=89=8C=E7=AD=89=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api_equipment.js                      |  86 +++
 src/router/index.js                           |  14 +-
 .../device-manage/device-brand-detail.vue     | 147 +++++
 .../modules/device-manage/device-brand.vue    | 258 +++++++++
 .../device-manage/device-list-detail.vue      | 206 +++++++
 .../modules/device-manage/device-list.vue     | 507 ++++++++++++++++++
 .../device-manage/device-spec-detail.vue      | 216 ++++++++
 .../modules/device-manage/device-spec.vue     | 297 ++++++++++
 .../device-manage/device-type-detail.vue      | 120 +++++
 .../modules/device-manage/device-type.vue     | 260 +++++++++
 src/views/modules/equipment/main.vue          | 159 ------
 11 files changed, 2106 insertions(+), 164 deletions(-)
 create mode 100644 src/views/modules/device-manage/device-brand-detail.vue
 create mode 100644 src/views/modules/device-manage/device-brand.vue
 create mode 100644 src/views/modules/device-manage/device-list-detail.vue
 create mode 100644 src/views/modules/device-manage/device-list.vue
 create mode 100644 src/views/modules/device-manage/device-spec-detail.vue
 create mode 100644 src/views/modules/device-manage/device-spec.vue
 create mode 100644 src/views/modules/device-manage/device-type-detail.vue
 create mode 100644 src/views/modules/device-manage/device-type.vue
 delete mode 100644 src/views/modules/equipment/main.vue

diff --git a/src/api/api_equipment.js b/src/api/api_equipment.js
index fa0675e..0aa96a2 100644
--- a/src/api/api_equipment.js
+++ b/src/api/api_equipment.js
@@ -34,3 +34,89 @@ export const apiFindStaffDevice = data => {
   return http({ url: `/lz_management/api/findUsersEquipmentsByName`, method: 'post', data })
 }
 
+// 获取类型信息
+export const apiGetDeviceTypes = data => {
+  return http({ url: `/lz_management/modules/type/equipmentTypeList`, method: 'post', data })
+}
+
+// 获取规格信息
+export const apiGetDeviceSpecs = data => {
+  return http({ url: `/lz_management/modules/specs/equipmentSpecsList`, method: 'post', data })
+}
+
+// 获取品牌信息
+export const apiGetDeviceBrands = data => {
+  return http({ url: `/lz_management/modules/specs/brandList`, method: 'post', data })
+}
+
+// 获取品牌信息列表
+export const apiGetDeviceBrandList = data => {
+  return http({ url: `/lz_management/modules/brand/equipmentBrandList`, method: 'post', data })
+}
+
+// 编辑规格信息
+export const apiEditDeviceSpecs = data => {
+  return http({ url: `/lz_management/modules/specs/equipmentSpecsEdit`, method: 'post', data })
+}
+
+// 添加规格信息
+export const apiAddDeviceSpecs = data => {
+  return http({ url: `/lz_management/modules/specs/equipmentSpecsAdd`, method: 'post', data })
+}
+
+// 删除规格信息
+export const apiDelDeviceSpecs = data => {
+  return http({ url: `/lz_management/modules/specs/equipmentSpecsDelete`, method: 'post', data })
+}
+
+// 编辑规格信息
+export const apiEditDeviceTypes = data => {
+  return http({ url: `/lz_management/modules/type/equipmentTypeEdit`, method: 'post', data })
+}
+
+// 添加规格信息
+export const apiAddDeviceTypes = data => {
+  return http({ url: `/lz_management/modules/type/equipmentTypeAdd`, method: 'post', data })
+}
+
+// 删除规格信息
+export const apiDelDeviceTypes = data => {
+  return http({ url: `/lz_management/modules/type/equipmentTypeDelete`, method: 'post', data })
+}
+
+// 编辑品牌信息
+export const apiEditDeviceBrands = data => {
+  return http({ url: `/lz_management/modules/brand/equipmentBrandEdit`, method: 'post', data })
+}
+
+// 添加品牌信息
+export const apiAddDeviceBrands = data => {
+  return http({ url: `/lz_management/modules/brand/equipmentBrandAdd`, method: 'post', data })
+}
+
+// 删除品牌信息
+export const apiDelDeviceBrands = data => {
+  return http({ url: `/lz_management/modules/brand/equipmentBrandDelete`, method: 'post', data })
+}
+
+// 获取使用设备列表
+export const apiGetUseDeviceList = data => {
+  return http({ url: `/lz_management/modules/usereq/equipmentInfoList`, method: 'post', data })
+}
+
+// 编辑使用设备信息
+export const apiEditUseDevice = data => {
+  return http({ url: `/lz_management/modules/usereq/equipmentInfoEdit`, method: 'post', data })
+}
+
+
+// 删除使用设备信息
+export const apiDelUseDevice = data => {
+  return http({ url: `/lz_management/modules/usereq/equipmentInfoDelete`, method: 'post', data })
+}
+
+// 打印编码
+export const apiGetRePrintCode = (data, code) => {
+  return http({ url: `/lz_management/oneCode/re/print?code=${code}`, method: 'get', data })
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index 5325e7d..73c3ed3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,9 +9,9 @@ import Router from 'vue-router'
 import { apiGetMenuNav } from '@/api/api_menu'
 import { isURL } from '@/utils/validate'
 import {clearLoginInfo} from '@/utils'
-//import VConsole from 'vconsole'
+import VConsole from 'vconsole'
 
-//let vConsole = new VConsole()
+let vConsole = new VConsole()
 Vue.use(Router)
 
 // 开发环境不使用懒加载, 因为懒加载页面太多的话会造成webpack热更新太慢, 所以只有生产环境使用懒加载
@@ -33,6 +33,10 @@ const dingtalkRoutes=[
   { path: '/devicemark', component: _import('modules/device/device-mark'), name: 'devicemark', meta: { title: '设备备注' } },
   { path: '/devicestaff', component: _import('modules/device/device-staff-device'), name: 'devicestaff', meta: { title: '人员资产信息' } },
   { path: '/devicestaffdepat', component: _import('modules/device/device-staff-depat'), name: 'devicestaffdepat', meta: { title: '搜索人员' } },
+  { path: '/devicespec', component: _import('modules/device-manage/device-spec'), name: 'devicespec', meta: { title: '设备规格管理' } },
+  { path: '/devicetypes', component: _import('modules/device-manage/device-type'), name: 'devicetypes', meta: { title: '设备类型管理' } },
+  { path: '/devicebrand', component: _import('modules/device-manage/device-brand'), name: 'devicebrand', meta: { title: '设备品牌管理' } },
+  { path: '/devicelist', component: _import('modules/device-manage/device-list'), name: 'devicelist', meta: { title: '设备列表管理' } },
   { path: '/devicedetail', component: _import('modules/device/device-detail'), name: 'devicedetail', meta: { title: '资产盘点设备详情页' } }
 ]
 
@@ -104,13 +108,13 @@ router.beforeEach((to, from, next) => {
   if (router.options.isAddDynamicMenuRoutes || fnCurrentRouteType(to, globalRoutes) === 'global') {
     next()
   } else if (fnIsInRoutes(to, dingtalkRoutes)) {//判断是否全屏路由
-    if(fnCheckToken()){
+    /*if(fnCheckToken()){
       next()
     } else {
       clearLoginInfo()
       next({ name: 'login' })
-    }
-    //next()
+    }*/
+    next()
     /*console.log(to)
     let newpage = router.resolve({ 
       name: to.path,
diff --git a/src/views/modules/device-manage/device-brand-detail.vue b/src/views/modules/device-manage/device-brand-detail.vue
new file mode 100644
index 0000000..73dd544
--- /dev/null
+++ b/src/views/modules/device-manage/device-brand-detail.vue
@@ -0,0 +1,147 @@
+<template>
+  <el-dialog :title="!id ? '新增规格' : '编辑规格'" :close-on-click-modal="false" :visible.sync="visible"
+  >
+    
+      <el-form :inline="true">
+        <el-form-item label="类型">
+          <el-select
+            v-model="specReq.typeId"
+            :disabled="departmentReaderOnly"
+            @change="changeType"
+          >
+            <el-option v-for="item in types" :key="item.id" :label="item.type" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+
+        
+      </el-form>
+      <el-form :inline="true">
+        <el-form-item label="品牌">
+          <el-input v-model="brand" placeholder="品牌名称" clearable>{{brand}}</el-input>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input v-model="rank" placeholder="请输入数字" clearable>{{rank}}</el-input>
+        </el-form-item>
+      </el-form>
+      
+    <span slot="footer" class="dialog-footer">
+      <el-button type="warning" @click="save">取消</el-button>
+      <el-button type="primary" @click="save">保存</el-button>
+      
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { apiEditDeviceBrands, apiAddDeviceBrands } from "@/api/api_equipment";
+export default {
+  data() {
+    return {
+      visible: false,
+      types: [],
+      id: null,
+      typeId: null,
+      type:null,
+      brand:null,
+      rank: 0, //排序
+      departmentReaderOnly: false,
+      isAdd: false,
+      specReq: {
+        page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: null,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        brand: null,
+        typeId: null,
+        rank: null, //排序
+      },
+    };
+  },
+  mounted() {},
+  computed: {},
+  methods: {
+    init(
+      obj,
+      types
+    ) {
+      console.log("device-brand-detail init")
+      this.specReq.typeId = obj.typeId
+      this.typeId = obj.typeId
+      this.id = obj.id
+      this.type = obj.type
+      this.rank = obj.rank
+      this.brand = obj.brand
+      this.types = JSON.parse(JSON.stringify(types))//拷贝一份
+      this.types.splice(0, 1)//去掉全部
+      this.visible = true
+      if(!this.id){
+        
+        this.isAdd = true
+      }else{
+        this.isAdd = false
+      }
+    },
+    changeType(val){
+      console.log(val)
+      this.getBrands()
+      
+    },
+    changeBrand(val){
+      console.log(val)
+      
+    },
+    save(){
+      if(this.specReq.typeId == null){
+        this.$message.error('请选择类型')
+        return
+      }
+      
+      if(this.brand == null || this.brand.length == 0){
+        this.$message.error('请输入品牌名称')
+        return
+      }
+      
+      if((!this.rank && this.rank != 0) || this.rank.length == 0){
+        this.$message.error('请设置排序')
+        return
+      }
+      
+      this.specReq.rank = this.rank
+      this.specReq.brand = this.brand
+      
+      this.specReq.id = this.id
+      this.editSpecs()
+    },
+    editSpecs(){
+      console.log('editSpecs')
+      if(this.isAdd){
+        apiAddDeviceBrands(this.specReq).then((data) => {
+          console.log(data);
+          if (data && data.code === 0) {
+            this.visible = false
+            this.$message('添加成功')
+            this.$emit('refreshDataList')
+          } else {
+            this.$$message.error(data.msg)
+          }
+        });
+      } else {
+        apiEditDeviceBrands(this.specReq).then((data) => {
+          console.log(data);
+          if (data && data.code === 0) {
+            this.visible = false
+            this.$message('更新成功')
+            this.$emit('refreshDataList')
+          } else {
+            this.$$message.error(data.msg)
+          }
+        });
+      }
+      
+    }
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-brand.vue b/src/views/modules/device-manage/device-brand.vue
new file mode 100644
index 0000000..a0d1116
--- /dev/null
+++ b/src/views/modules/device-manage/device-brand.vue
@@ -0,0 +1,258 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+
+      <el-form-item label="类型"  >
+        <el-select v-model="specReq.typeId" :disabled="departmentReaderOnly" @change="changeDepartment(1)">
+          <el-option
+            v-for="item in types"
+            :key="item.id"
+            :label="item.type"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      
+      <el-form-item label="品牌">
+        <el-input v-model="specReq.brand" placeholder="品牌信息" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="getData()">查询</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @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 type="selection" header-align="center" align="center" width="50"></el-table-column>
+      <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
+      <el-table-column prop="typeName" header-align="center" align="center" label="类型"></el-table-column>
+      <el-table-column prop="brand" header-align="center" align="center" label="品牌"></el-table-column>
+      <el-table-column prop="rank" header-align="center" align="center" label="排序"></el-table-column>
+      <el-table-column fixed="right" header-align="center" align="center" width="180" label="操作">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            @click="handleAddOrUpdate(scope.row)"
+          >编辑
+          </el-button>
+          <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-brand-detail v-if="isShowDetail" ref="deviceBrandDetail" @refreshDataList="getData"></device-brand-detail>
+  </div>
+</template>
+<script>
+import { apiGetDeviceBrandList, apiDelDeviceBrands } from "@/api/api_equipment";
+import DeviceBrandDetail from './device-brand-detail.vue'
+export default {
+  components: {
+      DeviceBrandDetail
+    },
+  data() {
+    
+    return {
+      isShowSearch: true,
+      data: [],
+      types: [],
+      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,
+        brand: null,
+        typeId: null,
+        rank: null, //排序
+      },
+      isShowDetail: false
+    };
+  },
+  created() {
+    // this.handleGetImgCaptcha()
+  },
+  
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    
+    addNewSpec(){
+      //id, typeId, type, brandId, brand, specs, skus, rank, used, remark, types, brands
+      setTimeout(() => {
+        var val = {id: null, typeId: null, brand: null, rank: 0}
+        this.$refs.deviceBrandDetail.init(val, this.types)
+      }, 500)
+      this.isShowDetail = true
+      
+    },
+    changeDepartment(type) {
+      
+      this.getData()
+      
+    },
+    sizeChangeHandle(val) {
+      this.specReq.page = 1
+      this.specReq.rows = val
+      this.getData();
+    },
+    currentChangeHandle(val) {
+      this.specReq.page = val
+      this.getData();
+    },
+    // 新增 / 编辑
+    handleAddOrUpdate (val) {
+      console.log(val)
+      //id, typeId, type, brandId, brand, specs, skus, rank, used, remark, types, brands
+      setTimeout(() => {
+        console.log(val)
+        this.$refs.deviceBrandDetail.init(val, this.types)
+      }, 500)
+      this.isShowDetail = true
+    },
+    // 删除
+      handleDelete (val) {
+        
+        this.$confirm('确定删除“' + val.brand + '”吗？删除后该品牌将无法使用', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.delDeviceSpecs(val.id)
+        }).catch(() => {
+        })
+      },
+      delDeviceSpecs(id){
+        apiDelDeviceBrands({page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: id,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        brand: null,
+        typeId: null,
+        rank: 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
+      apiGetDeviceBrandList(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.data = data.rows;
+          this.totalPage = data.total
+          this.types = data.types
+        } else {
+          this.data = [];
+        }
+        this.dataListLoading = false;
+      });
+    },
+    btnSearch() {
+      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>
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-list-detail.vue b/src/views/modules/device-manage/device-list-detail.vue
new file mode 100644
index 0000000..c2e85b3
--- /dev/null
+++ b/src/views/modules/device-manage/device-list-detail.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog :title="!id ? '新增规格' : '编辑规格'" :close-on-click-modal="false" :visible.sync="visible">
+    <el-form :inline="true">
+      <el-form-item label="类型">
+        <el-select v-model="type" :disabled="departmentReaderOnly" @change="changeType"></el-select>
+      </el-form-item>
+
+      <el-form-item label="品牌">
+        <el-select
+          v-model="brandName"
+          :disabled="departmentReaderOnly"
+          placeholder="请选择"
+          @change="changeBrand"
+        ></el-select>
+      </el-form-item>
+    </el-form>
+    <el-form>
+      <el-form-item label="规格">
+        <el-select style="width:500px"
+          v-model="specType"
+          :disabled="departmentReaderOnly"
+          @change="changeType"
+          
+        ></el-select>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true">
+      <el-form-item label="使用方">
+        <el-input v-model="user" placeholder="使用方" clearable :disabled="departmentReaderOnly"></el-input>
+      </el-form-item>
+      <el-form-item label="现有标识">
+        <el-input v-model="code" placeholder="现有编码" clearable :disabled="departmentReaderOnly"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true">
+      <el-form-item label="状态">
+        <el-select v-model="equipmentState" :disabled="departmentReaderOnly" @change="changeType">
+          <el-option
+            v-for="item in stateList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="自带标识">
+        <el-input v-model="originalCode" placeholder="设备自带标识" clearable></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true">
+      <el-form-item label="出库时间">
+        <el-date-picker
+          v-model="outTime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetime"
+          default-time="outTime"
+          placeholder="选择日期时间"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="入库时间">
+        <el-date-picker v-model="inTime" type="datetime" default-time="inTime" placeholder="选择日期时间" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true">
+      <el-form-item label="备注">
+        <el-input v-model="mark" placeholder="备注信息" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="买入金额">
+        <el-input v-model="buyAmount" placeholder="采购金额" clearable></el-input>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true">
+      <el-form-item label="出售金额">
+        <el-input v-model="saleAmount" placeholder="出售时金额" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="审批编号">
+        <el-input v-model="no" placeholder="购买审批编号" clearable></el-input>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="warning" @click="save">取消</el-button>
+      <el-button type="primary" @click="save">保存</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { apiEditUseDevice } from "@/api/api_equipment";
+export default {
+  data() {
+    return {
+      visible: false,
+      types: [],
+      brands: [],
+      specs: [],
+      id: null,
+      type: null,
+      brandName: null,
+      inTime: null, //入库时间
+      outTime: null, //出库时间
+      specType: null,
+      num: 1, //
+      user: null, //
+      mark: null, //备注
+      code: null,
+      equipmentState: null, //状态
+      buyAmount: null, //买入金额
+      saleAmount: null, //出售金额
+      departmentReaderOnly: true,
+      originalCode: null,
+      no: null, //审批流水
+      isAdd: false,
+      stateList: [
+        { value: 0, label: "入库" },
+        { value: 1, label: "售出" },
+        { value: 2, label: "不可用" },
+        { value: 3, label: "调拨" },
+        { value: 4, label: "申领" },
+      ],
+      specReq: {
+        page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: null,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        specType: null,
+        type: null,
+        num: null,
+        unit: null, //单位 件/台
+        user: null, //使用者
+        owner: null, //所有者
+        qr: null, //设备本身标识
+        originalCode: null, //设备原有标识，老标识
+        code: null, //设备现有标识
+        mark: null, //备注
+        gmtOutbound: null, // 最后一次出库时间
+        gmtInbound: null, //第一次入库时间
+        equipmentState: null, //状态
+        buyAmount: null, //买入金额
+        saleAmount: null, //出售金额
+        no: null, //审批流水
+        brandId: null,
+        typeId: null,
+        gmtInStartTime: null,
+        gmtInEndTime: null,
+        gmtOutStartTime: null,
+        gmtOutEndTime: null,
+        count: null,
+        other: null,
+      },
+    };
+  },
+  mounted() {},
+  computed: {},
+  methods: {
+    async init(obj, types, brands) {
+      console.log("device-list-detail init");
+      console.log(obj);
+      this.id = obj.id;
+      this.brandName = obj.brandName;
+      this.code = obj.code;
+      this.equipmentState = obj.equipmentState;
+      this.mark = obj.mark;
+      this.no = obj.no;
+      this.num = obj.num;
+      this.originalCode = obj.originalCode;
+      this.saleAmount = obj.saleAmount;
+      this.buyAmount = obj.buyAmount;
+      this.specType = obj.specType;
+      this.type = obj.type;
+      this.user = obj.user;
+      this.inTime = obj.gmtInbound;
+      this.outTime = obj.gmtOutbound;
+      this.visible = true;
+    },
+
+    save() {
+      
+      this.specReq.id = this.id
+      this.specReq.buyAmount = this.buyAmount;
+      this.specReq.saleAmount = this.saleAmount;
+      this.specReq.gmtInbound = this.inTime;
+      this.specReq.gmtOutbound = this.outTime;
+      this.specReq.mark = this.mark;
+      this.specReq.originalCode = this.originalCode;
+      this.specReq.no = this.no;
+      this.editSpecs();
+    },
+    editSpecs() {
+      console.log("editSpecs");
+      apiEditUseDevice(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.visible = false;
+          this.$message("更新成功");
+          this.$emit("refreshDataList");
+        } else {
+          this.$$message.error(data.msg);
+        }
+      });
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-list.vue b/src/views/modules/device-manage/device-list.vue
new file mode 100644
index 0000000..c49cb97
--- /dev/null
+++ b/src/views/modules/device-manage/device-list.vue
@@ -0,0 +1,507 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item label="第几次盘点">
+        <el-select
+          v-model="specReq.count"
+          :disabled="departmentReaderOnly"
+          @change="changeDepartment(0)"
+        >
+          <el-option v-for="item in tCounts" :key="item.num" :label="item.num" :value="item.num"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类型">
+        <el-select
+          v-model="specReq.typeId"
+          :disabled="departmentReaderOnly"
+          @change="changeDepartment(1)"
+        >
+          <el-option v-for="item in types" :key="item.id" :label="item.type" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="品牌">
+        <el-select
+          v-model="specReq.brandId"
+          :disabled="departmentReaderOnly"
+          placeholder="请选择"
+          @change="changeDepartment(2)"
+        >
+          <el-option v-for="item in brands" :key="item.id" :label="item.brand" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-select
+          v-model="specReq.equipmentState"
+          :disabled="departmentReaderOnly"
+          placeholder="请选择"
+          @change="changeDepartment(3)"
+        >
+          <el-option
+            v-for="item in stateList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="其他">
+        <el-select
+          v-model="specReq.other"
+          :disabled="departmentReaderOnly"
+          placeholder="请选择"
+          @change="changeDepartment(4)"
+        >
+          <el-option
+            v-for="item in otherList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="`出库日期`">
+        <el-date-picker
+          v-model="outTime"
+          type="daterange"
+          align="right"
+          value-format="yyyy-MM-dd 00:00:00"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="changeOutData"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item :label="`入库日期`">
+        <el-date-picker
+          v-model="inTime"
+          type="daterange"
+          align="right"
+          value-format="yyyy-MM-dd 00:00:00"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="changeInData"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="规格">
+        <el-input v-model="specReq.specType" placeholder="规格信息" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item label="使用人">
+        <el-input v-model="specReq.user" placeholder="使用人信息" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item label="现有编号">
+        <el-input v-model="specReq.code" placeholder="现有编号" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item label="自带编号">
+        <el-input v-model="specReq.qr" placeholder="自带编号" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item label="备注">
+        <el-input v-model="specReq.mark" placeholder="备注" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="getData()">查询</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="warning" @click="clearGet()">清空筛选</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="dataListLoading" :data="data" style="width: 100%" @row-click="rowClick">
+      <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+      <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
+      <el-table-column prop="type" header-align="center" align="center" label="类型"></el-table-column>
+      <el-table-column prop="brandName" header-align="center" align="center" label="品牌"></el-table-column>
+      <el-table-column prop="specType" header-align="center" align="center" label="规格"></el-table-column>
+      <el-table-column prop="user" header-align="center" align="center" label="使用方"></el-table-column>
+      <el-table-column prop="code" header-align="center" align="center" label="现有标识"></el-table-column>
+      <el-table-column prop="originalCode" header-align="center" align="center" label="自带标识"></el-table-column>
+      <el-table-column prop="gmtOutbound" header-align="center" align="center" label="出库时间"></el-table-column>
+      <el-table-column prop="gmtInbound" header-align="center" align="center" label="入库时间"></el-table-column>
+      <el-table-column prop header-align="center" align="center" label="状态">
+        <template slot-scope="scope">
+          <div class="conatnt-name">
+            <span>{{ getStatusStr(scope.row.equipmentState) }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="buyAmount" header-align="center" align="center" label="买入金额"></el-table-column>
+      <el-table-column prop="saleAmount" header-align="center" align="center" label="出售金额"></el-table-column>
+      <el-table-column prop="no" header-align="center" align="center" label="审批编号"></el-table-column>
+      <el-table-column prop="mark" 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="handleAddOrUpdate(scope.row)">编辑</el-button>
+          <el-button type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button>
+          <el-button type="text" size="mini" @click="handlePrint(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-list-detail v-if="isShowDetail" ref="deviceListDetail" @refreshDataList="getData"></device-list-detail>
+  </div>
+</template>
+<script>
+import {
+  apiGetUseDeviceList,
+  apiGetDeviceBrands,
+  apiDelDeviceSpecs,
+  apiGetRePrintCode,
+  apiDelUseDevice,
+} from "@/api/api_equipment";
+import * as dd from "dingtalk-jsapi";
+import DeviceListDetail from "./device-list-detail.vue";
+export default {
+  components: {
+    DeviceListDetail,
+  },
+  data() {
+    return {
+      isShowSearch: true,
+      data: [],
+      types: [],
+      brands: [],
+      tCounts: [],
+      outTime: [],
+      inTime: [],
+      name: "",
+      categorys: "",
+      input: "",
+      dataListLoading: false,
+      typeIndex: 0, //0现在是1级 1二级2三级
+      showHeader: false,
+      totalPage: 1,
+      departmentReaderOnly: false,
+      statusType: -1,
+      specReq: {
+        page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: null,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        specType: null,
+        type: null,
+        num: null,
+        unit: null, //单位 件/台
+        user: null, //使用者
+        owner: null, //所有者
+        qr: null, //设备本身标识
+        originalCode: null, //设备原有标识，老标识
+        code: null, //设备现有标识
+        mark: null, //备注
+        gmtOutbound: null, // 最后一次出库时间
+        gmtInbound: null, //第一次入库时间
+        equipmentState: null, //状态
+        buyAmount: null, //买入金额
+        saleAmount: null, //出售金额
+        no: null, //审批流水
+        brandId: null,
+        typeId: null,
+        gmtInStartTime: null,
+        gmtInEndTime: null,
+        gmtOutStartTime: null,
+        gmtOutEndTime: null,
+        count: null,
+        other: null,
+      },
+      otherList: [
+        { value: null, label: "全部" },
+        { value: 1, label: "有备注" },
+        { value: 2, label: "未盘点" },
+      ],
+      stateList: [
+        { value: null, label: "全部" },
+        { value: 0, label: "入库" },
+        { value: 1, label: "售出" },
+        { value: 2, label: "不可用" },
+        { value: 3, label: "调拨" },
+        { value: 4, label: "申领" },
+      ],
+      isShowDetail: false,
+    };
+  },
+
+  created() {
+    // this.handleGetImgCaptcha()
+  },
+  
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getStatusStr(status) {
+      if (status < 5) {
+        return this.stateList[status + 1].label;
+      }
+      return status;
+    },
+    clearGet() {
+      this.specReq.page = 1
+      this.specReq.sort = null
+      this.specReq.order = null
+      this.specReq.id = null
+      this.specReq.gmtCreate = null
+      this.specReq.gmtModified = null
+      this.specReq.specType = null
+      this.specReq.type = null
+      this.specReq.num = null
+      this.specReq.qr = null
+      this.specReq.unit = null
+      this.specReq.user = null
+      this.specReq.owner = null
+      this.specReq.originalCode = null
+      this.specReq.code = null
+      this.specReq.mark = null
+      this.specReq.gmtOutbound = null
+      this.specReq.gmtInbound = null
+      this.specReq.equipmentState = null
+      this.specReq.buyAmount = null
+      this.specReq.saleAmount = null
+      this.specReq.no = null
+      this.specReq.brandId = null
+      this.specReq.typeId = null
+      this.specReq.gmtInStartTime = null
+      this.specReq.gmtInEndTime = null
+      this.specReq.gmtOutStartTime = null
+      this.specReq.gmtOutEndTime = null
+      this.specReq.other = null
+      this.inTime = null
+      this.outTime = null
+      this.getData()
+    },
+    changeOutData(val) {
+      console.log(val)
+      if(val){
+        this.specReq.gmtOutStartTime = val[0]
+        this.specReq.gmtOutEndTime = val[1]
+      }else{
+        this.specReq.gmtOutStartTime = null
+        this.specReq.gmtOutEndTime = null
+      }
+      
+      this.specReq.page = 1
+      this.getData()
+    },
+    changeInData(val) {
+      console.log(val)
+      if(val){
+        this.specReq.gmtInStartTime = val[0]
+        this.specReq.gmtInEndTime = val[1]
+      }else{
+        this.specReq.gmtInStartTime = null
+        this.specReq.gmtInEndTime = null
+      }
+      
+      this.specReq.page = 1
+      this.getData()
+    },
+    changeDepartment(type) {
+      this.specReq.page = 1;
+      if (type == 1) {
+        //获取品牌
+        this.getBrands();
+        this.specReq.brandId = null;
+      } else {
+        this.getData();
+      }
+    },
+    sizeChangeHandle(val) {
+      this.specReq.page = 1;
+      this.specReq.rows = val;
+      this.getData();
+    },
+    currentChangeHandle(val) {
+      this.specReq.page = val;
+      this.getData();
+    },
+    // 新增 / 编辑
+    handleAddOrUpdate(val) {
+      console.log(val);
+      //id, typeId, type, brandId, brand, specs, skus, rank, used, remark, types, brands
+      setTimeout(() => {
+        this.$refs.deviceListDetail.init(val, this.types, this.brands);
+      }, 500);
+      this.isShowDetail = true;
+    },
+    // 删除
+    handleDelete(val) {
+      this.$confirm(
+        "确定删除“" + val.user + "的" + val.specType + "”吗？删除后该条设备信息将无法使用",
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          this.delUserDevices(val.id);
+        })
+        .catch(() => {});
+    },
+    handlePrint(val) {
+      apiGetRePrintCode({}, val.code).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.$message("发送打印请求成功");
+        } else {
+          this.$message.error("发送打印请求失败！" + data.msg);
+        }
+      });
+    },
+    delUserDevices(id) {
+      apiDelUseDevice({
+        page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: id,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        specType: null,
+        type: null,
+        num: null,
+        unit: null, //单位 件/台
+        user: null, //使用者
+        owner: null, //所有者
+        qr: null, //设备本身标识
+        originalCode: null, //设备原有标识，老标识
+        code: null, //设备现有标识
+        mark: null, //备注
+        gmtOutbound: null, // 最后一次出库时间
+        gmtInbound: null, //第一次入库时间
+        equipmentState: null, //状态
+        buyAmount: null, //买入金额
+        saleAmount: null, //出售金额
+        no: null, //审批流水
+        brandId: null,
+        typeId: null,
+        gmtInStartTime: null,
+        gmtInEndTime: null,
+        gmtOutStartTime: null,
+        gmtOutEndTime: null,
+        count: null,
+        other: 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;
+      apiGetUseDeviceList(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.data = data.rows;
+          this.totalPage = data.total;
+          this.types = data.types;
+          this.tCounts = data.tCounts;
+          this.specReq.count = data.curCount;
+        } else {
+          this.data = [];
+        }
+        this.dataListLoading = false;
+      });
+    },
+    getBrands() {
+      apiGetDeviceBrands(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.brands = data.brands;
+          this.getData();
+        } else {
+          this.brands = [];
+        }
+        this.dataListLoading = false;
+      });
+    },
+    btnSearch() {
+      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>
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-spec-detail.vue b/src/views/modules/device-manage/device-spec-detail.vue
new file mode 100644
index 0000000..7df1ffb
--- /dev/null
+++ b/src/views/modules/device-manage/device-spec-detail.vue
@@ -0,0 +1,216 @@
+<template>
+  <el-dialog :title="!id ? '新增规格' : '编辑规格'" :close-on-click-modal="false" :visible.sync="visible"
+  >
+    
+      <el-form :inline="true">
+        <el-form-item label="类型">
+          <el-select
+            v-model="specReq.typeId"
+            :disabled="departmentReaderOnly"
+            @change="changeType"
+          >
+            <el-option v-for="item in types" :key="item.id" :label="item.type" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="品牌">
+          <el-select
+            v-model="specReq.brandId"
+            :disabled="departmentReaderOnly"
+            placeholder="请选择"
+            @change="changeBrand"
+          >
+            <el-option v-for="item in brands" :key="item.id" :label="item.brand" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true">
+        <el-form-item label="规格">
+          <el-input v-model="specs" placeholder="规格名称" clearable>{{specs}}</el-input>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input v-model="rank" placeholder="请输入数字" clearable>{{rank}}</el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true">
+        <el-form-item label="库存">
+          <el-input v-model="skus" placeholder="库存数量" clearable>{{skus}}</el-input>
+        </el-form-item>
+        <el-form-item label="已使用">
+          <el-input v-model="used" placeholder="已使用数量" clearable>{{used}}</el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true">
+        <el-form-item label="备注">
+          <el-input v-model="remark" placeholder="备注" clearable>{{remark}}</el-input>
+        </el-form-item>
+      </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="warning" @click="save">取消</el-button>
+      <el-button type="primary" @click="save">保存</el-button>
+      
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { apiGetDeviceBrands, apiEditDeviceSpecs, apiAddDeviceSpecs } from "@/api/api_equipment";
+export default {
+  data() {
+    return {
+      visible: false,
+      types: [],
+      brands: [],
+      id: null,
+      typeId: null,
+      brandId: null,
+      type:null,
+      brand:null,
+      specs: "",
+      skus: 0, //库存
+      rank: 0, //排序
+      used: 0, //使用
+      remark: "", //备注
+      departmentReaderOnly: false,
+      isAdd: false,
+      specReq: {
+        page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: null,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        specs: null,
+        brandId: null,
+        typeId: null,
+        rank: null, //排序
+        skus: null, //库存
+        remark: null,
+        used: 0, //是否在
+      },
+    };
+  },
+  mounted() {},
+  computed: {},
+  methods: {
+    async init(
+      obj,
+      types,
+      brands
+    ) {
+      console.log("device-spec-detail init")
+      this.specReq.typeId = obj.typeId
+      this.typeId = obj.typeId
+      this.specReq.brandId = obj.brandId
+      this.brandId = obj.brandId
+      this.id = obj.id
+      this.type = obj.type
+      this.brand = obj.brand
+      this.specs = obj.specs
+      this.skus = obj.skus
+      this.rank = obj.rank
+      this.used = obj.used
+      this.remark = obj.remark
+      this.brand = obj.brand
+      this.types = JSON.parse(JSON.stringify(types))//拷贝一份
+      this.types.splice(0, 1)//去掉全部
+      this.brands = JSON.parse(JSON.stringify(brands))//拷贝一份
+      this.brands.splice(0, 1)//去掉全部
+      this.visible = true
+      if(!this.id){
+        this.isAdd = true
+      }else{
+        this.isAdd = false
+      }
+      if(this.typeId){
+        this.getBrands()
+      }
+      
+    },
+    changeType(val){
+      console.log(val)
+      this.specReq.brandId = null
+      this.getBrands()
+      
+    },
+    changeBrand(val){
+      console.log(val)
+      
+    },
+    getBrands(){
+      apiGetDeviceBrands(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.brands = data.brands
+          this.brands.splice(0, 1);
+        } else {
+          this.brands = [];
+        }
+        this.dataListLoading = false;
+      });
+    },
+    save(){
+      if(this.specReq.typeId == null){
+        this.$message.error('请选择类型')
+        return
+      }
+      console.log(this.specReq.brandId)
+      if(this.specReq.brandId == null){
+        this.$message.error('请选择品牌')
+        return
+      }
+      if(this.specs == null || this.specs.length == 0){
+        this.$message.error('请输入规格名称')
+        return
+      }
+      if(!this.skus  || this.skus.length == 0){
+        this.$message.error('请设置库存数量')
+        return
+      }
+      if((!this.rank && this.rank != 0) || this.rank.length == 0){
+        this.$message.error('请设置排序')
+        return
+      }
+      if((!this.used  && this.used != 0) || this.used.length == 0){
+        this.$message.error('请设置已使用数量')
+        return
+      }
+      this.specReq.specs = this.specs
+      this.specReq.skus = this.skus
+      this.specReq.rank = this.rank
+      this.specReq.remark = this.remark
+      this.specReq.used = this.used
+      this.specReq.id = this.id
+      this.editSpecs()
+    },
+    editSpecs(){
+      console.log('editSpecs')
+      if(this.isAdd){
+        apiAddDeviceSpecs(this.specReq).then((data) => {
+          console.log(data);
+          if (data && data.code === 0) {
+            this.visible = false
+            this.$message('添加成功')
+            this.$emit('refreshDataList')
+          } else {
+            this.$$message.error(data.msg)
+          }
+        });
+      } else {
+        apiEditDeviceSpecs(this.specReq).then((data) => {
+          console.log(data);
+          if (data && data.code === 0) {
+            this.visible = false
+            this.$message('更新成功')
+            this.$emit('refreshDataList')
+          } else {
+            this.$$message.error(data.msg)
+          }
+        });
+      }
+      
+    }
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-spec.vue b/src/views/modules/device-manage/device-spec.vue
new file mode 100644
index 0000000..c8aa168
--- /dev/null
+++ b/src/views/modules/device-manage/device-spec.vue
@@ -0,0 +1,297 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+
+      <el-form-item label="类型"  >
+        <el-select v-model="specReq.typeId" :disabled="departmentReaderOnly" @change="changeDepartment(1)">
+          <el-option
+            v-for="item in types"
+            :key="item.id"
+            :label="item.type"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="品牌">
+        <el-select v-model="specReq.brandId" :disabled="departmentReaderOnly" placeholder="请选择" @change="changeDepartment(2)">
+          <el-option
+            v-for="item in brands"
+            :key="item.id"
+            :label="item.brand"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="规格">
+        <el-input v-model="specReq.specs" placeholder="规格信息" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="getData()">查询</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @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 type="selection" header-align="center" align="center" width="50"></el-table-column>
+      <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
+      <el-table-column prop="type" header-align="center" align="center" label="类型"></el-table-column>
+      <el-table-column prop="brand" header-align="center" align="center" label="品牌"></el-table-column>
+      <el-table-column prop="specs" header-align="center" align="center" label="规格"></el-table-column>
+      <el-table-column prop="rank" header-align="center" align="center" label="排序"></el-table-column>
+      <el-table-column prop="skus" header-align="center" align="center" label="库存"></el-table-column>
+      <el-table-column prop="used" header-align="center" align="center" label="已使用"></el-table-column>
+      <el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
+      <el-table-column fixed="right" header-align="center" align="center" width="180" label="操作">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            @click="handleAddOrUpdate(scope.row)"
+          >编辑
+          </el-button>
+          <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-spec-detail v-if="isShowDetail" ref="deviceSpecDetail" @refreshDataList="getData"></device-spec-detail>
+  </div>
+</template>
+<script>
+import { apiGetDeviceSpecs, apiGetDeviceBrands, apiDelDeviceSpecs } from "@/api/api_equipment";
+import * as dd from "dingtalk-jsapi";
+import DeviceSpecDetail from './device-spec-detail.vue'
+export default {
+  components: {
+      DeviceSpecDetail
+    },
+  data() {
+    
+    return {
+      isShowSearch: true,
+      data: [],
+      types: [],
+      brands: [],
+      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,
+        specs: null,
+        brandId: null,
+        typeId: null,
+        rank: null, //排序
+        skus: null, //库存
+        remark: null,
+        used: 0, //是否在
+        
+      },
+      isShowDetail: false
+    };
+  },
+  created() {
+    // this.handleGetImgCaptcha()
+  },
+  
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    
+    addNewSpec(){
+      //id, typeId, type, brandId, brand, specs, skus, rank, used, remark, types, brands
+      setTimeout(() => {
+        var val = {id: null, typeId: null, type: null, brandId: null, brand: null, specs: null, skus: null, rank: 0, used: 0, remark: null}
+        this.$refs.deviceSpecDetail.init(val, this.types, this.brands)
+      }, 500)
+      this.isShowDetail = true
+      
+    },
+    changeDepartment(type) {
+      if(type == 1){
+        //获取品牌
+        this.getBrands()
+        this.specReq.brandId = null
+      }else{
+        this.getData()
+      }
+    },
+    sizeChangeHandle(val) {
+      this.specReq.page = 1
+      this.specReq.rows = val
+      this.getData();
+    },
+    currentChangeHandle(val) {
+      this.specReq.page = val
+      this.getData();
+    },
+    // 新增 / 编辑
+    handleAddOrUpdate (val) {
+      console.log(val)
+      //id, typeId, type, brandId, brand, specs, skus, rank, used, remark, types, brands
+      setTimeout(() => {
+        
+        this.$refs.deviceSpecDetail.init(val, this.types, this.brands)
+      }, 500)
+      this.isShowDetail = true
+    },
+    // 删除
+      handleDelete (val) {
+        
+        this.$confirm('确定删除“' + val.specs + '”吗？删除后该规格将无法使用', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.delDeviceSpecs(val.id)
+        }).catch(() => {
+        })
+      },
+      delDeviceSpecs(id){
+        apiDelDeviceSpecs({page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: id,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        specs: null,
+        brandId: null,
+        typeId: null,
+        rank: null, //排序
+        skus: null, //库存
+        remark: null,
+        used: 0}).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
+      apiGetDeviceSpecs(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.data = data.rows;
+          this.totalPage = data.total
+          this.types = data.types
+        } else {
+          this.data = [];
+        }
+        this.dataListLoading = false;
+      });
+    },
+    getBrands(){
+      apiGetDeviceBrands(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.brands = data.brands
+          this.getData()
+        } else {
+          this.brands = [];
+        }
+        this.dataListLoading = false;
+      });
+    },
+    btnSearch() {
+      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>
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-type-detail.vue b/src/views/modules/device-manage/device-type-detail.vue
new file mode 100644
index 0000000..278d3bc
--- /dev/null
+++ b/src/views/modules/device-manage/device-type-detail.vue
@@ -0,0 +1,120 @@
+<template>
+  <el-dialog :title="!id ? '新增规格' : '编辑规格'" :close-on-click-modal="false" :visible.sync="visible"
+  >
+    
+      
+      <el-form :inline="true">
+        <el-form-item label="类型">
+          <el-input v-model="type" placeholder="类型名称" clearable>{{type}}</el-input>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input v-model="rank" placeholder="请输入数字" clearable>{{rank}}</el-input>
+        </el-form-item>
+      </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="warning" @click="save">取消</el-button>
+      <el-button type="primary" @click="save">保存</el-button>
+      
+    </span>
+  </el-dialog>
+</template>
+<script>
+import {  apiEditDeviceTypes, apiAddDeviceTypes } from "@/api/api_equipment";
+export default {
+  data() {
+    return {
+      visible: false,
+      id: null,
+      type:null,
+      brand:null,
+      rank: 0, //排序
+      departmentReaderOnly: false,
+      isAdd: false,
+      specReq: {
+        page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: null,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        spetypecs: null,
+        describe: null,
+        rank: null, //排序
+      },
+    };
+  },
+  mounted() {},
+  computed: {},
+  methods: {
+    async init(obj) {
+      console.log("device-type-detail init")
+      this.specReq.id = obj.id
+      this.id = obj.id
+      this.type = obj.type
+      this.rank = obj.rank
+      
+    
+      this.visible = true
+      if(!this.id){
+        this.isAdd = true
+      }else{
+        this.isAdd = false
+      }
+      
+    },
+    changeType(val){
+      console.log(val)
+      this.getBrands()
+      
+    },
+    changeBrand(val){
+      console.log(val)
+      
+    },
+    
+    save(){
+      if(!this.type || this.type.length == 0){
+        this.$message.error('请输入类型名称')
+        return
+      }
+      if((!this.rank && this.rank != 0) || this.rank.length == 0){
+        this.$message.error('请设置排序')
+        return
+      }
+      this.specReq.type = this.type
+      this.specReq.rank = this.rank
+      this.specReq.id = this.id
+      this.editSpecs()
+    },
+    editSpecs(){
+      console.log('editSpecs')
+      if(this.isAdd){
+        apiAddDeviceTypes(this.specReq).then((data) => {
+          console.log(data);
+          if (data && data.code === 0) {
+            this.visible = false
+            this.$message('添加成功')
+            this.$emit('refreshDataList')
+          } else {
+            this.$$message.error(data.msg)
+          }
+        });
+      } else {
+        apiEditDeviceTypes(this.specReq).then((data) => {
+          console.log(data);
+          if (data && data.code === 0) {
+            this.visible = false
+            this.$message('更新成功')
+            this.$emit('refreshDataList')
+          } else {
+            this.$$message.error(data.msg)
+          }
+        });
+      }
+      
+    }
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-type.vue b/src/views/modules/device-manage/device-type.vue
new file mode 100644
index 0000000..512a1ad
--- /dev/null
+++ b/src/views/modules/device-manage/device-type.vue
@@ -0,0 +1,260 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+
+      
+      <el-form-item label="类型">
+        <el-input v-model="specReq.type" placeholder="类型信息" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="getData()">查询</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @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 type="selection" header-align="center" align="center" width="50"></el-table-column>
+      <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
+      <el-table-column prop="type" header-align="center" align="center" label="类型"></el-table-column>
+      <el-table-column prop="rank" header-align="center" align="center" label="排序"></el-table-column>
+      <el-table-column fixed="right" header-align="center" align="center" width="180" label="操作">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            @click="handleAddOrUpdate(scope.row)"
+          >编辑
+          </el-button>
+          <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 { apiGetDeviceTypes, apiDelDeviceTypes } 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,
+        spetypecs: null,
+        describe: null,
+        rank: null, //排序
+      },
+      isShowDetail: false
+    };
+  },
+  created() {
+    // this.handleGetImgCaptcha()
+  },
+  
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    
+    addNewSpec(){
+      //id, typeId, type, brandId, brand, specs, skus, rank, used, remark, types, brands
+      setTimeout(() => {
+        var val = {id: null, type: null, rank: 0}
+        this.$refs.deviceTypeDetail.init(val)
+      }, 500)
+      this.isShowDetail = true
+      
+    },
+    changeDepartment(type) {
+      if(type == 1){
+        //获取品牌
+        this.getBrands()
+        this.specReq.brandId = null
+      }else{
+        this.getData()
+      }
+    },
+    sizeChangeHandle(val) {
+      this.specReq.page = 1
+      this.specReq.rows = val
+      this.getData();
+    },
+    currentChangeHandle(val) {
+      this.specReq.page = val
+      this.getData();
+    },
+    // 新增 / 编辑
+    handleAddOrUpdate (val) {
+      console.log(val)
+      //id, typeId, type, brandId, brand, specs, skus, rank, used, remark, types, brands
+      setTimeout(() => {
+        
+        this.$refs.deviceTypeDetail.init(val, this.types, this.brands)
+      }, 500)
+      this.isShowDetail = true
+    },
+    // 删除
+      handleDelete (val) {
+        
+        this.$confirm('确定删除“' + val.type + '”吗？删除后该类型将无法使用', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.delDeviceTTypeypes(val.id)
+        }).catch(() => {
+        })
+      },
+      delDeviceTTypeypes(id){
+        apiDelDeviceTypes({page: 1,
+        rows: 10,
+        sort: null,
+        order: null,
+        id: id,
+        isDelete: 0,
+        gmtCreate: null,
+        gmtModified: null,
+        type: null,
+        rank: 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
+      apiGetDeviceTypes(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.data = data.rows;
+          this.totalPage = data.total
+          this.types = data.types
+        } else {
+          this.data = [];
+        }
+        this.dataListLoading = false;
+      });
+    },
+    getBrands(){
+      apiGetDeviceBrands(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.brands = data.brands
+          this.getData()
+        } else {
+          this.brands = [];
+        }
+        this.dataListLoading = false;
+      });
+    },
+    btnSearch() {
+      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>
\ No newline at end of file
diff --git a/src/views/modules/equipment/main.vue b/src/views/modules/equipment/main.vue
deleted file mode 100644
index 25ec54c..0000000
--- a/src/views/modules/equipment/main.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
-    <el-row>
-        <el-col :span="24"><div class="grid-content bg-purple-dark"></div></el-col>
-    </el-row>          
-</template>
-
-<script>
-import { apiDingtalkLogin } from '@/api/api_staff'
-import {apiDingtalkJump } from '@/api/api_staff'
-import * as dd from 'dingtalk-jsapi'
-var dingCode = null
-export default {
-  data () {
-    return {
-      isloading: false,
-      dataForm: {
-        userName: '',
-        password: '',
-        uuid: '',
-        // captcha: ''
-        verify: '身份验证中...'
-      },
-      req: {
-        code: ''
-      },
-      // captchaPath: '' // 图像验证码请求地址
-      time: 0,
-      timer: true,
-      hasSendCode: true,
-      tick: 1
-    }
-  },
-  created () {
-    // this.handleGetImgCaptcha()
-  },
-  mounted () {
-    if(this.isDingtalk()){
-      if(typeof this.$route.query.code == 'undefined'){
-        console.log('走钉钉免登流程')
-        this.dingtalkLogin()
-        this.checkDingTalkLogin()
-      } else {
-        this.loginJump()
-      }
-    } else {
-      
-        this.loginJump()
-    }
-  },
-  methods: {
-    loginJump () {
-      this.dataForm.verify = '验证中'
-      console.log(this.$route.query)
-      this.req.code = this.$route.query.code
-      apiDingtalkJump(this.req).then(res => {
-            
-            console.log(res)
-            if (res && res.code === 0) {
-              console.log('获取token')
-              this.$cookie.set('token', res.token)
-              window.location.href=this.$route.query.url
-
-              //window.open(window.location.href + '&code=' + dingCode.code, "_blank")
-              console.log('跳转')
-            } else {
-              this.dataForm.verify='身份验证失败' + res.msg
-              this.$message.error(this.dataForm.verify)
-              this.$router.replace({ name: 'login' })
-            }
-            this.hasSendCode = false;
-          })
-    },
-    checkDingTalkLogin ()  {
-      if(dingCode === null){
-        if(this.tick < 30){
-          this.isTick++
-          setTimeout(() =>{
-            this.checkDingTalkLogin()
-          }, 300)
-        }else{
-          this.$message.error('登录失败，请用账户和密码登录')
-          this.$router.replace({ name: 'login' })
-        }
-        
-      } else {
-        this.loginWtihCode(dingCode)
-      }
-    },
-    isDingtalk () {
-      if (/(DingTalk)/i.test(navigator.userAgent)) {
-        return true
-      } else {
-        return false
-      }
-    },
-    dingtalkLogin () {
-      dd.runtime.permission.requestAuthCode({
-        corpId: 'ding267474e759bbca1c35c2f4657eb6378f',
-        onSuccess(result){
-          
-          dingCode = result
-          
-        },
-        onFail(err) {
-          
-          console.log(err)
-          dingCode = err
-        }
-      })
-    },
-    loginWtihCode (result) {
-      console.log('免登流程')
-          console.log(result)
-          apiDingtalkLogin(result).then(res => {
-            console.log('获取登录结果')
-            console.log(res)
-            this.hasSendCode = false
-            if (res && res.code === 0) {
-              console.log('获取token')
-              this.$cookie.set('token', res.token)
-              this.dataForm.verify='登录成功，跳转中...'
-              window.open(window.location.href + '&code=' + dingCode.code, "_blank")
-              console.log('跳转')
-            } else {
-              this.dataForm.verify='身份验证失败' + res.msg
-              this.$message.error(this.dataForm.verify)
-              this.$router.replace({ name: 'login' })
-            }
-          })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-row {
-    margin-bottom: 20px;
-  }
-  .el-col {
-    border-radius: 4px;
-  }
-  .bg-purple-dark {
-    background: #99a9bf;
-  }
-  .bg-purple {
-    background: #d3dce6;
-  }
-  .bg-purple-light {
-    background: #e5e9f2;
-  }
-  .grid-content {
-    border-radius: 4px;
-    min-height: 36px;
-  }
-  .row-bg {
-    padding: 10px 0;
-    background-color: #f9fafc;
-  }
-</style>

From d3368c39cfda160bf31f51c7f71d560364ae95ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Tue, 22 Sep 2020 11:33:00 +0800
Subject: [PATCH 2/3] fix

---
 .../componments/chart-bar-form/index.vue      | 100 ++++++++++++
 .../chart/componments/chart-form/index.vue    |   6 +-
 .../chart/componments/query-form/index.vue    | 154 ++++++++++++++++++
 src/views/modules/result/chart/index.vue      |  21 +--
 4 files changed, 267 insertions(+), 14 deletions(-)
 create mode 100644 src/views/modules/result/chart/componments/chart-bar-form/index.vue

diff --git a/src/views/modules/result/chart/componments/chart-bar-form/index.vue b/src/views/modules/result/chart/componments/chart-bar-form/index.vue
new file mode 100644
index 0000000..9d8b7d6
--- /dev/null
+++ b/src/views/modules/result/chart/componments/chart-bar-form/index.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="staff-archives-charts">
+    <div class="staff-archives-title">{{title}}</div>
+    <div :id="aId" :data="dataInfo" class="chart-box" style="height: 300px"></div>
+  </div>
+</template>
+
+<script>
+  export default{
+    props: {
+      total: 100,
+      aId: {
+        type: String,
+        default: 'mycharts'
+      },
+      dataInfo: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
+      title: {
+        type: String,
+        default: () => '分布'
+      }
+    },
+    mounted () {
+      this.initChartBar()
+    },
+    methods: {
+      initChartBar () {
+        var staffTotal = this.dataInfo.total
+        var option = {
+          color: '#3298DB',
+          // 标题
+          title: {
+            left: 'left'
+          },
+          tooltip: {
+            trigger: 'axis',
+            formatter: params => {
+              var res = '<p>等级：' + params[0].name + '</p>'
+              for (var i = 0; i < params.length; i++) {
+                res += '<p>' + params[i].seriesName + ': ' + (params[i].data * staffTotal).toFixed(0) + '</p>'
+                res += '<p> ' + '占比： ' + ': ' + params[i].data * 100 + '%' + '</p>'
+              }
+              return res
+            }
+          },
+          // 图例
+          legend: {
+            data: ['人数']
+          },
+          // x轴
+          xAxis: {
+            name: '等级',
+            data: this.dataInfo.names
+          },
+          yAxis: {
+            name: '百分比',
+            type: 'value',
+            axisLabel: {
+              show: true,
+              interval: 'auto',
+              formatter: params => {
+                // if (params.data.value === 0) return ''
+                return `${params * 100}%`
+              }
+              // : '{value} %'
+            },
+            show: true
+          },
+          // 数据
+          series: [{
+            name: '人数',
+            type: 'bar',
+            barWidth: 30,
+            label: {
+              show: true,
+              position: 'top',
+              formatter: (params) => (params.value * staffTotal).toFixed(0) + '人\n' + '占比: ' + params.value * 100 + '%'
+            },
+            data: this.dataInfo.datas
+          }
+          ]
+        }
+        var echarts = require('echarts')
+        this.chartBar = echarts.init(document.getElementById(this.aId))
+        this.chartBar.setOption(option)
+        window.onresize = echarts.getInstanceByDom(document.getElementById(this.aId)).resize()
+      }
+    }
+  }
+</script>
+
+<style lang='scss' scoped>
+  .staff-archives-charts {
+    // width: 50%;
+  }
+</style>
diff --git a/src/views/modules/result/chart/componments/chart-form/index.vue b/src/views/modules/result/chart/componments/chart-form/index.vue
index 5a7d05b..50f165a 100644
--- a/src/views/modules/result/chart/componments/chart-form/index.vue
+++ b/src/views/modules/result/chart/componments/chart-form/index.vue
@@ -36,7 +36,7 @@
           legend: {
             x: 'center',
             y: '85%',
-            show: true
+            show: false // 是否展示图例
           },
           series: {
             center: ['50%', '40%'],
@@ -53,6 +53,7 @@
           },
           label: {
             formatter: params => {
+              // if (params.data.value === 0) return ''
               return `{a|${params.data.name} (${params.data.value}人})`
             },
             rich: {
@@ -60,8 +61,9 @@
                 textAlign: 'center'
               }
             }
+          },
+          labelLine: {
           }
-
         }
       }
     },
diff --git a/src/views/modules/result/chart/componments/query-form/index.vue b/src/views/modules/result/chart/componments/query-form/index.vue
index 844e3e1..b25512b 100644
--- a/src/views/modules/result/chart/componments/query-form/index.vue
+++ b/src/views/modules/result/chart/componments/query-form/index.vue
@@ -1,4 +1,157 @@
 <!--  -->
+<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="monthTime"
+          @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 () {
+      return {
+        defaultVal: '',
+        defaultValYear: '',
+        defaultValMon: '',
+        Datalist: [],
+        index: null,
+        value2: [],
+        isChooseObj: {},
+        isChoose: false,
+        menuList: [],
+        defaultProps: {
+          children: 'list',
+          label: 'name'
+        },
+        formInline: {
+          value: []
+        }
+      }
+    },
+    computed: {},
+    beforeMount () { },
+    created () {
+      this.handleGetMenuList()
+      this.handleChangeData({
+      })
+    },
+    mounted () { },
+    methods: {
+      async  handleChangeData () {
+        this.defaultVal = this.monthTime
+        this.onSubmit()
+      },
+      // 获取侧边架构列表
+      async handleGetMenuList () {
+        let result = await apiOrganizationList()
+        this.menuList = result
+      },
+      // 修改月份
+      changeApplyMonth (val) {
+        this.defaultVal = val.getFullYear() + '-' + (val.getMonth() + 1)
+        this.defaultValYear = val.getFullYear()
+        this.defaultValMon = val.getMonth() + 1
+        console.log(this.defaultVal)
+      },
+      onSubmit () {
+        let obj = {
+          departmentId: this.formInline.departmentId,
+          monthTime: this.defaultVal
+        }
+        this.$emit('submit', obj)
+      },
+      restValue () {
+        this.formInline = {}
+        this.monthTime = ''
+      },
+      onsumbit () {
+        this.formInline = Object.assign({}, this.formInline, this.isChooseObj)
+        this.isChoose = false
+      },
+      handleNodeClick (a, b) {
+        this.isChooseObj = {
+          departmentId: a.departmentId,
+          departmentName: a.departmentName
+        }
+      }
+    },
+    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>
+
+
+
+
+<!--
+&lt;!&ndash;  &ndash;&gt;
 <template>
   <div>
     <div class="staff-archives-title">条件筛选</div>
@@ -124,3 +277,4 @@ export default {
   overflow: hidden;
 }
 </style>
+-->
diff --git a/src/views/modules/result/chart/index.vue b/src/views/modules/result/chart/index.vue
index 2bd7577..b6ce943 100644
--- a/src/views/modules/result/chart/index.vue
+++ b/src/views/modules/result/chart/index.vue
@@ -3,20 +3,17 @@
   <div class="staff-archives">
     <el-main :loding="true">
       <el-card>
-        <query-form @submit="submit" />
+        <query-form @submit="submit" :monthTime="dataInfo.monthTime"/>
       </el-card>
       <div class="staff-archives-chart">
         <el-card v-if="dataInfo.targetDistribution" >
-          <chart-form aId="id1" :dataInfo="dataInfo.targetDistribution" title="月初目标" />
+          <chart-form aId="id1" :dataInfo="dataInfo.targetDistribution" title="绩效目标进度" />
         </el-card>
         <el-card v-if="dataInfo.resultDistribution">
-          <chart-form aId="id2" :dataInfo="dataInfo.resultDistribution" title="月末结果" />
+          <chart-form aId="id2" :dataInfo="dataInfo.resultDistribution" title="绩效结果进度" />
         </el-card>
         <el-card v-if="dataInfo.staffDistribution">
-          <chart-form aId="id3" :dataInfo="dataInfo.staffDistribution" title="等级分布" />
-        </el-card>
-        <el-card v-if="dataInfo.departmentDistribution">
-          <chart-form aId="id4" :dataInfo="dataInfo.departmentDistribution" title="等级占比" />
+          <chart-bar-form aId="id3" :dataInfo="dataInfo.staffDistribution" title="绩效结果分布"/>
         </el-card>
       </div>
     </el-main>
@@ -27,16 +24,17 @@
 <script>
 import chartForm from './componments/chart-form'
 import queryForm from './componments/query-form'
+import chartBarForm from './componments/chart-bar-form'
 
 import { apiReportChart } from '@/api/api_report'
 export default {
   components: {
     chartForm,
-    queryForm
+    queryForm,
+    chartBarForm
   },
   data () {
     return {
-      monthLetter: {},
       dataInfo: {}
     }
   },
@@ -59,11 +57,10 @@ export default {
       if (result.code === 0) {
         this.dataInfo = result.data
       } else {
-        this.$message.error(result.mgs)
+        this.$message.error(result.msg)
       }
     },
-    submit (data, monthLetter) {
-      this.monthLetter = monthLetter
+    submit (data) {
       this.handleGetReportChart(data)
     }
   },

From a8cfb8ea4488c1418ca7402ef9042fe01ee0ea1c Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 22 Sep 2020 14:50:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api_equipment.js                      |  10 +
 src/assets/img/equipment/ding_sao_yi_sao.png  | Bin 0 -> 12370 bytes
 src/router/index.js                           |  11 +-
 .../device-manage/device-brand-detail.vue     |  12 +-
 .../modules/device-manage/device-brand.vue    |   8 +-
 .../modules/device-manage/device-list-add.vue |  40 +++
 .../device-manage/device-list-detail.vue      |  14 +-
 .../modules/device-manage/device-list.vue     | 177 +++++++------
 .../modules/device-manage/device-onecode.vue  | 237 ++++++++++++++++++
 .../device-manage/device-spec-detail.vue      |  10 +-
 .../modules/device-manage/device-spec.vue     |   8 +-
 .../device-manage/device-type-detail.vue      |  12 +-
 .../modules/device-manage/device-type.vue     |   8 +-
 13 files changed, 434 insertions(+), 113 deletions(-)
 create mode 100644 src/assets/img/equipment/ding_sao_yi_sao.png
 create mode 100644 src/views/modules/device-manage/device-list-add.vue
 create mode 100644 src/views/modules/device-manage/device-onecode.vue

diff --git a/src/api/api_equipment.js b/src/api/api_equipment.js
index 0aa96a2..daa6c16 100644
--- a/src/api/api_equipment.js
+++ b/src/api/api_equipment.js
@@ -120,3 +120,13 @@ export const apiGetRePrintCode = (data, code) => {
   return http({ url: `/lz_management/oneCode/re/print?code=${code}`, method: 'get', data })
 }
 
+// 批量生成制定数量的编码
+export const apiGetNewPrintCodes = (data, count) => {
+  return http({ url: `/lz_management/oneCode/new/prints?counts=${count}`, method: 'get', data })
+}
+
+// 获取编码
+export const apiGetCodes = data => {
+  return http({ url: `/lz_management/oneCode/get/getPrints`, method: 'post', data })
+}
+
diff --git a/src/assets/img/equipment/ding_sao_yi_sao.png b/src/assets/img/equipment/ding_sao_yi_sao.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e30554ce79f98d3a43f92540c9c6f979b7880c7
GIT binary patch
literal 12370
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

literal 0
HcmV?d00001

diff --git a/src/router/index.js b/src/router/index.js
index 73c3ed3..40bddf8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -33,10 +33,7 @@ const dingtalkRoutes=[
   { path: '/devicemark', component: _import('modules/device/device-mark'), name: 'devicemark', meta: { title: '设备备注' } },
   { path: '/devicestaff', component: _import('modules/device/device-staff-device'), name: 'devicestaff', meta: { title: '人员资产信息' } },
   { path: '/devicestaffdepat', component: _import('modules/device/device-staff-depat'), name: 'devicestaffdepat', meta: { title: '搜索人员' } },
-  { path: '/devicespec', component: _import('modules/device-manage/device-spec'), name: 'devicespec', meta: { title: '设备规格管理' } },
-  { path: '/devicetypes', component: _import('modules/device-manage/device-type'), name: 'devicetypes', meta: { title: '设备类型管理' } },
-  { path: '/devicebrand', component: _import('modules/device-manage/device-brand'), name: 'devicebrand', meta: { title: '设备品牌管理' } },
-  { path: '/devicelist', component: _import('modules/device-manage/device-list'), name: 'devicelist', meta: { title: '设备列表管理' } },
+  
   { path: '/devicedetail', component: _import('modules/device/device-detail'), name: 'devicedetail', meta: { title: '资产盘点设备详情页' } }
 ]
 
@@ -108,13 +105,13 @@ router.beforeEach((to, from, next) => {
   if (router.options.isAddDynamicMenuRoutes || fnCurrentRouteType(to, globalRoutes) === 'global') {
     next()
   } else if (fnIsInRoutes(to, dingtalkRoutes)) {//判断是否全屏路由
-    /*if(fnCheckToken()){
+    if(fnCheckToken()){
       next()
     } else {
       clearLoginInfo()
       next({ name: 'login' })
-    }*/
-    next()
+    }
+    //next()
     /*console.log(to)
     let newpage = router.resolve({ 
       name: to.path,
diff --git a/src/views/modules/device-manage/device-brand-detail.vue b/src/views/modules/device-manage/device-brand-detail.vue
index 73dd544..2427fc4 100644
--- a/src/views/modules/device-manage/device-brand-detail.vue
+++ b/src/views/modules/device-manage/device-brand-detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="!id ? '新增规格' : '编辑规格'" :close-on-click-modal="false" :visible.sync="visible"
+  <el-dialog :title="!id ? '新增品牌' : '编辑品牌'" :close-on-click-modal="false" :visible.sync="visible"
   >
     
       <el-form :inline="true">
@@ -25,8 +25,8 @@
       </el-form>
       
     <span slot="footer" class="dialog-footer">
-      <el-button type="warning" @click="save">取消</el-button>
-      <el-button type="primary" @click="save">保存</el-button>
+      <el-button type="warning" @click="save(0)">取消</el-button>
+      <el-button type="primary" @click="save(1)">保存</el-button>
       
     </span>
   </el-dialog>
@@ -93,7 +93,11 @@ export default {
       console.log(val)
       
     },
-    save(){
+    save(val){
+      if(val == 0){
+        this.visible = false
+        return
+      }
       if(this.specReq.typeId == null){
         this.$message.error('请选择类型')
         return
diff --git a/src/views/modules/device-manage/device-brand.vue b/src/views/modules/device-manage/device-brand.vue
index a0d1116..35df6b0 100644
--- a/src/views/modules/device-manage/device-brand.vue
+++ b/src/views/modules/device-manage/device-brand.vue
@@ -19,15 +19,14 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button @click="getData()">查询</el-button>
+        <el-button type="primary" @click="getData()">查询</el-button>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="addNewSpec()">新增品牌</el-button>
+        <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 type="selection" header-align="center" align="center" width="50"></el-table-column>
       <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
       <el-table-column prop="typeName" header-align="center" align="center" label="类型"></el-table-column>
       <el-table-column prop="brand" header-align="center" align="center" label="品牌"></el-table-column>
@@ -117,7 +116,7 @@ export default {
       
     },
     changeDepartment(type) {
-      
+      this.specReq.page = 1
       this.getData()
       
     },
@@ -193,6 +192,7 @@ export default {
       });
     },
     btnSearch() {
+      this.specReq.page = 1
       this.getData();
     },
 
diff --git a/src/views/modules/device-manage/device-list-add.vue b/src/views/modules/device-manage/device-list-add.vue
new file mode 100644
index 0000000..f60a825
--- /dev/null
+++ b/src/views/modules/device-manage/device-list-add.vue
@@ -0,0 +1,40 @@
+<template>
+  <el-dialog :title="'新增绑定信息'" :close-on-click-modal="false" :visible.sync="visible">
+    <el-form :inline="true">
+      <el-form-item label="使用钉钉扫一扫">
+        <el-image
+        style="width: 200px; height: 200px"
+        :src="url"
+        :fit="fit"></el-image>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="save">关闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      url: require('@/assets/img/equipment/ding_sao_yi_sao.png')
+      
+    };
+  },
+  mounted() {},
+  computed: {},
+  methods: {
+    async init(obj, types, brands) {
+      console.log('device-list-add init')
+      this.visible = true;
+    },
+
+    save() {
+      
+      this.visible = false
+    },
+    
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-list-detail.vue b/src/views/modules/device-manage/device-list-detail.vue
index c2e85b3..8e55bf2 100644
--- a/src/views/modules/device-manage/device-list-detail.vue
+++ b/src/views/modules/device-manage/device-list-detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="!id ? '新增规格' : '编辑规格'" :close-on-click-modal="false" :visible.sync="visible">
+  <el-dialog :title="!id ? '新增' : '编辑设备信息'" :close-on-click-modal="false" :visible.sync="visible">
     <el-form :inline="true">
       <el-form-item label="类型">
         <el-select v-model="type" :disabled="departmentReaderOnly" @change="changeType"></el-select>
@@ -78,8 +78,8 @@
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button type="warning" @click="save">取消</el-button>
-      <el-button type="primary" @click="save">保存</el-button>
+      <el-button type="warning" @click="save(0)">取消</el-button>
+      <el-button type="primary" @click="save(1)">保存</el-button>
     </span>
   </el-dialog>
 </template>
@@ -176,7 +176,12 @@ export default {
       this.visible = true;
     },
 
-    save() {
+    save(val) {
+      if(val == 0){
+        this.visible = false
+        return
+      }
+
       
       this.specReq.id = this.id
       this.specReq.buyAmount = this.buyAmount;
@@ -187,6 +192,7 @@ export default {
       this.specReq.originalCode = this.originalCode;
       this.specReq.no = this.no;
       this.editSpecs();
+      
     },
     editSpecs() {
       console.log("editSpecs");
diff --git a/src/views/modules/device-manage/device-list.vue b/src/views/modules/device-manage/device-list.vue
index c49cb97..c49980b 100644
--- a/src/views/modules/device-manage/device-list.vue
+++ b/src/views/modules/device-manage/device-list.vue
@@ -92,12 +92,12 @@
         <el-input v-model="specReq.user" placeholder="使用人信息" clearable></el-input>
       </el-form-item>
 
-      <el-form-item label="现有编号">
-        <el-input v-model="specReq.code" placeholder="现有编号" clearable></el-input>
+      <el-form-item label="现有编码">
+        <el-input v-model="specReq.code" placeholder="现有编码" clearable></el-input>
       </el-form-item>
 
-      <el-form-item label="自带编号">
-        <el-input v-model="specReq.qr" placeholder="自带编号" clearable></el-input>
+      <el-form-item label="自带标识">
+        <el-input v-model="specReq.qr" placeholder="设备自带标识" clearable></el-input>
       </el-form-item>
 
       <el-form-item label="备注">
@@ -110,19 +110,21 @@
       <el-form-item>
         <el-button type="warning" @click="clearGet()">清空筛选</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button type="success" @click="addNew()">新增</el-button>
+      </el-form-item>
     </el-form>
 
     <el-table v-loading="dataListLoading" :data="data" style="width: 100%" @row-click="rowClick">
-      <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
       <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
       <el-table-column prop="type" header-align="center" align="center" label="类型"></el-table-column>
       <el-table-column prop="brandName" header-align="center" align="center" label="品牌"></el-table-column>
       <el-table-column prop="specType" header-align="center" align="center" label="规格"></el-table-column>
       <el-table-column prop="user" header-align="center" align="center" label="使用方"></el-table-column>
-      <el-table-column prop="code" header-align="center" align="center" label="现有标识"></el-table-column>
+      
+      <el-table-column prop="code" header-align="center" align="center" label="现有编码"></el-table-column>
+      
       <el-table-column prop="originalCode" header-align="center" align="center" label="自带标识"></el-table-column>
-      <el-table-column prop="gmtOutbound" header-align="center" align="center" label="出库时间"></el-table-column>
-      <el-table-column prop="gmtInbound" header-align="center" align="center" label="入库时间"></el-table-column>
       <el-table-column prop header-align="center" align="center" label="状态">
         <template slot-scope="scope">
           <div class="conatnt-name">
@@ -130,10 +132,14 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column prop="mark" header-align="center" align="center" label="备注"></el-table-column>
+      <el-table-column prop="gmtOutbound" header-align="center" align="center" label="出库时间"></el-table-column>
+      <el-table-column prop="gmtInbound" header-align="center" align="center" label="入库时间"></el-table-column>
+      
       <el-table-column prop="buyAmount" header-align="center" align="center" label="买入金额"></el-table-column>
       <el-table-column prop="saleAmount" header-align="center" align="center" label="出售金额"></el-table-column>
       <el-table-column prop="no" header-align="center" align="center" label="审批编号"></el-table-column>
-      <el-table-column prop="mark" 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="handleAddOrUpdate(scope.row)">编辑</el-button>
@@ -152,6 +158,7 @@
       layout="total, sizes, prev, pager, next, jumper"
     ></el-pagination>
     <device-list-detail v-if="isShowDetail" ref="deviceListDetail" @refreshDataList="getData"></device-list-detail>
+    <device-list-add v-if="isShowAdd" ref="deviceListAdd" @refreshDataList="getData"></device-list-add>
   </div>
 </template>
 <script>
@@ -164,13 +171,16 @@ import {
 } from "@/api/api_equipment";
 import * as dd from "dingtalk-jsapi";
 import DeviceListDetail from "./device-list-detail.vue";
+import DeviceListAdd from "./device-list-add.vue";
 export default {
   components: {
     DeviceListDetail,
+    DeviceListAdd,
   },
   data() {
     return {
       isShowSearch: true,
+      isShowAdd: true,
       data: [],
       types: [],
       brands: [],
@@ -251,40 +261,13 @@ export default {
       }
       return status;
     },
-    clearGet() {
-      this.specReq.page = 1
-      this.specReq.sort = null
-      this.specReq.order = null
-      this.specReq.id = null
-      this.specReq.gmtCreate = null
-      this.specReq.gmtModified = null
-      this.specReq.specType = null
-      this.specReq.type = null
-      this.specReq.num = null
-      this.specReq.qr = null
-      this.specReq.unit = null
-      this.specReq.user = null
-      this.specReq.owner = null
-      this.specReq.originalCode = null
-      this.specReq.code = null
-      this.specReq.mark = null
-      this.specReq.gmtOutbound = null
-      this.specReq.gmtInbound = null
-      this.specReq.equipmentState = null
-      this.specReq.buyAmount = null
-      this.specReq.saleAmount = null
-      this.specReq.no = null
-      this.specReq.brandId = null
-      this.specReq.typeId = null
-      this.specReq.gmtInStartTime = null
-      this.specReq.gmtInEndTime = null
-      this.specReq.gmtOutStartTime = null
-      this.specReq.gmtOutEndTime = null
-      this.specReq.other = null
-      this.inTime = null
-      this.outTime = null
-      this.getData()
+    addNew() {
+      setTimeout(() => {
+        this.$refs.deviceListAdd.init(null, this.types, this.brands);
+      }, 500);
+      this.isShowDetail = true;
     },
+    
     changeOutData(val) {
       console.log(val)
       if(val){
@@ -295,8 +278,7 @@ export default {
         this.specReq.gmtOutEndTime = null
       }
       
-      this.specReq.page = 1
-      this.getData()
+      this.btnSearch()
     },
     changeInData(val) {
       console.log(val)
@@ -308,8 +290,7 @@ export default {
         this.specReq.gmtInEndTime = null
       }
       
-      this.specReq.page = 1
-      this.getData()
+      this.btnSearch()
     },
     changeDepartment(type) {
       this.specReq.page = 1;
@@ -318,17 +299,46 @@ export default {
         this.getBrands();
         this.specReq.brandId = null;
       } else {
-        this.getData();
+        this.btnSearch()
       }
     },
     sizeChangeHandle(val) {
-      this.specReq.page = 1;
       this.specReq.rows = val;
-      this.getData();
+      this.btnSearch()
+    },
+    getData() {
+      console.log("获取数据");
+      console.log(this.name);
+      console.log(this.categorys);
+      this.dataListLoading = true;
+      apiGetUseDeviceList(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.data = data.rows;
+          this.totalPage = data.total;
+          this.types = data.types;
+          this.tCounts = data.tCounts;
+          this.specReq.count = data.curCount;
+        } else {
+          this.data = [];
+        }
+        this.dataListLoading = false;
+      });
+    },
+    getBrands() {
+      apiGetDeviceBrands(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.brands = data.brands;
+          this.btnSearch()
+        } else {
+          this.brands = [];
+        }
+        this.dataListLoading = false;
+      });
     },
     currentChangeHandle(val) {
-      this.specReq.page = val;
-      this.getData();
+      this.btnSearch()
     },
     // 新增 / 编辑
     handleAddOrUpdate(val) {
@@ -410,38 +420,43 @@ export default {
         this.dataListLoading = false;
       });
     },
-    getData() {
-      console.log("获取数据");
-      console.log(this.name);
-      console.log(this.categorys);
-      this.dataListLoading = true;
-      apiGetUseDeviceList(this.specReq).then((data) => {
-        console.log(data);
-        if (data && data.code === 0) {
-          this.data = data.rows;
-          this.totalPage = data.total;
-          this.types = data.types;
-          this.tCounts = data.tCounts;
-          this.specReq.count = data.curCount;
-        } else {
-          this.data = [];
-        }
-        this.dataListLoading = false;
-      });
-    },
-    getBrands() {
-      apiGetDeviceBrands(this.specReq).then((data) => {
-        console.log(data);
-        if (data && data.code === 0) {
-          this.brands = data.brands;
-          this.getData();
-        } else {
-          this.brands = [];
-        }
-        this.dataListLoading = false;
-      });
+    clearGet() {
+      this.specReq.page = 1
+      this.specReq.sort = null
+      this.specReq.order = null
+      this.specReq.id = null
+      this.specReq.gmtCreate = null
+      this.specReq.gmtModified = null
+      this.specReq.specType = null
+      this.specReq.type = null
+      this.specReq.num = null
+      this.specReq.qr = null
+      this.specReq.unit = null
+      this.specReq.user = null
+      this.specReq.owner = null
+      this.specReq.originalCode = null
+      this.specReq.code = null
+      this.specReq.mark = null
+      this.specReq.gmtOutbound = null
+      this.specReq.gmtInbound = null
+      this.specReq.equipmentState = null
+      this.specReq.buyAmount = null
+      this.specReq.saleAmount = null
+      this.specReq.no = null
+      this.specReq.brandId = null
+      this.specReq.typeId = null
+      this.specReq.gmtInStartTime = null
+      this.specReq.gmtInEndTime = null
+      this.specReq.gmtOutStartTime = null
+      this.specReq.gmtOutEndTime = null
+      this.specReq.other = null
+      this.inTime = null
+      this.outTime = null
+      this.getData()
     },
+    
     btnSearch() {
+      this.specReq.page = 1
       this.getData();
     },
 
diff --git a/src/views/modules/device-manage/device-onecode.vue b/src/views/modules/device-manage/device-onecode.vue
new file mode 100644
index 0000000..51cee62
--- /dev/null
+++ b/src/views/modules/device-manage/device-onecode.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+
+      <el-form-item label="打印状态">
+        <el-select
+          v-model="specReq.isPrint"
+          :disabled="departmentReaderOnly"
+          @change="changeDepartment()"
+        >
+          <el-option v-for="item in stateList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="编码">
+        <el-input v-model="specReq.code" placeholder="请输入编码" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="getData()">查询</el-button>
+      </el-form-item>
+
+      <el-form-item label="新打印数量">
+        <el-input v-model="newCount" placeholder="请输入要新打印机编码数量" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="success" @click="printNewCodes()">新打印</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="code" header-align="center" align="center" label="编码"></el-table-column>
+      <el-table-column prop="isPrint" header-align="center" align="center" label="是否打印">
+        <template slot-scope="scope">
+          <div class="conatnt-name">
+            <span>{{ getStatusStr(scope.row.isPrint) }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" header-align="center" align="center" width="180" label="操作">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            @click="handlePrint(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 { apiGetNewPrintCodes, apiGetCodes, apiGetRePrintCode } from "@/api/api_equipment";
+import DeviceTypeDetail from './device-type-detail.vue'
+export default {
+  components: {
+      DeviceTypeDetail
+    },
+  data() {
+    
+    return {
+      isShowSearch: true,
+      data: [],
+      dataListLoading: false,
+      newCount: null, 
+      showHeader: false,
+      totalPage: 1,
+      departmentReaderOnly: false,
+      specReq: {
+        page: 1,
+        rows: 10,
+        id: null,
+        isDelete: 0,
+        isPrint: null,
+        gmtCreate: null,
+        gmtModified: null,
+        code: null,
+      },
+      stateList:[
+        {value: null, label: '全部'},
+        {value: 0, label: '未打印'},
+        {value: 1, label: '已打印'},
+      ],
+      isShowDetail: false
+    };
+  },
+  created() {
+    // this.handleGetImgCaptcha()
+  },
+  
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    printNewCodes(){
+      if(!this.newCount || this.newCount == 0){
+        this.$message.error('请输入大于0的打印数量')
+        return
+      }
+      apiGetNewPrintCodes({}, this.newCount).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.getData()
+          this.$message("发送打印请求成功");
+          
+        } else {
+          this.$message.error("发送打印请求失败！" + data.msg);
+        }
+      });
+    },
+    changeDepartment(){
+      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();
+    },
+    getStatusStr(status) {
+      if (status < 2) {
+        return this.stateList[status + 1].label;
+      }
+      return status;
+    },
+    handlePrint(val) {
+      apiGetRePrintCode({}, val.code).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.getData()
+          this.$message("发送打印请求成功");
+          
+        } else {
+          this.$message.error("发送打印请求失败！" + data.msg);
+        }
+      });
+    },
+    
+    getData() {
+      console.log("获取数据")
+      console.log(this.name)
+      console.log(this.categorys)
+      this.dataListLoading = true
+      apiGetCodes(this.specReq).then((data) => {
+        console.log(data);
+        if (data && data.code === 0) {
+          this.data = data.codes.list;
+          this.totalPage = data.codes.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>
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-spec-detail.vue b/src/views/modules/device-manage/device-spec-detail.vue
index 7df1ffb..24b07b3 100644
--- a/src/views/modules/device-manage/device-spec-detail.vue
+++ b/src/views/modules/device-manage/device-spec-detail.vue
@@ -46,8 +46,8 @@
         </el-form-item>
       </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button type="warning" @click="save">取消</el-button>
-      <el-button type="primary" @click="save">保存</el-button>
+      <el-button type="warning" @click="save(0)">取消</el-button>
+      <el-button type="primary" @click="save(1)">保存</el-button>
       
     </span>
   </el-dialog>
@@ -150,7 +150,11 @@ export default {
         this.dataListLoading = false;
       });
     },
-    save(){
+    save(val){
+      if(val == 0){
+        this.visible = false
+        return
+      }
       if(this.specReq.typeId == null){
         this.$message.error('请选择类型')
         return
diff --git a/src/views/modules/device-manage/device-spec.vue b/src/views/modules/device-manage/device-spec.vue
index c8aa168..872a361 100644
--- a/src/views/modules/device-manage/device-spec.vue
+++ b/src/views/modules/device-manage/device-spec.vue
@@ -28,15 +28,14 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button @click="getData()">查询</el-button>
+        <el-button type="primary"  @click="getData()">查询</el-button>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="addNewSpec()">新增规格</el-button>
+        <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 type="selection" header-align="center" align="center" width="50"></el-table-column>
       <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
       <el-table-column prop="type" header-align="center" align="center" label="类型"></el-table-column>
       <el-table-column prop="brand" header-align="center" align="center" label="品牌"></el-table-column>
@@ -142,6 +141,7 @@ export default {
         this.getBrands()
         this.specReq.brandId = null
       }else{
+        this.specReq.page = 1
         this.getData()
       }
     },
@@ -224,6 +224,7 @@ export default {
         console.log(data);
         if (data && data.code === 0) {
           this.brands = data.brands
+          this.specReq.page = 1
           this.getData()
         } else {
           this.brands = [];
@@ -232,6 +233,7 @@ export default {
       });
     },
     btnSearch() {
+      this.specReq.page = 1
       this.getData();
     },
 
diff --git a/src/views/modules/device-manage/device-type-detail.vue b/src/views/modules/device-manage/device-type-detail.vue
index 278d3bc..b3332b4 100644
--- a/src/views/modules/device-manage/device-type-detail.vue
+++ b/src/views/modules/device-manage/device-type-detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="!id ? '新增规格' : '编辑规格'" :close-on-click-modal="false" :visible.sync="visible"
+  <el-dialog :title="!id ? '新增类型' : '编辑类型'" :close-on-click-modal="false" :visible.sync="visible"
   >
     
       
@@ -12,8 +12,8 @@
         </el-form-item>
       </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button type="warning" @click="save">取消</el-button>
-      <el-button type="primary" @click="save">保存</el-button>
+      <el-button type="warning" @click="save(0)">取消</el-button>
+      <el-button type="primary" @click="save(1)">保存</el-button>
       
     </span>
   </el-dialog>
@@ -74,7 +74,11 @@ export default {
       
     },
     
-    save(){
+    save(val){
+      if(val == 0){
+        this.visible = false
+        return
+      }
       if(!this.type || this.type.length == 0){
         this.$message.error('请输入类型名称')
         return
diff --git a/src/views/modules/device-manage/device-type.vue b/src/views/modules/device-manage/device-type.vue
index 512a1ad..c616c78 100644
--- a/src/views/modules/device-manage/device-type.vue
+++ b/src/views/modules/device-manage/device-type.vue
@@ -8,15 +8,14 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button @click="getData()">查询</el-button>
+        <el-button type="primary" @click="getData()">查询</el-button>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="addNewSpec()">新增类型</el-button>
+        <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 type="selection" header-align="center" align="center" width="50"></el-table-column>
       <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
       <el-table-column prop="type" header-align="center" align="center" label="类型"></el-table-column>
       <el-table-column prop="rank" header-align="center" align="center" label="排序"></el-table-column>
@@ -109,6 +108,7 @@ export default {
         this.getBrands()
         this.specReq.brandId = null
       }else{
+        this.specReq.page = 1
         this.getData()
       }
     },
@@ -187,6 +187,7 @@ export default {
         console.log(data);
         if (data && data.code === 0) {
           this.brands = data.brands
+          this.specReq.page = 1
           this.getData()
         } else {
           this.brands = [];
@@ -195,6 +196,7 @@ export default {
       });
     },
     btnSearch() {
+      this.specReq.page = 1
       this.getData();
     },