图标

src/api/magnagement.js

@@ -8,4 +8,30 @@ export function listdevice(query) {
     params: query
   })
 }
+export function updatadevice(data) {
+  return request({
+    url: '/wbwarehouse/update',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+export function getDetailById(id) {
+  return request({
+    url: '/wbwarehouse/detail/' + id,
+    method: 'get'
+  })
+}
+export function add(data) {
+  return request({
+    url: '/wbwarehouse/add',
+    method: 'post',
+    data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 

src/views/equipment/boundManagement.vue

@@ -35,8 +35,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button type="primary" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        <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>
     <div class="placeholder" />
@@ -100,39 +100,26 @@
     <!-- 添加或修改设备配置对话框 -->
     <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-item label="pn" prop="pn">
+          <el-input v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" />
         </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 v-model.trim="form.lot" :maxlength="30" placeholder="请输入lot" />
         </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 v-model.trim="form.plocation" :maxlength="30" placeholder="请输入plocation" />
         </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 v-model.trim="form.phd" :maxlength="30" placeholder="请输入厚度" />
         </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 label="psm" prop="psm">
+          <el-input v-model.trim="form.psm" :maxlength="30" placeholder="请输入psm" />
+        </el-form-item>
+        <el-form-item label="pzl" prop="pzl">
+          <el-input v-model.trim="form.pzl" :maxlength="30" placeholder="请输入pzl" />
+        </el-form-item>
+        <el-form-item label="parnk" prop="prank">
+          <el-input v-model.trim="form.prank" :maxlength="30" placeholder="请输入prank" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -200,19 +187,7 @@
 </template>
 
 <script>
-import {
-  addRole,
-  changeRoleStatus,
-  dataScope,
-  delRole,
-  exportRole,
-  getRole,
-  updateRole
-} from '@/api/system/role'
-import { listdevice } 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'
+import { listdevice, updatadevice, getDetailById, add } from '@/api/magnagement'
 export default {
   name: 'Role',
   data() {
@@ -321,7 +296,8 @@ export default {
         lot: undefined,
         plocation: undefined,
         ptype: 1,
-        pstatus: 0
+        pstatus: 0,
+        delFlag: 0
       },
       // 表单参数
       form: {
@@ -335,15 +311,6 @@ export default {
       },
       // 表单校验
       rules: {
-        roleName: [
-          { required: true, message: '请输入角色名称', trigger: 'blur' }
-        ],
-        roleKey: [
-          { required: true, message: '请输入权限字符', trigger: 'blur' }
-        ],
-        roleSort: [
-          { required: true, message: '请输入角色排序', trigger: 'blur' }
-        ]
       },
       deptOptions: [],
       formData: {}
@@ -366,9 +333,6 @@ export default {
       this.queryParams = { ...param }
     }
     this.getList()
-    // this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
-    //   this.statusOptions = response.data;
-    // });
   },
   methods: {
     // TODO: 获取所选行详情信息操作
@@ -400,100 +364,6 @@ export default {
         }
       )
     },
-    /** 查询菜单树结构 */
-    getMenuTreeselect() {
-      menuTreeselect().then(response => {
-        this.menuOptions = response.data
-      })
-    },
-    /** 查询菜单列表 */
-    getMenuList(roleId) {
-      roleMenuTreeselectMC(roleId).then(response => {
-        this.menuList = this.handleTree(response.data.menus, 'businessId')
-        this.loading = false
-      })
-    },
-    /** 查询部门树结构 */
-    getDeptTreeselect() {
-      deptTreeselect().then(response => {
-        this.deptOptions = response.data
-      })
-    },
-    // 树状图节点点击选中事件
-    handleMenuCheckChange(data, check, subCheck) { // data为选中节点信息，check选中状态
-      if (data.children !== undefined && data.children !== null) { // 是否包含子节点
-        this.checkNode(data.children, check) // 调用checkNode方法
-      }
-      // // 获取所有被选中的节点信息
-      // const nodes = this.$refs.menu.getCheckedNodes(false, false)
-      // // 将获取到的信息赋值（根据自己的需求）
-      // this.custGroupDesc = nodes.map(item => item.CN_NAME)
-      // this.searchForm.custGroup = nodes.map(item => item.code)
-    },
-    // 选中所有下级节点
-    checkNode(data, check) {
-      // 遍历所有下级节点信息
-      data.forEach(item => {
-        // 通过节点信息设置选中状态
-        this.$refs.menu.setChecked(item, check, false)
-        // 是否包含下级节点，包含下级节点则选中所有下级节点
-        if (item.children !== undefined) {
-          this.checkNode(item.children, check)
-        }
-      })
-    },
-    // 所有菜单节点数据
-    getMenuAllCheckedKeys() {
-      // 目前被选中的菜单节点
-      const checkedKeys = this.$refs.menu.getHalfCheckedKeys()
-      // 半选中的菜单节点
-      const halfCheckedKeys = this.$refs.menu.getCheckedKeys()
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
-      return checkedKeys
-    },
-    // 所有部门节点数据
-    getDeptAllCheckedKeys() {
-      // 目前被选中的部门节点
-      const checkedKeys = this.$refs.dept.getHalfCheckedKeys()
-      // // 半选中的部门节点
-      const halfCheckedKeys = this.$refs.dept.getCheckedKeys()
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
-      return this.$refs.dept.getCheckedKeys()
-    },
-    /** 根据角色ID查询菜单树结构 */
-    getRoleMenuTreeselect(roleId) {
-      return roleMenuTreeselect(roleId).then(response => {
-        this.menuOptions = response.data.menus
-        return response
-      })
-    },
-    /** 根据角色ID和菜单ID查询部门树结构 */
-    getRoleDeptTreeselect(roleId, menuId) {
-      return roleDeptTreeselect(roleId, menuId).then(response => {
-        this.form.deptCheckStrictly = response.data.deptCheckStrictly
-        this.deptOptions = response.data.depts
-        this.form.dataScope = this.dataScopeOptions[response.data.dataScope - 1].value
-        return response
-      })
-    },
-    // 角色状态修改
-    handleStatusChange(row) {
-      const text = row.flag === '1' ? '启用' : '停用'
-      this.$confirm('是否确认操作?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return changeRoleStatus(row.businessId, row.flag)
-      }).then(() => {
-        this.$message({
-          message: text + '成功',
-          type: 'success'
-        })
-      }).catch(function() {
-        row.flag = row.flag === '0' ? '1' : '0'
-      })
-    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -534,48 +404,6 @@ export default {
       this.queryParams.page = 1
       this.getList()
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      // this.dateRange = []
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    // // 树权限（父子联动）
-    // handleCheckedTreeConnect(value, type) {
-    //   if (type === 'menu') {
-    //     this.form.menuCheckStrictly = !!value
-    //   } else if (type === 'dept') {
-    //     this.form.deptCheckStrictly = !!value
-    //   }
-    // },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type === 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : [])
-      } else if (type === 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions : [])
-      }
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type === 'menu') {
-        const treeList = this.menuOptions
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value
-        }
-      } else if (type === 'dept') {
-        const treeList = this.deptOptions
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value
-        }
-      }
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
@@ -585,120 +413,54 @@ 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 = '修改角色'
       })
     },
-    /** 分配数据权限操作 选择菜单 */
-    handleMenu(row) {
-      this.reset()
-      const roleId = row.businessId || this.ids
-      this.getMenuList(roleId) // 查询菜单列表树形显示
-      getRole(roleId).then(response => {
-        this.form = response.data
-        this.openDataScope = true
-        this.title = '分配数据权限'
-      })
-    },
-    /** 分配数据权限操作 */
-    handleDataScope(row) {
-      this.deptOptions = []
-      this.form.dataScope = undefined
-      const roleId = this.form.businessId
-      this.form.menuId = row.businessId
-      this.form.menuName = row.menuName
-      const roleDeptTreeselect = this.getRoleDeptTreeselect(roleId, this.form.menuId)
-      this.$nextTick(() => {
-        roleDeptTreeselect.then(res => {
-          this.$refs.dept.setCheckedKeys(res.data.checkedKeys)
-        })
-      })
-      this.title = '分配数据权限'
-    },
     /** 提交按钮 */
     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('修改成功')
-              this.open = false
-              this.getList()
+            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('新增成功')
-              this.open = false
-              this.getList()
+            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 {
+          // 校验失败，显示错误信息或进行其他操作
         }
       })
     },
-    /** 提交按钮（数据权限） */
-    submitDataScope: function() {
-      if (this.form.businessId !== undefined && this.form.menuId !== undefined) {
-        this.form.deptIds = this.getDeptAllCheckedKeys()
-        dataScope(this.form).then(response => {
-          this.msgSuccess('修改成功')
-          this.openDataScope = false
-          this.getList()
-        })
-      }
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const roleIds = row.businessId || this.ids
-      this.$confirm('是否确认操作？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delRole(roleIds)
-      }).then(() => {
-        this.getList()
-        this.$message({
-          message: '删除成功',
-          type: 'success'
-        })
-      }).catch(function() {
-      })
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams
-      this.$confirm('是否确认操作?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return exportRole(queryParams).then(response => {
-          const blob = new Blob([response])
-          const downloadElement = document.createElement('a')
-          const href = window.URL.createObjectURL(blob)// 创建下载的链接
-          downloadElement.href = href
-          downloadElement.download = '角色信息' + '.xls' // 下载后文件名
-          document.body.appendChild(downloadElement)
-          downloadElement.click()// 点击下载
-          document.body.removeChild(downloadElement)// 下载完成移除元素
-          window.URL.revokeObjectURL(href)// 释放掉blob对象
-          // this.download(response.msg);
-        })
-      })
     }
   }
 }

