Merge remote-tracking branch 'origin/project1' into project1

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/api/processLibrary/InventoryRecord.js

 import request from '@/utils/request'
 
-export function listLog() {
+export function listLog(queryParams) {
   return request({
-    url: '/wbwarehouselog/queryWbWarehouseLogs',
-    method: 'get'
+    url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
+    method: 'get',
+    params: queryParams
   })
 }

src/views/equipment/boundinout.vue

@@ -2,56 +2,49 @@
   <div class="app-container">
     <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="68px">
 
-      <el-form-item label="设备名称" prop="userName">
+      <el-form-item label="设备编码" prop="pn">
         <el-input
-          v-model="queryParams.username"
-          placeholder="请输入设备名称"
-          clearable
-          :maxlength="30"
-          style="width: 240px;"
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="Pn" prop="userName">
-        <el-input
-          v-model="queryParams.username"
-          placeholder="Pn"
+          v-model="queryParams.pn"
+          placeholder="请输入设备编码"
           clearable
           :maxlength="30"
-          style="width: 240px;"
+          style="width: 150px;"
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
-      <el-form-item label="设备编码" prop="">
+      <el-form-item label="操作人" prop="updateBy">
         <el-input
-          v-model="queryParams.username"
-          placeholder="请输入设备编码"
+          v-model="queryParams.updateBy"
+          placeholder="请输入操作人"
           clearable
           :maxlength="30"
-          style="width: 240px;"
+          style="width: 150px;"
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
       <el-form-item>
-        <el-select v-model="selectValue" filterable placeholder="请选择库类型">
+        <el-select v-model="queryParams.selectValue" filterable placeholder="请选择库类型">
           <el-option
             v-for="option in selectOptions"
             :key="option.value"
             :label="option.label"
-            :value="option.value">
-          </el-option>
+            :value="option.value"
+          />
         </el-select>
       </el-form-item>
 
       <el-form-item>
         <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
       </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" size="small" icon="el-icon-search" @click="resetQuery">重置</el-button>
+      </el-form-item>
+
       <div style="float: right">
         <el-form-item>
           <el-button
@@ -70,13 +63,14 @@
         </el-form-item>
       </div>
     </el-form>
-    <div class="placeholder" />
 
+    <!--  TODO: 分隔符-->
+    <div class="placeholder" />
 
     <transition name="fade-transform" mode="out-in">
       <component
         :is="BaseTable"
-        :key="queryParams.pageNum"
+        :key="queryParams.rows"
         :all-table-arguments="allTableArguments"
         @handle-detail="handleDetail"
         @handle-update="handleUpdate"
@@ -199,21 +193,7 @@ export default {
       },
       // 表格数据
       list: [],
-      // 状态数据字典
-      statusOptions: [
-        {
-          dictLabel: '启用',
-          dictValue: '1'
-        },
-        {
-          dictLabel: '停用',
-          dictValue: '0'
-        }
-      ],
-      // 日期范围
-      dateRange: [],
 
-      selectValue: '',
       selectOptions: [
         {
           value: '1',
@@ -227,10 +207,9 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        ipaddr: undefined,
-        username: undefined,
-        status: undefined,
-        loginTime: ''
+        pn: '',
+        updateBy: '',
+        selectValue: ''
       },
 
       // TODO: 用来说明每一列的类型
@@ -261,11 +240,16 @@ export default {
             }
           }
         },
+        {
+          text: true,
+          prop: 'pn',
+          label: '设备编码'
+        },
         {
           ownDefined: true,
           prop: 'poperate',
           label: 'poperate',
-          width: '',
+          width: '180px',
           ownDefinedReturn: (row, $index) => {
             switch (row.poperate) {
               case '1':
@@ -281,11 +265,6 @@ export default {
             }
           }
         },
-        {
-          text: true,
-          prop: 'pn',
-          label: 'pn'
-        },
         {
           time: true,
           prop: 'updateDate',
@@ -294,7 +273,7 @@ export default {
         },
         {
           text: true,
-          prop: 'createBy',
+          prop: 'updateBy',
           label: '操作人',
           sortable: false,
           width: '210px'
@@ -312,7 +291,9 @@ export default {
             icon: '',
             color: '',
             size: this.size,
-            buttonClick: this.handleDetail,
+            buttonClick: () => {
+              return 'this.handleDetail'
+            },
             isShow: (row, $index) => {
               return true
             }
@@ -322,7 +303,9 @@ export default {
             icon: '',
             color: '',
             size: this.size,
-            buttonClick: this.handleUpdate,
+            buttonClick: () => {
+              return 'this.handleUpdate'
+            },
             isShow: (row, $index) => {
               return true
             }
@@ -332,7 +315,9 @@ export default {
             icon: '',
             color: '',
             size: this.size,
-            buttonClick: this.handleDelete,
+            buttonClick: () => {
+              return 'this.handleDelete'
+            },
             isShow: (row, $index) => {
               return true
             }
@@ -402,25 +387,15 @@ export default {
     /** 查询登录日志列表 */
     getList() {
       this.loading = true
-      // const query = Object.assign({}, this.queryParams)
-      // query.loginTime = query.loginTime ? this.$parseDate(new Date(query.loginTime), 'YYYY-MM-DD HH:mm:ss') : ''
-      // list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-      //   this.list = response.rows
-      //   this.total = response.total
-      //   this.loading = false
-      // })
-
-      listLog().then(response => {
-        this.processList = response.data
+      listLog(this.queryParams).then(response => {
+        this.total = response.rows.length
+        this.processList = response.rows
         this.loading = false
       })
     },
     handleClose() {
       this.clearVisible = false
       this.exportVisible = false
-    },
-    timechange(e) {
-
     },
     // 登录状态字典翻译
     // statusFormat(row, column) {
@@ -433,7 +408,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = ''
       this.resetForm('queryForm')
       this.handleQuery()
     },
@@ -442,51 +416,6 @@ export default {
       this.ids = selection.map(item => item.businessId)
       this.multiple = !selection.length
     },
-    /** 删除按钮操作 */
-    handleDelete(data) {
-      this.$confirm('是否确认操作？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // const id = this.ids.join(',')
-        const id = data
-        const query = {
-          deleteIds: id
-        }
-        return delLogininfo(query)
-      }).then(() => {
-        this.getList()
-        this.$message.success('删除成功')
-        this.ids = []
-        this.multiple = true
-      }).catch(function() {})
-    },
-    clear() {
-      this.$refs['clear'].validate((valid) => {
-        if (valid) {
-          const that = this
-          const query = {
-            beginTime: that.clearFrom.month[0],
-            endTime: that.clearFrom.month[1]
-          }
-          cleanLogininfo(query).then(res => {
-            if (res.code === 200) {
-              that.getList()
-              that.$message.success('清空成功')
-              this.clearVisible = false
-            } else {
-              that.$message.error(res.message)
-            }
-          })
-        }
-      })
-    },
-    /** 清空按钮操作 */
-    handleClean() {
-      this.clearVisible = true
-      this.clearFrom = {}
-    },
     exportSubmit() {
       this.$refs['export'].validate((valid) => {
         if (valid) {
@@ -515,14 +444,6 @@ export default {
     handleExport() {
       this.exportVisible = true
       this.exportFrom = {}
-      // const queryParams = Object.assign({}, this.queryParams)
-      // // queryParams.loginTime = queryParams.loginTime ? this.$parseDate(new Date(queryParams.loginTime), 'YYYY-MM-DD HH:mm:ss') : ''
-      // delete queryParams.page
-      // delete queryParams.rows
-      // queryParams.ids = this.ids.join(',') || null
-      // exportLogininfo(queryParams).then(response => {
-      //   this.download(response.msg)
-      // }).catch(function() {})
     }
   }
 }

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',

src/views/system/role/index.vue

@@ -267,8 +267,8 @@ import {
   listRole,
   updateRole
 } from '@/api/system/role'
-import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
-import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
+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'
 export default {
   name: 'Role',
@@ -340,8 +340,8 @@ export default {
       tOptions: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         roleName: undefined,
         roleKey: undefined,
         flag: undefined