Skip to content

T
template_vue
Commit ce6166d2 authored by kzy's avatar kzy
Browse files
Options

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

parents 1b09c8e6 ddcfdaa1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 394 additions and 230 deletions
src/api/equipment/draw.js
View file @ ce6166d2
......@@ -7,10 +7,10 @@ export function listWbApply(query) {
params: query
})
}
// apply_detail分页查询接口
// warehouse表单分页查询接口
export function detailList(query) {
return request({
url: '/wbapplydetail/queryWbApplyDetailByPagination',
url: '/wbwarehouse/queryWbWarehouseByPagination',
method: 'get',
params: query
})
......@@ -22,3 +22,14 @@ export function deleteLogical(id) {
method: 'delete'
})
}
// 处理的接口
export function batchAddition(data) {
return request({
url: '/wbapply/batchAddition',
method: 'post',
data,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
src/api/magnagement.js
View file @ ce6166d2
......@@ -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/api/processMangement/InventoryRecord.js
View file @ ce6166d2
......@@ -28,7 +28,7 @@ export function findSingleLogDetail(singleLogIdAndPn) {
/* TODO: 用来导出表单信息 */
export function exportInventoryRecord() {
return request({
url: '/wbwarehouselog/export',
url: '/wbwarehouselog/exportLogWithDetails',
method: 'get',
responseType: 'blob'
})
......
src/views/equipment/basicInfo.vue
View file @ ce6166d2
......@@ -14,7 +14,7 @@
</el-form-item>
<el-form-item label="pgx" prop="pgx">
<el-select
v-model="form.pgx"
v-model="queryParams.pgx"
clearable
placeholder="请选择pgx"
:style="{ width: '150px', height: '30px' }"
......@@ -29,7 +29,7 @@
</el-form-item>
<el-form-item label="ptype" prop="ptype">
<el-select
v-model="form.ptype"
v-model="queryParams.ptype"
placeholder="请选择ptype"
clearable
size="small"
......@@ -152,7 +152,7 @@
v-model="form.pgx"
clearable
placeholder="请选择pgx"
:style="{ width: '150px', height: '30px' }"
:style="{ width: '341px', height: '30px' }"
>
<el-option
v-for="(dict,index) in pgxList"
......@@ -168,7 +168,7 @@
placeholder="请选择ptype"
clearable
size="small"
style="width: 150px"
style="width: 341px"
>
<el-option
v-for="dict in ptypeOptions"
......@@ -179,7 +179,7 @@
</el-select>
</el-form-item>
<el-form-item label="prank" prop="prank">
<el-input v-model.trim="form.prank" :maxlength="10" placeholder="请输入prank" />
<el-input v-model.trim="form.prank" :maxlength="5" placeholder="请输入prank" />
</el-form-item>
<el-form-item label="pissb" prop="pissb">
<el-select
......@@ -198,10 +198,10 @@
</el-select>
</el-form-item>
<el-form-item label="psm" prop="psm">
<el-input v-model.trim="form.psm" :maxlength="10" placeholder="请输入psm" />
<el-input v-model.trim="form.psm" :maxlength="5" placeholder="请输入psm" />
</el-form-item>
<el-form-item label="psy" prop="psy">
<el-input v-model.trim="form.psy" :maxlength="10" placeholder="请输入psy" />
<el-input v-model.trim="form.psy" :maxlength="5" placeholder="请输入psy" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -288,22 +288,27 @@ export default {
// 表单校验
rules: {
pn: [
{ required: true, message: '请输入pn', trigger: 'blur' },
{ pattern: /^\d{1,5}$/, message: '请输入少于五位数字', trigger: 'blur' }
{ required: true, message: '请输入pn', trigger: 'change' },
{ pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }
],
ptype: [
{ required: true, message: '请输入ptype', trigger: 'blur' }
{ required: true, message: '请选择ptype', trigger: 'change' }
],
pgx: [
{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }
{ required: true, message: '请选择pgx', trigger: 'change' }
],
prank: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
prank: [
{ required: true, message: '请输入prank', trigger: 'change' },
{ pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }],
pissb: [
{ required: true, message: '请选择pissb', trigger: 'blur' }
],
psm: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
psm: [
{ required: true, message: '请输入psm', trigger: 'change' },
{ pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }],
psy: [
{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }
{ required: true, message: '请输入psy', trigger: 'change' },
{ pattern: /^\d{1,5}$/, message: '请输入数字且少于五位', trigger: 'change' }
]
},
deptOptions: []
......
src/views/equipment/boundManagement.vue
View file @ ce6166d2
......@@ -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/draw.vue
View file @ ce6166d2
This diff is collapsed.
src/views/equipment/income.vue
View file @ ce6166d2
This diff is collapsed.
src/views/equipment/management.vue
View file @ ce6166d2
......@@ -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="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="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="厚度" 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="设备来源" prop="roleKey">
<el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入设备来源" />
<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="排序" prop="roleSort">
<el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" />
<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="设备批次">
<!-- <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="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('修改成功')
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 {
// 校验失败，显示错误信息或进行其他操作
}
})
},
......
src/views/processManagement/inventoryRecord/index.vue
View file @ ce6166d2
......@@ -167,25 +167,25 @@
<transition name="fade-transform" mode="out-in">
<el-row v-if=" activateAbandonedState " style="height: 160px">
<el-col :span="12">
<el-form-item label="fq_ys：" prop="fq_ys">
{{ singleDetails.fq_ys }}
<el-form-item label="fqYs：" prop="fqYs">
{{ singleDetails.fqYs }}
</el-form-item>
<el-form-item label="fq_bz：" prop="fq_bz">
{{ singleDetails.fq_bz }}
<el-form-item label="fqBz：" prop="fqBz">
{{ singleDetails.fqBz }}
</el-form-item>
<el-form-item label="fq_dbxi：" prop="fq_dbxi">
{{ singleDetails.fq_dbxi }}
<el-form-item label="fqDbxi：" prop="fqDbxi">
{{ singleDetails.fqDbxi }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="fq_dd：" prop="fq_dd">
{{ singleDetails.fq_dd }}
<el-form-item label="fqDd：" prop="fqDd">
{{ singleDetails.fqDd }}
</el-form-item>
<el-form-item label="fq_mcode：" prop="fq_mcode">
{{ singleDetails.fq_mcode }}
<el-form-item label="fqMcode：" prop="fqMcode">
{{ singleDetails.fqMcode }}
</el-form-item>
<el-form-item label="fq_yy：" prop="fq_yy">
{{ singleDetails.fq_yy }}
<el-form-item label="fqYy：" prop="fqYy">
{{ singleDetails.fqYy }}
</el-form-item>
</el-col>
</el-row>
......@@ -308,7 +308,7 @@ export default {
// 选择框
selection: false,
// 选择框根据条件是否可选
selectable: (row, index) => {
selectable: (row) => {
if (row.switchs) {
return true
}
......@@ -330,7 +330,7 @@ export default {
ownDefined: true,
prop: 'ptype',
label: '库类型',
ownDefinedReturn: (row, $index) => {
ownDefinedReturn: (row) => {
return this.selectedPtype(row.ptype)
}
},
......@@ -339,7 +339,7 @@ export default {
prop: 'poperate',
label: '库状态',
width: '180px',
ownDefinedReturn: (row, $index) => {
ownDefinedReturn: (row) => {
return this.selectedPoperate(row.poperate)
}
},
......@@ -524,7 +524,12 @@ export default {
/* 激活打开废弃信息栏 */
this.activateAbandonedState = true
this.title = '记录详情'
this.singleDetails = Object.assign({}, response.data, { ...row })
console.log(row)
console.log(response.data)
const { fqBz, fqDbxi, fqDd, fqMcode, fqYy } = response.data
const fq = { fqBz, fqDbxi, fqDd, fqMcode, fqYy }
this.singleDetails = Object.assign({}, { ...row }, { ...fq })
console.log(this.singleDetails)
}
)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment