Merge branch 'project1' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project1

# Conflicts:
#	src/views/processManagement/basicProcessManagement/index.vue

src/api/equipment/equipmentAbandonment.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

 <template>
   <div class="app-container">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-      <el-form-item label="设备编码" prop="equipmentCode">
+      <el-form-item label="pn" prop="pn">
         <el-input
-          v-model="queryParams.equipmentCode"
-          placeholder="请输入设备编码"
+          v-model="queryParams.pn"
+          placeholder="请输入pn"
           clearable
           :maxlength="30"
           size="small"
@@ -22,9 +22,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="位置" prop="location">
+      <el-form-item label="位置" prop="plocation">
         <el-input
-          v-model="queryParams.location"
+          v-model="queryParams.plocation"
           placeholder="请输入设备位置"
           clearable
           size="small"
@@ -54,7 +54,7 @@
       <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
         <el-table-column type="index" label="序号" width="80" />
-        <el-table-column label="编码" prop="pn" width="120">
+        <el-table-column label="pn" prop="pn" width="120">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
@@ -69,12 +69,12 @@
             {{ scope.row.plocation || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="厚度" prop="thickness">
+        <el-table-column label="厚度" prop="phd">
           <template slot-scope="scope">
-            {{ scope.row.thickness || '-' }}
+            {{ scope.row.phd || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="创建员" prop="createBy">
+        <el-table-column label="操作员" prop="createBy">
           <template slot-scope="scope">
             {{ scope.row.createBy || '-' }}
           </template>
@@ -180,7 +180,7 @@ import {
   getRole,
   updateRole
 } from '@/api/system/role'
-import {listCheck} from '@/api/equipment/check'
+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'

src/views/equipment/checkProcess.vue

 <template>
   <div class="app-container">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-      <el-form-item label="设备编码" prop="equipmentCode">
+      <el-form-item label="pn" prop="pn">
         <el-input
           v-model="queryParams.equipmentCode"
-          placeholder="请输入设备编码"
+          placeholder="请输入pn"
           clearable
           :maxlength="30"
           size="small"
@@ -54,7 +54,7 @@
       <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
         <el-table-column type="index" label="序号" width="80" />
-        <el-table-column label="编码" prop="pn" width="120">
+        <el-table-column label="pn" prop="pn" width="120">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
@@ -69,9 +69,9 @@
             {{ scope.row.plocation || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="厚度" prop="thickness">
+        <el-table-column label="厚度" prop="phd">
           <template slot-scope="scope">
-            {{ scope.row.thickness || '-' }}
+            {{ scope.row.phd || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="创建员" prop="createBy">

src/views/equipment/management.vue

 <template>
   <div class="app-container">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-      <el-form-item label="设备编码" prop="equipmentCode">
+      <el-form-item label="pn" prop="pn">
         <el-input
-          v-model="queryParams.equipmentCode"
-          placeholder="请输入设备编码"
+          v-model="queryParams.pn"
+          placeholder="请输入pn"
           clearable
           :maxlength="30"
           size="small"
@@ -14,19 +14,21 @@
       </el-form-item>
       <el-form-item label="lot" prop="lot">
         <el-input
-          v-model="queryParams.roleKey"
-          placeholder="请输入设备lot"
+          v-model="queryParams.lot"
+          placeholder="请输入lot"
           clearable
+          :maxlength="30"
           size="small"
           style="width: 150px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="位置" prop="location">
+      <el-form-item label="plocation" prop="plocation">
         <el-input
-          v-model="queryParams.location"
-          placeholder="请输入设备位置"
+          v-model="queryParams.plocation"
+          placeholder="请输入plocation"
           clearable
+          :maxlength="30"
           size="small"
           style="width: 150px"
           @keyup.enter.native="handleQuery"
@@ -34,6 +36,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <div class="placeholder" />
@@ -41,7 +44,7 @@
       <div class="mb12 font-small-bold">设备管理列表</div>
       <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="80" />
-        <el-table-column label="编码" prop="pn" width="120">
+        <el-table-column label="pn" prop="businessId" width="120">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
@@ -51,17 +54,17 @@
             {{ scope.row.lot || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="位置" prop="plocation">
+        <el-table-column label="plocation" prop="plocation">
           <template slot-scope="scope">
             {{ scope.row.plocation || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="厚度" prop="thickness">
+        <el-table-column label="厚度" prop="厚度">
           <template slot-scope="scope">
-            {{ scope.row.thickness || '-' }}
+            {{ scope.row.phd || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="创建员" prop="createBy">
+        <el-table-column label="操作员" prop="createBy">
           <template slot-scope="scope">
             {{ scope.row.createBy || '-' }}
           </template>
@@ -134,23 +137,72 @@
     <!-- TODO: 单项详情信息表单配置 -->
     <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
-        <el-form-item label="编码：" prop="pn">
-          <el-input v-model.trim="singleDetails.pn" :readonly="true" />
-        </el-form-item>
-        <el-form-item label="lot：" prop="workshop">
-          <el-input v-model.trim="singleDetails.lot" :readonly="true" />
-        </el-form-item>
-        <el-form-item label="位置：" prop="plocation">
-          <el-input v-model.trim="singleDetails.plocation" :readonly="true" />
-        </el-form-item>
-        <el-form-item label="厚度：" prop="thickness">
-          <el-input v-model.trim="singleDetails.thickness" :readonly="true" />
-        </el-form-item>
-        <el-form-item label=" 操作时间：" prop="createDate">
-          <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
-        </el-form-item>
-        <el-form-item label="操作员：" prop="createBy">
-          <el-input v-model.trim="singleDetails.createBy" :readonly="true" />
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="pn：" prop="pn">
+              <el-input v-model.trim="singleDetails.pn" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="lot：" prop="workshop">
+              <el-input v-model.trim="singleDetails.lot" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="plocation：" prop="plocation">
+              <el-input v-model.trim="singleDetails.plocation" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label=" 操作时间：" prop="createDate">
+              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="操作员：" prop="createBy">
+              <el-input v-model.trim="singleDetails.createBy" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="prank：" prop="prank">
+              <el-input v-model.trim="singleDetails.prank" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="厚度：" prop="phd">
+              <el-input v-model.trim="singleDetails.phd" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态：" prop="flag">
+              <el-input v-model.trim="singleDetails.flag" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="psm：" prop="psm">
+              <el-input v-model.trim="singleDetails.psm" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="pzl：" prop="pzl">
+              <el-input v-model.trim="singleDetails.pzl" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注：" prop="remarks">
+          <el-input v-model.trim="singleDetails.remarks" :readonly="true" />
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -277,14 +329,15 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        flag: undefined,
-        ptype: 1
+        pn: undefined,
+        lot: undefined,
+        snapLocation: undefined
       },
       // 表单参数
       form: {
-
+        pn: '',
+        lot: '',
+        plocation: ''
       },
       defaultProps: {
         children: 'children',