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

src/api/equipment/application.js

+import request from '@/utils/request'
+// 根据key值查询数据字典数据
+export function getDictData(params) {
+  return request({
+    url: '/wbapply/queryDict',
+    method: 'get',
+    params
+  })
+}
+// 新增设备新增
+export function addApplication(data) {
+  return request({
+    url: '/wbapply/add',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}

src/views/equipment/check.vue

@@ -349,7 +349,10 @@ export default {
         roleName: undefined,
         roleKey: undefined,
         flag: undefined,
-        ptype: 1
+        ptype: 1,
+        pstatus:0,
+        delFlag:0
+        
       },
       // 表单参数
       form: {

src/views/equipment/checkProcess.vue

@@ -346,8 +346,9 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        
-        ptype: 2
+        ptype: 2,
+        pstatus:0,
+        delFlag:0
       },
       // 表单参数
       form: {

src/views/equipment/equipmentAbandonment.vue

@@ -346,7 +346,9 @@ export default {
         roleName: undefined,
         roleKey: undefined,
         flag: undefined,
-        ptype:2
+        ptype:2,
+        pstatus:0,
+        delFlag:0
       },
       // 表单参数
       form: {

src/views/login/login.vue

@@ -20,20 +20,20 @@
             <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
           </el-input>
         </el-form-item>
-        <el-form-item prop="code">
-          <el-input
-            v-model="loginForm.code"
-            auto-complete="off"
-            placeholder="验证码"
-            style="width: 63%"
-            @keyup.enter.native="handleLogin"
-          >
-            <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-          </el-input>
-          <!--<div class="login-code">
-            <img :src="codeUrl" @click="getCode">
-          </div>-->
-        </el-form-item>
+<!--        <el-form-item prop="code">-->
+<!--          <el-input-->
+<!--            v-model="loginForm.code"-->
+<!--            auto-complete="off"-->
+<!--            placeholder="验证码"-->
+<!--            style="width: 63%"-->
+<!--            @keyup.enter.native="handleLogin"-->
+<!--          >-->
+<!--            <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
+<!--          </el-input>-->
+<!--          &lt;!&ndash;<div class="login-code">-->
+<!--            <img :src="codeUrl" @click="getCode">-->
+<!--          </div>&ndash;&gt;-->
+<!--        </el-form-item>-->
         <el-form-item style="width:80%;margin-bottom: 20px">
           <el-button
             class="blue-btn"

src/views/processManagement/inventoryRecord/index.vue

@@ -36,7 +36,6 @@
           />
         </el-form-item>
 
-
         <el-form-item label="库类型" prop="ptype">
           <el-select
             v-model="queryParams.ptype"
@@ -114,7 +113,7 @@
       <component
         :is="BaseTable"
         :key="queryParams.rows"
-        :nIndex="nIndex"
+        :n-index="nIndex"
         :all-table-arguments="allTableArguments"
         @handle-detail="handleDetail"
       />
@@ -133,7 +132,7 @@
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
 
         <el-row :gutter="10" justify="start" align="middle">
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="pn：" prop="pn">
               <el-input v-model.trim="singleDetails.pn" :readonly="isReadOnly" />
             </el-form-item>
@@ -143,23 +142,36 @@
             <el-form-item label="plocation：" prop="plocation">
               <el-input v-model.trim="singleDetails.plocation" :readonly="isReadOnly" />
             </el-form-item>
+            <el-form-item label="操作员：" prop="user">
+              <el-input v-model.trim="singleDetails.user" :readonly="isReadOnly" />
+            </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="库类型：" prop="ptype">
-              <el-input v-model.trim="singleDetails.ptype" :readonly="isReadOnly" />
+              {{ selectedPtype(singleDetails.ptype) }}
             </el-form-item>
             <el-form-item label="库状态：" prop="poperate">
-              <el-input v-model.trim="singleDetails.poperate" :readonly="isReadOnly" />
+              {{ selectedPoperate(singleDetails.poperate) }}
+            </el-form-item>
+            <el-form-item label="fqYs：" prop="fqYs">
+              {{ singleDetails.fqYs }}
             </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
             <el-form-item label="操作时间：" prop="createDate">
               <el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
             </el-form-item>
-            <el-form-item label="操作员：" prop="user">
-              <el-input v-model.trim="singleDetails.user" :readonly="isReadOnly" />
+          </el-col>
+        </el-row>
+
+        <el-row v-if=" singleDetails.poperate==='4' ">
+          <el-col :span="12">
+            <el-form-item label="创建人：" prop="createBy">
+              <el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建时间：" prop="createDate">
+              <el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -175,7 +187,7 @@ import { listLog } from '@/api/processLibrary/InventoryRecord'
 import BaseTable from '@/components/Table/BaseTable/index.vue'
 
 export default {
-  name: 'LoginInfo',
+  name: 'InventoryRecord',
   components: [
     BaseTable
   ],
@@ -279,14 +291,7 @@ export default {
             prop: 'ptype',
             label: '库类型',
             ownDefinedReturn: (row, $index) => {
-              switch (row.ptype) {
-                case '1':
-                  return '设备库'
-                case '2':
-                  return '工序库'
-                default:
-                  return ''
-              }
+              return this.selectedPtype(row.ptype)
             }
           },
           {
@@ -295,18 +300,7 @@ export default {
             label: '库状态',
             width: '180px',
             ownDefinedReturn: (row, $index) => {
-              switch (row.poperate) {
-                case '1':
-                  return '入库'
-                case '2':
-                  return '出库'
-                case '3':
-                  return '修正'
-                case '4':
-                  return '废弃'
-                default:
-                  return ''
-              }
+              return this.selectedPoperate(row.poperate)
             }
           },
           {
@@ -348,7 +342,6 @@ export default {
         ]
       },
 
-
       title: '',
       openDetails: false,
       isReadOnly: true,
@@ -373,7 +366,6 @@ export default {
     BaseTable() {
       return BaseTable
     },
-
     /* TODO:自定义分页索引，实现索引继承 */
     nIndex(index) {
       // TODO: 当前页数 - 1 * 每页数据条数 + 1
@@ -381,7 +373,6 @@ export default {
       const rows = this.queryParams.rows // TODO: 每页条数
       return index + 1 + (page - 1) * rows
     },
-
     // TODO: 用来汇总Table组件所需要的全部数据并一次性传输给子组件
     allTableArguments() {
       return {
@@ -419,6 +410,33 @@ export default {
         this.loading = false
       })
     },
+
+    /* TODO: ptype 库类型判断的公用方法 */
+    selectedPtype(ptype) {
+      switch (ptype) {
+        case '1':
+          return '设备库'
+        case '2':
+          return '工序库'
+        default:
+          return ''
+      }
+    },
+    /* TODO: poperate的库状态判断的公用方法 */
+    selectedPoperate(poperate) {
+      switch (poperate) {
+        case '1':
+          return '入库'
+        case '2':
+          return '出库'
+        case '3':
+          return '修正'
+        case '4':
+          return '废弃'
+        default:
+          return ''
+      }
+    },
     handleClose() {
       this.clearVisible = false
       this.exportVisible = false
@@ -458,8 +476,6 @@ export default {
       margin-bottom:10px
     }
 
-
-
   /*TODO: 这里是调整ToolBar的样式的噢！*/
     .ToolBar{
       .el-form{
@@ -475,9 +491,9 @@ export default {
     }
   }
 
-
   /* TODO: 专门用来解决el-input边框的问题 */
   .aboutSingleDetails{
+    .el-form{
       .el-form-item{
         .el-input >>> .el-input__inner {
           -webkit-appearance: none;
@@ -490,5 +506,7 @@ export default {
       }
     }
 
+  }
+
   </style>
 

src/views/system/dept/index.vue

 <template>
   <div class="app-container">
-    <el-form v-show="showSearch" ref="queryForm" :model="queryParams" :inline="true">
+    <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
       <el-form-item label="部门名称" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
@@ -22,12 +22,19 @@
       </el-form-item>
       <el-form-item>
         <el-button
+          style="padding: 8px 7px;"
+          icon="el-icon-search"
           class="filter-item"
           type="primary"
           size="small"
           @click="getList"
         >查询</el-button>
+      </el-form-item>
+      <div style="float: right">
+        <el-form-item>
           <el-button
+            style="padding: 8px 7px;"
+            icon="el-icon-plus"
             class="filter-item"
             type="primary"
             size="small"
@@ -35,8 +42,10 @@
           >新增</el-button>
           <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
         </el-form-item>
+      </div>
     </el-form>
 
+    <div style="padding:5px 10px">
       <el-table
         v-loading="Loading"
         :data="deptList"
@@ -125,6 +134,7 @@
           </template>
         </el-table-column>
       </el-table>
+    </div>
 
     <!-- 添加或修改部门对话框 -->
     <el-dialog title="部门信息" :visible.sync="open" width="600px" append-to-body>
@@ -190,7 +200,7 @@
 </template>
 
 <script>
-import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from '@/api/system/dept'
+import { addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept } from '@/api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
@@ -426,3 +436,31 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.app-container {
+  font-size: 18px;
+  padding: 0;
+
+  .placeholder {
+    height: 1.3vh;
+    background-color: #F4F4F4;
+    margin-bottom: 10px
+  }
+
+  .table-drop {
+    vertical-align: 2px;
+    line-height: 20px;
+    margin-left: 15px
+  }
+
+  .el-switch {
+    margin-left: 15px;
+  }
+}
+.el-divider--vertical{
+  height: 12em;
+  width: 4px;
+}
+</style>
+

src/views/system/role/index.vue

@@ -39,12 +39,14 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="handleQuery">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
           <el-button
+            style="padding: 8px 7px;"
             type="primary"
+            icon="el-icon-plus"
             size="small"
             @click="handleAdd"
           >新增</el-button>

src/views/system/user/index.vue

@@ -40,7 +40,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
-          <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+          <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
         </el-form-item>
         <el-form-item style="float: right">
           <!--          <el-button-->