设备入库

src/api/magnagement.js

@@ -48,7 +48,7 @@ export function recycle(data) {
 // 逻辑删除基础信息接口
 export function deletedevice(id) {
   return request({
-    url: '/wbwarehouse/delete/' + id,
+    url: '/wbwarehouse/deleteLogical/' + id,
     method: 'delete'
   })
 }

src/views/equipment/boundManagement.vue

@@ -440,7 +440,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.title = '编辑基础信息表单'
+      this.title = '库存管理'
       const id = row.businessId
       getDetailById(id).then(res => {
         this.form = res.data

src/views/equipment/management.vue

@@ -85,8 +85,14 @@
             <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="120px">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="180px">
           <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              style="color: #49cec9"
+              @click="handleUpdate(scope.row)"
+            >修改</el-button>
             <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
               详情
             </el-button>
@@ -110,31 +116,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="80px">
-        <el-form-item label="名称" prop="roleName">
-          <el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入设备名称" />
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px" >
+        <el-form-item label="pn" prop="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="设备来源" prop="roleKey">
-          <el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入设备来源" />
+        <el-form-item label="lot" prop="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="排序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" />
+        <el-form-item label="plocation" prop="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="设备批次">
-          <!--          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>-->
-          <!--          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>-->
-          <!--          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>-->
-          <el-tree
-            ref="menu"
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            node-key="id"
-            check-strictly
-            empty-text="加载中，请稍后"
-            :props="defaultProps"
-            @check-change="handleMenuCheckChange"
-          />
+        <el-form-item label="厚度" prop="phd">
+          <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 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 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 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">
@@ -209,7 +211,7 @@ import {
   getRole,
   updateRole
 } from '@/api/system/role'
-import { listdevice, deletedevice, exportdevice } from '@/api/magnagement'
+import { listdevice, deletedevice, exportdevice, getDetailById, updatadevice, add } from '@/api/magnagement'
 import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
 import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
 export default {
@@ -320,7 +322,7 @@ export default {
         lot: undefined,
         plocation: undefined,
         pstatus: 0,
-        ptype: 2,
+        ptype: 1,
         delFlag: 0
       },
       // 表单参数
@@ -335,15 +337,13 @@ export default {
       },
       // 表单校验
       rules: {
-        roleName: [
-          { required: true, message: '请输入角色名称', trigger: 'blur' }
-        ],
-        roleKey: [
-          { required: true, message: '请输入权限字符', trigger: 'blur' }
-        ],
-        roleSort: [
-          { required: true, message: '请输入角色排序', trigger: 'blur' }
-        ]
+        pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
+        lot: [{ required: true, message: '请输入lot', trigger: 'blur' }],
+        plocation: [{ required: true, message: '请输入plocation', trigger: 'blur' }],
+        phd: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
+        psm: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
+        pzl: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
+        prank: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
       },
       deptOptions: [],
       formData: {}
@@ -585,19 +585,11 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      const roleId = row.businessId || this.ids
-      const roleMenu = this.getRoleMenuTreeselect(roleId)
-      getRole(roleId).then(response => {
-        this.form = response.data
+      this.title = '设备管理'
+      const id = row.businessId
+      getDetailById(id).then(res => {
+        this.form = res.data
         this.open = true
-        this.getMenuTreeselect(roleId)
-        this.$nextTick(() => {
-          roleMenu.then(res => {
-            this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
-          })
-        })
-        this.title = '修改角色'
       })
     },
     /** 分配数据权限操作 选择菜单 */
@@ -628,24 +620,37 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function() {
-      this.$refs['form'].validate(valid => {
+      this.$refs.form.validate((valid) => {
         if (valid) {
-          this.form.menuCheckStrictly = false
+          // 校验通过，提交表单或进行其他操作
+          console.log('form', this.form)
           if (this.form.businessId !== undefined) {
-            this.form.menuIds = this.getMenuAllCheckedKeys()
-            updateRole(this.form).then(response => {
-              this.msgSuccess('修改成功')
+            console.log('更新')
+            updatadevice(this.form).then(res => {
+              console.log('res', res)
+              if (res.code === 200) {
                 this.open = false
+                this.$message.success('操作成功')
                 this.getList()
+                this.reFrom()
+              } else if (res.code === null) {
+                this.$message.error(res.message)
+              }
             })
           } else {
-            this.form.menuIds = this.getMenuAllCheckedKeys()
-            addRole(this.form).then(response => {
-              this.msgSuccess('新增成功')
+            add(this.form).then(res => {
+              if (res.code === 200) {
                 this.open = false
+                this.$message.success('操作成功')
                 this.getList()
+                this.reFrom()
+              } else if (res.code === null) {
+                this.$message.error(res.message)
+              }
             })
           }
+        } else {
+          // 校验失败，显示错误信息或进行其他操作
         }
       })
     },