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

src/api/magnagement.js

@@ -34,4 +34,18 @@ export function add(data) {
     }
   })
 }
-
+// 逻辑删除基础信息接口
+export function deletedevice(id) {
+  return request({
+    url: '/wbwarehouse/delete/' + id,
+    method: 'delete'
+  })
+}
+// 导出
+export function exportdevice() {
+  return request({
+    url: '/wbwarehouse/export',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

src/views/equipment/boundManagement.vue

@@ -69,9 +69,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
           <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="110px">
@@ -99,27 +99,27 @@
 
     <!-- 添加或修改设备配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px" >
         <el-form-item label="pn" prop="pn">
-          <el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" />
+          <el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
         </el-form-item>
         <el-form-item label="lot" prop="lot">
-          <el-input v-model.trim="form.lot" :maxlength="30" placeholder="请输入lot" />
+          <el-input ref="input2" v-model.trim="form.lot" :maxlength="30" placeholder="请输入lot" @keyup.enter.native="handelTab(2,$event)" />
         </el-form-item>
         <el-form-item label="plocation" prop="plocation">
-          <el-input v-model.trim="form.plocation" :maxlength="30" placeholder="请输入plocation" />
+          <el-input ref="input3" v-model.trim="form.plocation" :maxlength="30" placeholder="请输入plocation" @keyup.enter.native="handelTab(3,$event)" />
         </el-form-item>
         <el-form-item label="厚度" prop="phd">
-          <el-input v-model.trim="form.phd" :maxlength="30" placeholder="请输入厚度" />
+          <el-input ref="input4" v-model.trim="form.phd" :maxlength="30" placeholder="请输入厚度" @keyup.enter.native="handelTab(4,$event)" />
         </el-form-item>
         <el-form-item label="psm" prop="psm">
-          <el-input v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" />
+          <el-input ref="input5" v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" @keyup.enter.native="handelTab(5,$event)" />
         </el-form-item>
         <el-form-item label="pzl" prop="pzl">
-          <el-input v-model.trim="form.pzl" :maxlength="30" placeholder="请输入pzl" />
+          <el-input ref="input6" v-model.trim="form.pzl" :maxlength="30" placeholder="请输入pzl" @keyup.enter.native="handelTab(6,$event)" />
         </el-form-item>
         <el-form-item label="parnk" prop="prank">
-          <el-input v-model.trim="form.prank" :maxlength="30" placeholder="请输入prank" />
+          <el-input ref="input7" v-model.trim="form.prank" :maxlength="30" placeholder="请输入prank" @keyup.enter.native="handelTab(7,$event)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -176,8 +176,8 @@
             </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 label=" 操作时间：" prop="updateDate">
+              <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -327,6 +327,11 @@ export default {
       formData: {}
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs.input1.$refs.input.focus()
+    })
+  },
   /** 路由离开前存储筛选条件*/
   beforeRouteLeave(to, from, next) {
     this.$store.dispatch('searchSave/searchParamsSet', {
@@ -346,6 +351,17 @@ export default {
     this.getList()
   },
   methods: {
+    handelTab(i, e) {
+      const that = this
+      if (!that.$refs['input' + i]) {
+        return
+      }
+      that.$nextTick(() => {
+        e.target.blur()
+        const index = i + 1
+        that.$refs['input' + index].focus()
+      })
+    },
     // TODO: 获取所选行详情信息操作
     handleDetail(row) {
       this.singleDetails = this.formReset

src/views/equipment/income.vue

@@ -5,47 +5,47 @@
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="pn:" style="flex-basis: 50%;" prop="pn">
-            <el-input v-model="form.pn" placeholder="请输入pn" :style="{ width: '400px', height: '30px' }" :maxlength="50" />
+            <el-input ref="input1" v-model="form.pn" placeholder="请输入pn" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(1,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="lot:" style="flex-basis: 50%;" prop="lot">
-            <el-input v-model="form.lot" placeholder="请输入lot" :style="{ width: '400px', height: '30px' }" :maxlength="10" />
+            <el-input ref="input2" v-model="form.lot" placeholder="请输入lot" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="位置:" style="flex-basis: 50%;" prop="plocation">
-            <el-input v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="50" />
+            <el-input ref="input3" v-model="form.plocation" placeholder="请输入位置" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="厚度:" style="flex-basis: 50%;" prop="phd">
-            <el-input v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="10" />
+            <el-input ref="input4" v-model="form.phd" placeholder="请输入厚度" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(4,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="psm:" style="flex-basis: 50%;" prop="psm">
-            <el-input v-model="form.psm" placeholder="请输入psm" :style="{ width: '400px', height: '30px' }" :maxlength="50" />
+            <el-input ref="input5" v-model="form.psm" placeholder="请输入psm" :style="{ width: '400px', height: '30px' }" :maxlength="50" @keyup.enter.native="handelTab(5,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="pzl:" style="flex-basis: 50%;" prop="pzl">
-            <el-input v-model="form.pzl" placeholder="请输入pzl" :style="{ width: '400px', height: '30px' }" :maxlength="10" />
+            <el-input ref="input6" v-model="form.pzl" placeholder="请输入pzl" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(6,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12" style="padding-left: 8.6%;">
           <el-form-item label="prank:" style="flex-basis: 50%;" prop="prank">
-            <el-input v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" />
+            <el-input ref="input7" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(7,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="button" >
+      <div class="button">
         <el-button type="primary" @click="submitForm">提交</el-button>
       </div>
     </el-form>
@@ -81,10 +81,31 @@ export default {
       }
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs.input1.$refs.input.focus()
+    })
+  },
   created() {
     this.init()
   },
   methods: {
+    focusNextInput(refName) {
+      this.$nextTick(() => {
+        this.$refs[refName].$refs.input.focus()
+      })
+    },
+    handelTab(i, e) {
+      const that = this
+      if (!that.$refs['input' + i]) {
+        return
+      }
+      that.$nextTick(() => {
+        e.target.blur()
+        const index = i + 1
+        that.$refs['input' + index].focus()
+      })
+    },
     // 重置
     resetFrom() {
       this.form = {
@@ -165,7 +186,7 @@ export default {
   }
   .button{
     margin-top: 7%;
-    margin-left: 11%;
+    margin-left: 15.6%;
   }
 
 }

src/views/equipment/management.vue

@@ -38,6 +38,17 @@
         <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</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
+          style="padding: 8px 7px;"
+          type="success"
+          size="small"
+          icon="el-icon-download"
+          @click="handleExport"
+        >导出</el-button>
+      </el-form-item>
+
     </el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
@@ -69,16 +80,22 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
           <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="120px">
           <template slot-scope="scope">
             <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>
@@ -174,7 +191,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label=" 操作时间：" prop="createDate">
+            <el-form-item label=" 入库日期：" prop="createDate">
               <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
             </el-form-item>
           </el-col>
@@ -189,15 +206,12 @@ import {
   addRole,
   changeRoleStatus,
   dataScope,
-  delRole,
-  exportRole,
   getRole,
   updateRole
 } from '@/api/system/role'
-import { listdevice } from '@/api/magnagement'
+import { listdevice, deletedevice, exportdevice } from '@/api/magnagement'
 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',
   data() {
@@ -306,7 +320,7 @@ export default {
         lot: undefined,
         plocation: undefined,
         pstatus: 0,
-        ptype: 1,
+        ptype: 2,
         delFlag: 0
       },
       // 表单参数
@@ -648,41 +662,42 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const roleIds = row.businessId || this.ids
-      this.$confirm('是否确认操作？', '提示', {
+      const id = row.businessId
+      this.$confirm('是否确认操作?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(function() {
-        return delRole(roleIds)
-      }).then(() => {
-        this.getList()
-        this.$message({
-          message: '删除成功',
-          type: 'success'
+      }).then(res => {
+        deletedevice(id).then(res => {
+          if (res.code === 200) {
+            this.$message.success('操作成功')
+            this.getList()
+          }
         })
-      }).catch(function() {
       })
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams
-      this.$confirm('是否确认操作?', '警告', {
+      this.$confirm('是否确认导出设备管理信息?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return exportRole(queryParams).then(response => {
+        return exportdevice().then(response => {
           const blob = new Blob([response])
           const downloadElement = document.createElement('a')
-          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          // TODO: 创建下载的链接
+          const href = window.URL.createObjectURL(blob)
           downloadElement.href = href
-          downloadElement.download = '角色信息' + '.xls' // 下载后文件名
+          // TODO: 下载后文件名
+          downloadElement.download = '设备管理信息' + '.xls'
           document.body.appendChild(downloadElement)
-          downloadElement.click()// 点击下载
-          document.body.removeChild(downloadElement)// 下载完成移除元素
-          window.URL.revokeObjectURL(href)// 释放掉blob对象
-          // this.download(response.msg);
+          // TODO: 点击下载
+          downloadElement.click()
+          // TODO: 下载完成移除元素
+          document.body.removeChild(downloadElement)
+          // TODO: 释放掉blob对象
+          window.URL.revokeObjectURL(href)
         })
       })
     }

src/views/processManagement/basicProcessManagement/index.vue

@@ -38,10 +38,19 @@
         <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</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
+          style="padding: 8px 7px;"
+          type="success"
+          size="small"
+          icon="el-icon-download"
+          @click="handleExport"
+        >导出</el-button>
+      </el-form-item>
     </el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
-      <div class="mb12 font-small-bold">工序库列表</div>
+      <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="pn" prop="businessId">
@@ -69,9 +78,9 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createDate">
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
           <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="80px">
@@ -119,15 +128,6 @@
             @check-change="handleMenuCheckChange"
           />
         </el-form-item>
-        <el-form-item label="备注">
-          <el-input
-            v-model.trim="form.remark"
-            maxlength="200"
-            show-word-limit
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
@@ -183,8 +183,8 @@
             </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 label=" 操作时间：" prop="updateDate">
+              <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -199,11 +199,10 @@ import {
   changeRoleStatus,
   dataScope,
   delRole,
-  exportRole,
   getRole,
   updateRole
 } from '@/api/system/role'
-import { listdevice } from '@/api/magnagement'
+import { listdevice, exportdevice } from '@/api/magnagement'
 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'
@@ -675,22 +674,26 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams
-      this.$confirm('是否确认操作?', '警告', {
+      this.$confirm('是否确认导出工序库信息?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return exportRole(queryParams).then(response => {
+        return exportdevice().then(response => {
           const blob = new Blob([response])
           const downloadElement = document.createElement('a')
-          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          // TODO: 创建下载的链接
+          const href = window.URL.createObjectURL(blob)
           downloadElement.href = href
-          downloadElement.download = '角色信息' + '.xls' // 下载后文件名
+          // TODO: 下载后文件名
+          downloadElement.download = '设备工序库信息' + '.xls'
           document.body.appendChild(downloadElement)
-          downloadElement.click()// 点击下载
-          document.body.removeChild(downloadElement)// 下载完成移除元素
-          window.URL.revokeObjectURL(href)// 释放掉blob对象
+          // TODO: 点击下载
+          downloadElement.click()
+          // TODO: 下载完成移除元素
+          document.body.removeChild(downloadElement)
+          // TODO: 释放掉blob对象
+          window.URL.revokeObjectURL(href)
           // this.download(response.msg);
         })
       })
@@ -699,7 +702,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/* TODO: 专门用来解决input 的边框问题 */
 .aboutSingleDetails{
   .el-form-item{
     .el-input >>> .el-input__inner {