check and checkprocess

src/api/equipment/check.js

+import request from '@/utils/request'
+import Qs from 'qs'
+// 查询角色列表
+export function listCheck(query) {
+  return request({
+    url: '/wbwarehouse/queryWbWarehouseByPagination',
+    method: 'get',
+    params: query
+  })
+}
+export function getlistRole() {
+  return request({
+    url: 'system/role/listAll',
+    method: 'get'
+  })
+}
+
+// 查询角色详细
+export function getRole(businessId) {
+  return request({
+    url: '/system/role/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addRole(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/add',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 修改角色
+export function updateRole(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/update/' + businessId,
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色数据权限
+export function dataScope(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/dataScope',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色状态修改
+export function changeRoleStatus(businessId, flag) {
+  const data = {
+    businessId,
+    flag
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    params: data
+  })
+}
+
+// 删除角色
+export function delRole(roleId) {
+  return request({
+    url: '/system/role/deleteLogical/' + roleId,
+    method: 'delete'
+  })
+}
+
+// 导出角色
+export function exportRole(query) {
+  return request({
+    url: '/system/role/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/equipment/checkProcess.js

+import request from '@/utils/request'
+import Qs from 'qs'
+// 查询角色列表
+export function listCheck(query) {
+  return request({
+    url: '/wbwarehouse/queryWbWarehouseByPagination',
+    method: 'get',
+    params: query
+  })
+}
+export function getlistRole() {
+  return request({
+    url: 'system/role/listAll',
+    method: 'get'
+  })
+}
+
+// 查询角色详细
+export function getRole(businessId) {
+  return request({
+    url: '/system/role/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addRole(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/add',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 修改角色
+export function updateRole(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/update/' + businessId,
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色数据权限
+export function dataScope(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/dataScope',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色状态修改
+export function changeRoleStatus(businessId, flag) {
+  const data = {
+    businessId,
+    flag
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    params: data
+  })
+}
+
+// 删除角色
+export function delRole(roleId) {
+  return request({
+    url: '/system/role/deleteLogical/' + roleId,
+    method: 'delete'
+  })
+}
+
+// 导出角色
+export function exportRole(query) {
+  return request({
+    url: '/system/role/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/views/equipment/check.vue

@@ -42,7 +42,7 @@
             :type="typePrimary"
             :size="smallSize"
             :icon="addIcon"
-          >
+          >开始盘点
             {{ check }}
           </el-button>
         </el-form-item>
@@ -181,6 +181,7 @@ import {
   listRole,
   updateRole
 } from '@/api/system/role'
+import {listCheck} from '@/api/equipment/check'
 import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
 import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
@@ -200,9 +201,9 @@ export default {
       },
       // 是否显示弹出层（数据详情）
       openDetails: false,
-      // TODO: 模拟测试数据
-      equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
-      check: '开始盘点',
+      // // TODO: 模拟测试数据
+      // equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
+      // check: '开始盘点',
       typeParent: 'text',
       typePrimary: 'primary',
       typeSuccess: 'success',
@@ -361,9 +362,9 @@ export default {
     /** 查询角色列表 */
     getList() {
       this.loading = true
-      listRole(this.queryParams).then(
+      listCheck(this.queryParams).then(
         response => {
-          this.roleList = response.rows
+          this.equipmentList = response.rows
           this.total = response.total
           this.loading = false
         }

src/views/equipment/checkProcess.vue

@@ -42,7 +42,7 @@
             :type="typePrimary"
             :size="smallSize"
             :icon="addIcon"
-          >
+          >开始盘点
             {{ check }}
           </el-button>
         </el-form-item>
@@ -181,6 +181,7 @@ import {
   listRole,
   updateRole
 } from '@/api/system/role'
+import {listCheck} from '@/api/equipment/check'
 import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
 import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
@@ -200,9 +201,9 @@ export default {
       },
       // 是否显示弹出层（数据详情）
       openDetails: false,
-      // TODO: 模拟测试数据
-      equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
-      check: '开始盘点',
+      // // TODO: 模拟测试数据
+      // equipmentList: [{ equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { equipmentCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
+      // check: '开始盘点',
       typeParent: 'text',
       typePrimary: 'primary',
       typeSuccess: 'success',
@@ -361,9 +362,9 @@ export default {
     /** 查询角色列表 */
     getList() {
       this.loading = true
-      listRole(this.queryParams).then(
+      listCheck(this.queryParams).then(
         response => {
-          this.roleList = response.rows
+          this.equipmentList = response.rows
           this.total = response.total
           this.loading = false
         }
@@ -686,28 +687,28 @@ export default {
   }
 }
 .app-container {
-  font-size: 18px;
-  padding: 0;
+    font-size: 18px;
+    padding: 0;
 
-  .placeholder {
-    height: 1.3vh;
-    background-color: #F4F4F4;
-    margin-bottom: 10px
-  }
+    .placeholder {
+        height: 1.3vh;
+        background-color: #F4F4F4;
+        margin-bottom: 10px
+    }
 
-  .table-drop {
-    vertical-align: 2px;
-    line-height: 20px;
-    margin-left: 15px
-  }
+    .table-drop {
+        vertical-align: 2px;
+        line-height: 20px;
+        margin-left: 15px
+    }
 
-  .el-switch {
-    margin-left: 15px;
-  }
+    .el-switch {
+        margin-left: 15px;
+    }
 }
 
 .el-divider--vertical {
-  height: 12em;
-  width: 4px;
+    height: 12em;
+    width: 4px;
 }
 </style>

src/views/equipment/equipmentAbandonment.vue

@@ -52,7 +52,7 @@
       <div style="padding:5px 10px">
         <div class="mb12 font-small-bold">设备管理列表</div>
         <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
+          <!-- <el-table-column type="selection" width="55" /> -->
           <el-table-column type="index" label="序号" width="80" />
           <el-table-column label="编码" prop="equipmentCode" width="120">
             <template slot-scope="scope">
@@ -89,7 +89,14 @@
               <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
                 详情
               </el-button>
+              <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >废弃</el-button>
             </template>
+            
           </el-table-column>
         </el-table>
       </div>
@@ -103,7 +110,7 @@
   
       <!-- 添加或修改设备配置对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form ref="form"  :rules="rules" size="small" label-width="80px">
           <el-form-item label="名称" prop="roleName">
             <el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入设备名称" />
           </el-form-item>
@@ -122,7 +129,7 @@
               class="tree-border"
               :data="menuOptions"
               show-checkbox
-              node-key="id"
+              node-key="id" 
               check-strictly
               empty-text="加载中，请稍后"
               :props="defaultProps"
@@ -510,11 +517,11 @@
         this.handleQuery()
       },
       // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.roleId)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
+      // handleSelectionChange(selection) {
+      //   this.ids = selection.map(item => item.roleId)
+      //   this.single = selection.length !== 1
+      //   this.multiple = !selection.length
+      // },
       // // 树权限（父子联动）
       // handleCheckedTreeConnect(value, type) {
       //   if (type === 'menu') {

vue.config.js

@@ -82,7 +82,8 @@ module.exports = {
         // target: `http://192.168.1.29:8088/`,
         // target: `http://10.5.87.231:10010/internal`,
         // target: `http://117.122.212.91:32012/`,
-        target: `http://192.144.239.97:20070/`,
+        // target: `http://192.144.239.97:20070/`,
+        target: `http://127.0.0.1:8088/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''