src/views/equipment/income.vue

 <template>
-  <div class="app-container">
-
-    <!-- TODO: 基础设备管理-->
-    <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
-      <el-form-item label="设备名称" prop="roleName">
-        <el-input
-          v-model="queryParams.deviceName"
-          placeholder="请输入设备名称"
-          clearable
-          :maxlength="30"
-          size="small"
-          style="width: 150px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备编码" prop="roleKey">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备编码"
-          clearable
-          size="small"
-          style="width: 150px"
-          @keyup.enter.native="handleQuery"
-        />
-      </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>
-
-    <div class="placeholder" />
-
-    <!-- TODO: 中间的分隔符号   -->
-    <div style="padding:5px 10px">
-
-      <!-- TODO: 以下为基础设备管理列表 -->
-      <div class="mb12 font-small-bold">设备领用列表</div>
-      <el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
-        <el-table-column type="index" label="序号" width="50" />
-        <el-table-column label="设备名称" prop="deviceName" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.deviceName || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="设备编码" prop="deviceId">
-          <template slot-scope="scope">
-            {{ scope.row.deviceId || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="LOT" prop="LOT">
-          <template slot-scope="scope">
-            {{ scope.row.deviceId || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="位置" prop="location">
-          <template slot-scope="scope">
-            {{ scope.row.location || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="厚度" prop="ply">
-          <template slot-scope="scope">
-            {{ scope.row.ply || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
-          <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="140px">
-          <template slot-scope="scope">
-
-            <el-button v-if="scope.row.state !== ' '" align="center" :type="typeParent" :size="size" @click="handleUpdate(scope.row)">
-              {{ updataName }}
-            </el-button>
-
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <el-pagination
-      background
-      layout="prev, pager, next"
-      :total="1000"
-    />
-
-    <!-- TODO: 添加或修改设备配置对话框 -->
-    <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="deviceName">
-          <el-input v-model.trim="form.deviceName" show-word-limit :maxlength="30" placeholder="请输入设备名称" />
+  <el-form ref="form" :model="form" label-width="80px">
+    <div class="info"><span style="color: #333; font-weight: 700;">基本信息</span></div>
+    <el-row :gutter="40">
+      <el-col :span="12" style="padding-left: 16%;">
+        <el-form-item label="生产工艺">
+          <el-select v-model="form.region" placeholder="请选择活动区域">
+            <el-option label="工艺一" value="shanghai" />
+            <el-option label="工艺二" value="beijing" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="设备编码" prop="deviceId">
-          <el-input v-model.trim="form.deviceId" show-word-limit :maxlength="30" placeholder="请输入设备编码" />
+      </el-col>
+    </el-row>
+    <el-row :gutter="40">
+      <el-col :span="12" style="padding-left: 16%;">
+        <el-form-item label="编码一" style="flex-basis: 50%;">
+          <el-input ref="input1" v-model="form.name" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(1,$event)" />
         </el-form-item>
-        <el-form-item label="LOT" prop="LOT">
-          <el-input v-model.trim="form.LOT" show-word-limit :maxlength="30" placeholder="请输入LOT" />
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="编码二" style="flex-basis: 50%;">
+          <el-input ref="input2" v-model="form.date1" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(2,$event)" />
         </el-form-item>
-        <el-form-item label="位置" prop="location">
-          <el-input v-model.trim="form.location" show-word-limit :maxlength="30" placeholder="请输入设备编码" />
+      </el-col>
+    </el-row>
+    <el-row :gutter="40">
+      <el-col :span="12" style="padding-left: 16%;">
+        <el-form-item label="编码三" style="flex-basis: 50%;">
+          <el-input ref="input3" v-model="form.date2" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(3,$event)" />
         </el-form-item>
-        <el-form-item label="厚度" prop="ply">
-          <el-input v-model.trim="form.ply" show-word-limit :maxlength="30" placeholder="请输入设备编码" />
+      </el-col>
+      <el-col :span="12">
+        <el-form-item v-if="form.region === 'beijing'" label="编码四" style="flex-basis: 50%;">
+          <el-input ref="input4" v-model="form.type" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(4,$event)" />
         </el-form-item>
-        <el-form-item label="操作员" prop="createBy">
-          <el-input v-model.trim="form.createBy" :maxlength="30" show-word-limit placeholder="请输入创建人" />
+        <el-form-item v-else label="编码六" style="flex-basis: 50%;">
+          <el-input ref="input6" v-model="form.desc" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(6,$event)" />
         </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 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="deviceName">
-          <el-input v-model.trim="singleDetails.deviceName" :readonly="isReadOnly" />
-        </el-form-item>
-        <el-form-item label="设备编码：" prop="deviceId">
-          <el-input v-model.trim="singleDetails.deviceId" :readonly="isReadOnly" />
-        </el-form-item>
-        <el-form-item label="LOT: " prop="LOT">
-          <el-input v-model.trim="singleDetails.LOT" :readonly="isReadOnly" />
-        </el-form-item>
-        <el-form-item label="位置：" prop="location">
-          <el-input v-model.trim="singleDetails.location" :readonly="isReadOnly" />
-        </el-form-item>
-        <el-form-item label="位置：" prop="ply">
-          <el-input v-model.trim="singleDetails.ply" :readonly="isReadOnly" />
+      </el-col>
+    </el-row>
+    <el-row :gutter="40">
+      <el-col :span="12" style="padding-left: 16%;">
+        <el-form-item v-if="form.region === 'beijing'" label="编码五" style="flex-basis: 50%;">
+          <el-input ref="input5" v-model="form.resource" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(5,$event)" />
         </el-form-item>
-        <el-form-item label="创建时间：" prop="createTime">
-          <el-input v-model.trim="singleDetails.createTime" :readonly="isReadOnly" />
+      </el-col>
+      <el-col :span="12" :style="form.region !== 'beijing'? 'padding-left: 16%;': 'padding-left: noset;'">
+        <el-form-item v-if="form.region === 'beijing'" label="编码六" style="flex-basis: 50%;">
+          <el-input ref="input6" v-model="form.desc" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(6,$event)" />
         </el-form-item>
-        <el-form-item label="创建人：" prop="createBy">
-          <el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly" />
-        </el-form-item>
-        <el-form-item label="状态" prop="state">
-          <el-input v-model.trim="singleDetails.state" :readonly="isReadOnly" />
-        </el-form-item>
-      </el-form>
-    </el-dialog>
+      </el-col>
+    </el-row>
+    <div class="button">
+      <el-button type="primary" @click="submitForm">提交</el-button>
+    </div>
+  </el-form>
+  <!-- <el-form style="display: flex; flex-wrap: wrap;justify-content: center;">
+    <el-form-item label="编码一" style="flex-basis: 50%;">
+      <el-input ref="input1" v-model="form.name" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(1,$event)" />
+    </el-form-item>
+    <el-form-item label="编码二" style="flex-basis: 50%;">
+      <el-input ref="input2" v-model="form.date1" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(2,$event)" />
+    </el-form-item>
+    <el-form-item label="编码三" style="flex-basis: 50%;">
+      <el-input ref="input3" v-model="form.date2" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(3,$event)" />
+    </el-form-item>
+    <el-form-item v-if="form.region === 'beijing'" label="编码四" style="flex-basis: 50%;">
+      <el-input ref="input4" v-model="form.type" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(4,$event)" />
+    </el-form-item>
+    <el-form-item v-if="form.region === 'beijing'" label="编码五" style="flex-basis: 50%;">
+      <el-input ref="input5" v-model="form.resource" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(5,$event)" />
+    </el-form-item>
+    <el-form-item label="编码六" style="flex-basis: 50%;">
+      <el-input ref="input6" v-model="form.desc" :style="{ width: '400px', height: '30px' }" @keyup.enter.native="handelTab(6,$event)" />
+    </el-form-item>
+  </el-form>
+  <el-form-item style="width: 100%;">
+    <el-button type="primary" @click="submitForm">提交</el-button>
+  </el-form-item>
+</el-form> -->
 
-  </div>
 </template>
 
 <script>
-
 export default {
-  name: 'Role',
   data() {
     return {
-      typeParent: 'text',
-      typePrimary: 'primary',
-      typeSuccess: 'success',
-      nameParent: '删除',
-      resetName: '重置',
-      addName: '新增',
-      application: '申请领用',
-      updataName: '修改',
-      size: 'mini',
-      smallSize: 'small',
-      delicon: 'el-icon-delete',
-      addIcon: 'el-icon-plus',
-      exportIcon: 'el-icon-download',
-      resetIcon: '',
-      // TODO: 控制只读
-      isReadOnly: true,
-      // 遮罩层
-      loading: true,
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 角色表格数据
-      roleList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 是否显示弹出层（数据详情）
-      openDetails: false,
-      // 日期范围
-      // dateRange: [],
-      // 菜单表格数据
-      menuList: [],
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        deviceName: undefined,
-        deviceId: undefined,
-        LOT: undefined,
-        location: undefined,
-        ply: undefined,
-        state: undefined,
-        flag: undefined
-      },
-      defaultProps: {},
-      // TODO: 表单参数
       form: {
-        deviceName: '',
-        deviceId: '',
-        LOT: '',
-        location: '',
-        ply: '',
-        state: '',
-        flag: '1',
-        remark: '',
-        createTime: new Date(),
-        updataTime: new Date(),
-        createBy: ''
-      },
-      // TODO: 表单初始参数
-      formReset: {
-        deviceName: '',
-        deviceId: '',
-        LOT: '',
-        location: '',
-        ply: '',
-        state: '',
-        flag: '1',
-        createTime: new Date(),
-        updataTime: new Date(),
-        createBy: ''
-      },
-      // TODO: 表单里的单项详情参数
-      singleDetails: {
-        deviceName: '',
-        deviceId: '',
-        LOT: '',
-        location: '',
-        ply: '',
-        state: '',
-        flag: '1',
-        createTime: new Date(),
-        updataTime: new Date(),
-        createBy: ''
-      },
-      // TODO: 模拟测试数据
-      simulateDeviceList: [{
-        deviceName: '设备1', deviceId: '0001', flag: 1, LOT: '0001', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '驳回'
-      }, {
-        deviceName: '设备2', deviceId: '0002', flag: 2, LOT: '0002', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '驳回'
-      }, {
-        deviceName: '设备3', deviceId: '0003', flag: 2, LOT: '0003', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '驳回'
-      }, {
-        deviceName: '设备4', deviceId: '0004', flag: 2, LOT: '0004', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '驳回'
-      }, {
-        deviceName: '设备5', deviceId: '0005', flag: 2, LOT: '0005', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '待审核'
-      }, {
-        deviceName: '设备6', deviceId: '0006', flag: 2, LOT: '0006', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '待审核'
-      }, {
-        deviceName: '设备7', deviceId: '0007', flag: 2, LOT: '0007', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '待审核'
-      }, {
-        deviceName: '设备8', deviceId: '0008', flag: 2, LOT: '0008', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '待审核'
-      }, {
-        deviceName: '设备9', deviceId: '0009', flag: 2, LOT: '0009', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '通过'
-      }, {
-        deviceName: '设备10', deviceId: '00010', flag: 2, LOT: '0010', location: 'XXX', ply: 'YYY', createTime: new Date(), updataTime: new Date(), createBy: 'admin', state: '通过'
-      }
-
-      ],
-
-      // 表单校验
-      rules: {
-        deviceName: [
-          { required: true, message: '请输入设备名称', trigger: 'blur' }
-        ],
-        deviceId: [
-          { required: true, message: '请输入设备编码', trigger: 'blur' }
-        ],
-        LOT: [
-          { required: true, message: '请输入LOT', trigger: 'blur' }
-        ],
-        createBy: [
-          { required: true, message: '请输入申请人', trigger: 'blur' }
-        ]
-      },
-      deptOptions: []
-    }
-  },
-  /** 路由离开前存储筛选条件*/
-  beforeRouteLeave(to, from, next) {
-    this.$store.dispatch('searchSave/searchParamsSet', {
-      path: this.$route.path,
-      param: {
-        ...this.queryParams
+        region: '',
+        name: '',
+        date1: '',
+        date2: '',
+        type: '',
+        resource: '',
+        desc: '',
       }
-    })
-    next()
-  },
-  created() {
-    if (this.$store.getters.searchParams[this.$route.path]) {
-      const { searchParams } = this.$store.getters; const { path } = this.$route
-      const param = JSON.parse(searchParams[path]) // 保留着的查询条件
-      this.queryParams = { ...param }
     }
-    this.getList()
   },
   methods: {
-    /** 查询角色列表 */
-    getList() {
-      this.loading = true
-      this.roleList = this.simulateDeviceList
-      console.log(this.roleList)
-      this.loading = false
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      // TODO: 将模拟数据的空对象赋值给表单对象，达成清空填写表单的效果
-      this.form = {
-        deviceName: '',
-        deviceId: '',
-        location: '',
-        ply: '',
-        state: '',
-        flag: '1',
-        createTime: new Date(),
-        updataTime: new Date(),
-        createBy: ''
-      }
-    },
-    /** TODO: 查询按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** TODO: 重置按钮操作 */
-    resetQuery() {},
-    // 多选框选中数据
-    handleSelectionChange(selection) {},
-    /** TODO: 新增按钮操作 */
-    handleAdd() {
-      // TODO: 初始化新增对话框的状态
-      this.reset()
-      this.title = '申请领用设备'
-      this.open = !this.open
-    },
-    // TODO: 获取所选行详情信息操作
-    handleDetail(row) {
-      this.singleDetails = this.formReset
-      this.singleDetails = row
-      this.title = '详情信息'
-      this.openDetails = !this.openDetails
-    },
-    /** TODO: 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      this.title = '修改申请'
-      const upddeviceName = row.deviceName
-      for (const pd of this.simulateDeviceList) {
-        if (pd.deviceName === upddeviceName) {
-          this.form = pd
-        }
+    handelTab(i, e) {
+      const that = this
+      if (!that.$refs['input' + i]) {
+        return
       }
-      this.open = true
-    },
-    /** TODO: 修改或增加list列表里的数据 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          // TODO: 模拟测试数据的修改，可删除
-          for (const p of this.simulateDeviceList) {
-            if (p.deviceName === this.form.deviceName) {
-              this.simulateDeviceList = this.simulateDeviceList.map(obj =>
-                obj.deviceName === this.form.deviceName ? this.form : obj
-              )
-              this.msgSuccess('申请成功')
-              this.getList()
-              this.reset()
-              this.open = !this.open
-              return
-            } else {
-              if (this.form !== undefined && this.form !== null) {
-                this.simulateDeviceList.push(this.form)
-                this.msgSuccess('申请成功')
-                this.getList()
-                this.reset()
-                this.open = !this.open
-                return
-              }
-            }
-          }
-        }
-      })
-    },
-
-    /** TODO: 关于模拟数据的 删除list数组所调用的删除方法,封装的函数如下 */
-    delDevice(delDeviceName) {
-      let tip = false
-      for (const pd0 of this.simulateDeviceList) {
-        console.log('This is pd0:', pd0)
-        if (pd0.deviceName === delDeviceName) {
-          this.simulateDeviceList = this.simulateDeviceList.filter(item => item.deviceName !== delDeviceName)
-          tip = true
-          break
-        }
-      }
-      return tip
-    },
-    /** TODO:删除按钮操作 */
-    handleDelete(row) {
-      this.$confirm('是否确认操作？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        return this.delDevice(row.deviceName)
-      }).then(() => {
-        this.getList()
-        this.$message({
-          message: '删除成功',
-          type: 'success'
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
+      that.$nextTick(() => {
+        e.target.blur()
+        const index = i + 1
+        that.$refs['input' + index].focus()
       })
     }
-
   }
 }
 </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;
-  }
+<style scoped>
+.left-margin {
+  margin-left: 20px;
 }
-.el-divider--vertical{
-  height: 12em;
-  width: 4px;
+.info{
+  height: 100px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
-
-.aboutSingleDetails{
-  .el-form-item{
-    .el-input >>> .el-input__inner {
-      -webkit-appearance: none;
-      background-color: #FFF;
-      background-image: none;
-      border-radius: 4px;
-      border: 0;
-      width: 100%;
-    }
-  }
-
+.button{
+  margin-top: 11%;
+  margin-left: 20%;
 }
 
 </style>
-

src/views/equipment/management.vue

@@ -35,8 +35,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button type="primary" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        <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>
     <div class="placeholder" />
@@ -306,7 +306,8 @@ export default {
         lot: undefined,
         plocation: undefined,
         pstatus: 0,
-        ptype: 1
+        ptype: 1,
+        delFlag: 0
       },
       // 表单参数
       form: {

src/views/processManagement/basicProcessManagement/index.vue

@@ -35,8 +35,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
-        <el-button type="primary" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        <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>
     <div class="placeholder" />
@@ -315,7 +315,8 @@ export default {
         lot: undefined,
         plocation: undefined,
         pstatus: 0,
-        ptype: 2
+        ptype: 2,
+        delFlag: 0
       },
       // 表单参数
       form: {