Skip to content

T
template_vue
Commit 212080b3 authored by wdy's avatar wdy
Browse files
Options

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

parents 0933851c cc5d1f59
Hide whitespace changes
Inline Side-by-side
Showing with 470 additions and 403 deletions
src/views/equipment/application.vue
View file @ 212080b3
......@@ -10,14 +10,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="phd" style="flex-basis: 50%;" prop="phd">
<el-input ref="input2" v-model="form.phd" placeholder="请输入phd" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
<el-input ref="input2" v-model="form.phd" placeholder="请输入phd" :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: 16%;">
<el-form-item label="prank" style="flex-basis: 50%;" prop="prank">
<el-input ref="input3" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
<el-input ref="input3" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -74,11 +74,6 @@ import { getDictData, addApplication } from '@/api/equipment/application'
export default {
name: 'Role',
mounted() {
this.$nextTick(() => {
this.$refs.input1.$refs.input.focus()
})
},
data() {
return {
form: {
......@@ -90,8 +85,8 @@ export default {
},
rule: {
pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
phd: [{ required: true,pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
prank: [{ required: true,pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
phd: [{ required: true, pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
prank: [{ required: true, pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
pgx: [{ required: true, message: '请输入pgx', trigger: 'blur' }],
pissb: [{ required: true, message: '请输入pissb', trigger: 'blur' }],
pnumber: [{ required: true, message: '请输入pnumber', trigger: 'blur' }]
......@@ -109,6 +104,11 @@ export default {
]
}
},
mounted() {
this.$nextTick(() => {
this.$refs.input1.$refs.input.focus()
})
},
created() {
this.init()
},
......
src/views/equipment/basicInfo.vue
View file @ 212080b3
......@@ -415,36 +415,7 @@ export default {
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.open = true
......
src/views/equipment/boundManagement.vue
View file @ 212080b3
......@@ -99,7 +99,7 @@
<!-- 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<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 ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
......
src/views/equipment/check.vue
View file @ 212080b3
......@@ -33,18 +33,17 @@
/>
</el-form-item>
<el-form-item>
<el-button type="primary" style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button type="primary" style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="checkType">开始盘点 </el-button>
</el-form-item>
<el-form-item>
<el-button style="padding: 8px 7px;" type="danger" :size="smallSize" @click="deleteByType" icon="el-icon-minus">结束盘点 </el-button>
<el-button style="padding: 8px 7px;" type="danger" :size="smallSize" icon="el-icon-minus" @click="deleteByType">结束盘点 </el-button>
</el-form-item>
<el-form-item>
......@@ -59,22 +58,22 @@
<el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50px" />
<el-table-column type="index" label="序号" width="50px" />
<el-table-column label="pn" prop="pn" >
<el-table-column label="pn" prop="pn">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="lot" prop="lot" >
<el-table-column label="lot" prop="lot">
<template slot-scope="scope">
{{ scope.row.lot || '-' }}
</template>
</el-table-column>
<el-table-column label="plocation" prop="plocation" >
<el-table-column label="plocation" prop="plocation">
<template slot-scope="scope">
{{ scope.row.plocation || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="phd" >
<el-table-column label="厚度" prop="phd">
<template slot-scope="scope">
{{ scope.row.phd || '-' }}
</template>
......@@ -149,8 +148,8 @@
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
<!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row>
<el-col :span="12">
......@@ -165,8 +164,6 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="plocation：" prop="plocation">
......@@ -194,12 +191,10 @@
<el-row>
<el-col :span="12">
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12" />
</el-row>
<el-row>
<el-col :span="12">
......@@ -221,28 +216,28 @@
:visible.sync="table"
direction="rtl"
size="50%"
:close-on-click-modal= "false"
>
<el-table v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange" style="padding: 0 10px;">
:close-on-click-modal="false"
>
<el-table v-loading="loading" border :data="tableList" style="padding: 0 10px;" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="80" />
<el-table-column label="pn" prop="pn" >
<el-table-column label="pn" prop="pn">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="lot" prop="lot" >
<el-table-column label="lot" prop="lot">
<template slot-scope="scope">
{{ scope.row.lot || '-' }}
</template>
</el-table-column>
<el-table-column label="位置" prop="plocation" >
<el-table-column label="位置" prop="plocation">
<template slot-scope="scope">
{{ scope.row.plocation || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="phd" >
<el-table-column label="厚度" prop="phd">
<template slot-scope="scope">
{{ scope.row.phd || '-' }}
</template>
......@@ -262,9 +257,9 @@ import {
getRole,
updateRole
} from '@/api/system/role'
import { checkType, listCheck,addList,deleteByType,checkInventory} from '@/api/equipment/check'
import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
import { checkType, listCheck, addList, deleteByType, checkInventory } from '@/api/equipment/check'
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',
......@@ -272,13 +267,13 @@ export default {
return {
// 需要盘点的list
checkFrom: {
Ptype: '',
checkList: [],
Ptype: '',
checkList: []
},
table:false,
tableList:[],
table: false,
tableList: [],
// 选中的列表
selectList:[],
selectList: [],
// TODO: 表单里的单项详情参数
singleDetails: {
equipmentName: '',
......@@ -373,7 +368,7 @@ export default {
label: '仅本人数据权限'
}
],
equipmentList:[],
equipmentList: [],
// 菜单列表
menuOptions: [],
// 部门列表
......@@ -383,7 +378,7 @@ export default {
page: 1,
rows: 10,
ptype: 1,
pstatus:0
pstatus: 0
},
// 表单参数
......@@ -432,19 +427,19 @@ export default {
// });
},
methods: {
checkInventory() {
this.table = true;
checkInventory(1)
.then(response => {
checkInventory() {
this.table = true
checkInventory(1)
.then(response => {
// 处理返回的数据
this.tableList = response.data;
console.log(response);
})
.catch(error => {
this.tableList = response.data
console.log(response)
})
.catch(error => {
// 处理请求错误
console.error(error);
});
},
console.error(error)
})
},
// TODO: 获取所选行详情信息操作
handleDetail(row) {
......@@ -454,60 +449,59 @@ export default {
this.openDetails = !this.openDetails
},
deleteByType() {
// 添加二次确认对话框
this.$confirm("确认要结束盘点吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
// 用户点击确定按钮时执行的回调函数
deleteByType(1).then(flag => {
if (flag.data > 0 && flag.code === 200) {
this.$message.success("结束盘点成功");
} else {
this.$message.error("当前未开始盘点");
}
});
})
.catch(() => {
// 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
});
},
checkType() {
checkType(1).then(total => {
if (total.data !== 0) {
this.$message.error("请先结束盘点");
} else {
let data = [];
if (this.selectList.length === 0) {
data = this.equipmentList;
} else {
data = this.selectList;
}
// 添加二次确认对话框
this.$confirm("确认要进行盘点吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
this.$confirm('确认要结束盘点吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
// 用户点击确定按钮时执行的回调函数
addList(data).then(flag => {
if (flag.data.influence > 0) {
this.$message.success("盘点成功");
deleteByType(1).then(flag => {
if (flag.data > 0 && flag.code === 200) {
this.$message.success('结束盘点成功')
} else {
this.$message.error("盘点失败");
this.$message.error('当前未开始盘点')
}
});
})
})
.catch(() => {
// 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
});
}
});
},
})
},
checkType() {
checkType(1).then(total => {
if (total.data !== 0) {
this.$message.error('请先结束盘点')
} else {
let data = []
if (this.selectList.length === 0) {
data = this.equipmentList
} else {
data = this.selectList
}
// 添加二次确认对话框
this.$confirm('确认要进行盘点吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
// 用户点击确定按钮时执行的回调函数
addList(data).then(flag => {
if (flag.data.influence > 0) {
this.$message.success('盘点成功')
} else {
this.$message.error('盘点失败')
}
})
})
.catch(() => {
// 用户点击取消按钮时执行的回调函数，可以忽略这里的实现
})
}
})
},
handelTab(i, e) {
const that = this
......@@ -667,11 +661,11 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams={
this.queryParams = {
page: 1,
rows: 10,
ptype: 1,
pstatus:0
pstatus: 0
}
this.resetForm('queryForm')
this.handleQuery()
......
src/views/equipment/checkProcess.vue
View file @ 212080b3
......@@ -149,7 +149,7 @@
</div>
</el-dialog>
<!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row>
<el-col :span="12">
......@@ -216,7 +216,7 @@
:visible.sync="table"
direction="rtl"
size="50%"
:close-on-click-modal= "false"
:close-on-click-modal="false"
>
<el-table v-loading="loading" border :data="tableList" style="padding: 0 10px;" @selection-change="handleSelectionChange">
......@@ -377,10 +377,9 @@ export default {
// 查询参数
queryParams: {
page: 1,
rows: 10,
rows: 10,
ptype: 2,
pstatus:0,
pstatus: 0
},
// 表单参数
......@@ -666,7 +665,7 @@ export default {
page: 1,
rows: 10,
ptype: 2,
pstatus:0
pstatus: 0
}
this.resetForm('queryForm')
this.handleQuery()
......
src/views/equipment/draw.vue
View file @ 212080b3
......@@ -231,7 +231,7 @@
</el-dialog>
<!-- TODO: 处理 -->
<el-dialog :title="title" :visible.sync="openHandle" width="1200px" append-to-body>
<el-dialog :title="title" :visible.sync="openHandle" width="1200px" append-to-body :close-on-click-modal="false" @close="handlecanceClose">
<el-form ref="queryFormWarehouse" style="padding: 0 0 0 10px" :model="queryParamsDetail" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
......@@ -259,7 +259,6 @@
clearable
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
......@@ -306,6 +305,11 @@
{{ scope.row.psm || '-' }}
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createDate">
<template slot-scope="scope">
{{ parseTime(scope.row.createDate, '{y}-{m}-{d}') || '-' }}
</template>
</el-table-column>
</el-table>
<pagination
v-show="totalDetail>0"
......@@ -322,16 +326,43 @@
>确定</el-button>
</div>
</el-dialog>
<!-- 登录验证-->
<el-dialog :title="title" :visible.sync="openLogin" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="loginform" label-width="80px">
<el-form-item label="密码">
<el-input v-model="loginform.password" type="password" placeholder="请输入权限菜单密码" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleConfirm">确定</el-button>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<script>
import { listWbApply, deleteLogical, detailList, batchAddition, detail } from '@/api/equipment/draw'
import {
listWbApply,
deleteLogical,
batchAddition,
detail,
canceListByType,
checkPermission
} from '@/api/equipment/draw'
import { parseTime } from '@/utils'
import { getEquipment } from '@/api/equipment/application'
export default {
name: 'Draw',
data() {
return {
// 是否切换库
isCheck: false,
loginform: {
password: ''
},
// 打开登录验证界面
openLogin: false,
radio1: '1',
ptype: '',
pgx: '',
prank: '',
......@@ -343,7 +374,7 @@ export default {
multipleSelection: [],
detailApplyList: [],
deviceList: [],
// TODO: 表单里的单项详情参数
// 表单里的单项详情参数
singleDetails: {
pn: '',
phd: '',
......@@ -361,12 +392,6 @@ export default {
loadingDetail: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 总条数
total: 0,
// apply_detail的总条数
......@@ -377,16 +402,6 @@ export default {
title: '',
// 是否显示弹出层
open: false,
// 是否显示弹出层（数据权限）
openDataScope: false,
// 日期范围
// dateRange: [],
// 菜单表格数据
menuList: [],
menuExpand: false,
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
// 状态数据字典
statusOptions: [
{
......@@ -413,9 +428,9 @@ export default {
queryParams: {
page: 1,
rows: 10,
pn: undefined,
lot: undefined,
plocation: undefined,
pn: '',
lot: '',
plocation: '',
ptype: 1,
delFlag: 0
},
......@@ -423,19 +438,14 @@ export default {
queryParamsDetail: {
page: 1,
rows: 10,
pn: undefined,
lot: undefined,
plocation: undefined,
pn: '',
lot: '',
plocation: '',
ptype: 1,
delFlag: 0
},
// 表单参数
form: {},
defaultProps: {
children: 'children',
label: 'label'
},
deptOptions: [],
// 判断状态显示表单
applyStatus: ''
}
......@@ -451,18 +461,85 @@ export default {
next()
},
created() {
this.resetQuery()
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: {
handlecanceClose() {
this.loadingDetail = false
this.openHandle = false
this.isCheck = false
},
handcheckPermissionQuery() {
const obj = {
pn: this.pn,
type: this.radio1,
pgx: this.pgx,
prank: this.prank,
pissb: this.pissb,
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows,
tempPn: this.queryParamsDetail.pn,
lot: this.queryParamsDetail.lot,
plocation: this.queryParamsDetail.plocation
}
canceListByType(obj).then(res => {
if (res.code === 200) {
if (res.data.createDate !== null) {
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
}
this.detailApplyList = res.data
this.loadingDetail = false
this.openHandle = true
}
})
},
// 菜单权限验证确定
handleConfirm() {
const obj = {
passWord: this.loginform.password
}
checkPermission(obj).then(res => {
if (res.code === 200) {
this.openLogin = false
if (this.radio1 === '1') {
this.$message.success('已切换到设备库')
} else {
this.$message.success('已切换到工艺库')
}
const obj = {
pn: this.pn,
type: this.radio1,
pgx: this.pgx,
prank: this.prank,
pissb: this.pissb
}
canceListByType(obj).then(res => {
console.log('res', res)
if (res.code === 200) {
this.isCheck = true
if (res.data.createDate !== null) {
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
}
this.detailApplyList = res.data
this.loadingDetail = false
this.openHandle = true
} else if (res.code === null) {
this.$message.warning(res.message)
this.loadingDetail = false
this.openHandle = true
}
})
} else if (res.code === null) {
this.$message.warning(res.$message)
} else if (res.code === 500) {
this.$message.warning(res.$message)
}
})
},
// 处理弹窗里的勾选确定
handleCance() {
this.loadingDetail = true
console.log('multipleSelection', this.multipleSelection)
if (this.multipleSelection.length === 0) {
this.$message.warning('请至少选择一个要处理的设备')
} else {
......@@ -483,10 +560,10 @@ export default {
})
console.log('canceList', this.canceList)
batchAddition(this.canceList).then(res => {
console.log('res', res)
if (res.code === 200) {
this.loadingDetail = false
this.openHandle = false
this.isCheck = false
this.$message.success('操作成功')
this.queryParams.page = 1
this.getList()
......@@ -494,67 +571,71 @@ export default {
})
}
},
/** 查询warehouse列表 */
getDeviceList() {
this.loadingDetail = true
const obj = {
pn: this.pn,
ptype: this.ptype,
pgx: this.pgx,
prank: this.prank,
pissb: this.pissb,
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows,
tempPn: this.queryParamsDetail.pn,
lot: this.queryParams.lot,
plocation: this.queryParams.plocation
if (!this.isCheck) {
const obj = {
type: this.radio1,
pn: this.pn,
ptype: this.ptype,
pgx: this.pgx,
prank: this.prank,
pissb: this.pissb,
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows,
tempPn: this.queryParamsDetail.pn,
lot: this.queryParamsDetail.lot,
plocation: this.queryParamsDetail.plocation
}
getEquipment(obj).then(res => {
if (res.code === 200) {
if (res.data.createDate !== null) {
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
}
this.detailApplyList = res.data
this.loadingDetail = false
this.openHandle = true
}
})
} else {
this.handcheckPermissionQuery()
}
getEquipment(obj).then(res => {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
this.totalDetail = res.total
this.detailApplyList = res.rows
this.loadingDetail = false
})
},
// 处理点击
handle(row) {
console.log('row', row)
this.openHandle = true
this.applyId = row.businessId
this.ptype = row.ptype
this.pn = row.pn
this.pgx = row.pgx
this.prank = row.prank
this.pissb = row.pissb
const obj = {
type: this.radio1,
pn: row.pn,
ptype: row.ptype,
pgx: row.pgx,
prank: row.prank,
pissb: row.pissb,
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows
}
// 调warehouse分页查询接口
getEquipment(obj).then(res => {
if (res.code && res.code === null) {
this.$message.warning(res.message)
}
console.log('res')
if (res.rows.createDate && res.rows.createDate !== null) {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
if (res.code === 200) {
if (res.data.createDate !== null) {
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
}
this.detailApplyList = res.data
this.loadingDetail = false
this.openHandle = true
}
this.detailApplyList = res.rows
this.loadingDetail = false
this.openHandle = true
})
// this.applyId = row.businessId
this.title = '处理'
// this.openHandle = !this.openHandle
this.loadingDetail = true
// detailList(this.queryParamsDetail).then(res => {
// res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
// this.totalDetail = res.total
// this.detailApplyList = res.rows
// this.loadingDetail = false
// })
},
// 获取所选行详情信息
handleDetail(row) {
const id = row.businessId
......@@ -562,16 +643,17 @@ export default {
this.singleDetails = row
this.title = '详情'
detail(id).then(res => {
console.log('res', res)
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
// this.totalApplyDetail = res.total
this.applyList = res.data.wbApplyDetailList
this.applyStatus = res.data.pstatus
this.loadingDetail = false
})
},
/** 查询apply列表 */
// 查询apply表单
getList() {
this.isCheck = false
this.radio1 = '1'
this.loading = true
listWbApply(this.queryParams).then(
response => {
......@@ -581,25 +663,9 @@ export default {
}
)
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 取消按钮（数据权限）
cancelDataScope() {
this.openDataScope = false
this.reset()
},
// 表单重置
reset() {
if (this.$refs.menu !== undefined) {
this.$refs.menu.setCheckedKeys([])
}
this.menuExpand = false
this.menuNodeAll = false
this.deptExpand = true
this.deptNodeAll = false
this.form = {
pn: undefined,
ptype: undefined,
......@@ -633,50 +699,32 @@ export default {
phd: '',
prank: '',
pstatus: '',
ptype: '1'
ptype: '1',
delFlag: '0'
}
// this.dateRange = []
this.handleQuery()
},
// 菜单权限验证
login() {
this.title = '菜单权限'
this.openLogin = true
this.openHandle = false
},
// warehouse的重置按钮
resetQueryWarehouse() {
this.resetForm('queryFormWarehouse')
this.queryParamsDetail.pn = null
this.queryParamsDetail.lot = null
this.queryParamsDetail.plocation = null
this.queryParamsDetail.page = 1
this.handleQueryWarehouse()
},
// 多选框选中数据
handleSelectionChange: function(selection) {
this.multipleSelection = selection
},
// 树权限（父子联动）
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
}
}
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.businessId
......
src/views/equipment/equipmentAbandonment.vue
View file @ 212080b3
......@@ -34,7 +34,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" style="padding: 8px 7px;" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" style="padding: 8px 7px;" size="small" @click="resetQuery">重置</el-button>
<el-button icon="el-icon-refresh" style="padding: 8px 7px;" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<div style="float: right">
<!-- <el-form-item>
......@@ -53,7 +53,7 @@
<div style="padding:5px 10px">
<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="pn" width="220">
<template slot-scope="scope">
......@@ -100,7 +100,7 @@
:limit.sync="queryParams.rows"
@pagination="getList"
/>
<!-- 添加或修改设备配置对话框 -->
<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">
......@@ -145,7 +145,7 @@
</div>
</el-dialog>
<!-- TODO: 单项详情信息表单配置 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row>
<el-col :span="12">
......@@ -160,8 +160,6 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="plocation：" prop="plocation">
......@@ -189,12 +187,10 @@
<el-row>
<el-col :span="12">
<el-form-item label="厚度：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12" />
</el-row>
<el-row>
<el-col :span="12">
......@@ -214,36 +210,34 @@
<el-dialog :title="abandonTitle" :visible.sync="abandonOpen" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="abandonFrom" :rules="abandonFromRules" size="small" label-width="80px">
<el-form-item label="fq_yy" prop="fq_yy">
<el-select
v-model.trim="abandonFrom.fq_yy"
clearable
placeholder="请选择fq_yy"
>
<el-option
v-for="(dict,index) in pgxList"
:key="index"
:label="dict.dictValue"
:value="dict.dictLabel"
/>
</el-select>
</el-form-item>
<el-select
v-model.trim="abandonFrom.fq_yy"
clearable
placeholder="请选择fq_yy"
>
<el-option
v-for="(dict,index) in pgxList"
:key="index"
:label="dict.dictValue"
:value="dict.dictLabel"
/>
</el-select>
</el-form-item>
<el-form-item label="fq_bz" prop="fq_bz">
<el-input v-model.trim="abandonFrom.fq_bz" :maxlength="100" placeholder="请输入fq_bz" />
<el-input v-model.trim="abandonFrom.fq_bz" :maxlength="100" placeholder="请输入fq_bz" />
</el-form-item>
<el-form-item label="fq_dd" prop="fq_dd">
<el-input v-model.trim="abandonFrom.fq_dd" :maxlength="100" placeholder="请输入fq_dd" />
<el-input v-model.trim="abandonFrom.fq_dd" :maxlength="100" placeholder="请输入fq_dd" />
</el-form-item>
<el-form-item label="fq_mcode" prop="fq_mcode">
<el-input v-model.trim="abandonFrom.fq_mcode" :maxlength="100" placeholder="请输入fq_mcode" />
<el-input v-model.trim="abandonFrom.fq_mcode" :maxlength="100" placeholder="请输入fq_mcode" />
</el-form-item>
<el-form-item label="fq_ys" prop="fq_ys">
<el-input v-model.trim="abandonFrom.fq_ys" :maxlength="100" placeholder="请输入fq_ys" />
<el-input v-model.trim="abandonFrom.fq_ys" :maxlength="100" placeholder="请输入fq_ys" />
</el-form-item>
<el-form-item label="fq_dbxi" prop="fq_dbxi">
<el-input v-model.trim="abandonFrom.fq_dbxi" :maxlength="100" placeholder="请输入fq_dbxi" />
<el-input v-model.trim="abandonFrom.fq_dbxi" :maxlength="100" placeholder="请输入fq_dbxi" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -260,16 +254,14 @@ import {
addRole,
changeRoleStatus,
dataScope,
delRole,
exportRole,
getRole,
listRole,
updateRole
} from '@/api/system/role'
import {listCheck, abandon} from '@/api/equipment/check'
import { listCheck, abandon } from '@/api/equipment/check'
import { getDictData } from '@/api/equipment/application'
import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
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',
......@@ -277,7 +269,7 @@ export default {
return {
abandonTitle: '',
abandonOpen: false,
abandonFrom:{
abandonFrom: {
businessId: '',
fq_bz: '',
fq_dbxi: '',
......@@ -288,11 +280,11 @@ export default {
pstatus: '1'
},
pgxList:[],
pgxList: [],
abandonFromRules: {
fq_ys: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }],
fq_yy: [{ required: true, message: '请输入fq_yy', trigger: 'change' }],
fq_bz: [{ required: true, message: '请输入fq_yy', trigger: 'change' }]
fq_yy: [{ required: true, message: '请输入fq_yy', trigger: 'change' }],
fq_bz: [{ required: true, message: '请输入fq_yy', trigger: 'change' }]
},
// TODO: 表单里的单项详情参数
singleDetails: {
......@@ -388,7 +380,7 @@ export default {
label: '仅本人数据权限'
}
],
equipmentList:[],
equipmentList: [],
// 菜单列表
menuOptions: [],
// 部门列表
......@@ -396,10 +388,10 @@ export default {
// 查询参数
queryParams: {
page: 1,
rows: 10,
rows: 10,
ptype: 2,
pstatus:0,
pstatus: 0
},
// 表单参数
form: {
......@@ -448,24 +440,24 @@ export default {
// });
},
methods: {
abandonsubmitForm() {
this.$refs.form.validate((valid) => {
if (valid) {
console.log('abandonFrom', this.abandonFrom);
abandon(this.abandonFrom).then(res => {
console.log('res', res);
if (res.code === 200) {
this.abandonOpen = false;
this.$message.success('操作成功');
this.getList();
this.reFrom();
this.$refs.form.validate((valid) => {
if (valid) {
console.log('abandonFrom', this.abandonFrom)
abandon(this.abandonFrom).then(res => {
console.log('res', res)
if (res.code === 200) {
this.abandonOpen = false
this.$message.success('操作成功')
this.getList()
this.reFrom()
}
})
}
});
}
});
},
})
},
reFrom() {
this.form = {
businessId: '',
......@@ -477,7 +469,6 @@ export default {
fq_yy: '',
pstatus: '1'
}
},
getDict() {
const obj = {
......@@ -655,11 +646,11 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams={
this.queryParams = {
page: 1,
rows: 10,
ptype: 2,
pstatus:0,
pstatus: 0
}
this.resetForm('queryForm')
this.handleQuery()
......@@ -786,37 +777,37 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
console.log('row',row);
this.abandonTitle = "废弃表单信息"
this.abandonFrom.businessId = row.businessId
this.abandonOpen = true
// const EquipmentIds = row.businessId || this.ids;
// const vm = this; // 保存当前上下文
console.log('row', row)
this.abandonTitle = '废弃表单信息'
this.abandonFrom.businessId = row.businessId
this.abandonOpen = true
// this.$prompt('请填写废弃原因', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// inputPlaceholder: '请输入fq_yy',
// inputPattern: /\S+/,
// inputErrorMessage: '废弃原因不能为空',
// }).then(({ value }) => {
// console.log(row);
// const reason = value; // 获取用户填写的废弃原因
// const EquipmentIds = row.businessId || this.ids;
// const vm = this; // 保存当前上下文
// // 在此处处理相关逻辑，比如将废弃原因和其他输入框的值提交给后端进行处理
// this.$prompt('请填写废弃原因', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// inputPlaceholder: '请输入fq_yy',
// inputPattern: /\S+/,
// inputErrorMessage: '废弃原因不能为空',
// }).then(({ value }) => {
// console.log(row);
// const reason = value; // 获取用户填写的废弃原因
// return delEquipment(EquipmentIds);
// }).then(() => {
// vm.getList(); // 使用保存的上下文进行调用
// vm.$message({
// message: '删除成功',
// type: 'success',
// });
// }).catch(() => {
// // 处理异常情况
// });
},
// // 在此处处理相关逻辑，比如将废弃原因和其他输入框的值提交给后端进行处理
// return delEquipment(EquipmentIds);
// }).then(() => {
// vm.getList(); // 使用保存的上下文进行调用
// vm.$message({
// message: '删除成功',
// type: 'success',
// });
// }).catch(() => {
// // 处理异常情况
// });
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams
......
src/views/equipment/management.vue
View file @ 212080b3
......@@ -53,7 +53,7 @@
<div class="placeholder" />
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">设备管理列表</div>
<el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange" >
<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" :show-overflow-tooltip="true">
<template slot-scope="scope">
......@@ -80,7 +80,7 @@
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate" >
<el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
<template slot-scope="scope">
<span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
......@@ -116,9 +116,9 @@
<!-- 添加或修改设备配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<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 ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
<el-input ref="input1" v-model.trim="form.pn" :maxlength="100" 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)" />
......
src/views/equipment/processEquipment.vue
View file @ 212080b3
......@@ -141,8 +141,8 @@ import {
listRole,
updateRole
} from '@/api/system/role'
import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
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',
......
src/views/processManagement/deviceReuse/index.vue
View file @ 212080b3
<template>
<div class="app-container">
<!-- 表单区域-->
<el-form ref="form" :model="form" :rules="rule" label-width="80px">
<!-- 标题-->
<!-- 表单区域-->
<el-form ref="form" :model="form" :rules="rule" label-width="80px">
<!-- 标题-->
<div class="info"><span class="title">再利用</span></div>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
......
src/views/processManagement/draw.vue
View file @ 212080b3
......@@ -337,7 +337,17 @@
</div>
</el-dialog>
<!-- 登录验证-->
<el-dialog title="菜单权限" :visible.sync="menu" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="menuform" label-width="80px">
<el-form-item label="密码">
<el-input v-model="menuform.passWord" type="password" placeholder="请输入权限菜单密码" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handlemenuConfirm">确定</el-button>
</el-form-item>
</el-form>
</el-dialog>
<!-- 菜单权限验证-->
<el-dialog :title="title" :visible.sync="openLogin" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="loginform" label-width="80px">
<el-form-item label="密码">
......@@ -358,6 +368,11 @@ export default {
name: 'Draw',
data() {
return {
menu: false,
menuform: {
},
monthDate: false,
// 是否切换库
isCheck: false,
loginform: {
......@@ -465,10 +480,6 @@ export default {
},
// 表单参数
form: {},
defaultProps: {
children: 'children',
label: 'label'
},
deptOptions: [],
// 判断状态显示表单
applyStatus: ''
......@@ -488,6 +499,40 @@ export default {
this.getList()
},
methods: {
handlemenuConfirm() {
const obj = {
passWord: this.menuform.passWord
}
checkPermission(obj).then(res => {
if (res.code === 200) {
batchAddition(this.canceList).then(res => {
if (res.code === 200) {
this.loadingDetail = false
this.openHandle = false
this.radio1 = '2'
this.isCheck = false
this.$message.success('操作成功')
this.queryParams.page = 1
this.getList()
}
})
this.menuform.password = ''
} else if (res.code === null) {
this.$message.warning(res.message)
this.loadingDetail = false
this.multipleSelection = false
this.monthDate = false
this.menu = false
}
})
},
// 判断时间范围 是否是一个月以内的的时间
isWithinLastMonth(dateToCheck) {
var currentDate = new Date() // 当前日期对象
var oneMonthAgo = new Date() // 一个月前的日期对象
oneMonthAgo.setMonth(currentDate.getMonth() - 1) // 将一个月前的日期设置为当前月份减1
return dateToCheck >= oneMonthAgo && dateToCheck <= currentDate
},
handlecanceClose() {
this.loadingDetail = false
this.openHandle = false
......@@ -544,6 +589,7 @@ export default {
if (res.data.createDate !== null) {
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
}
this.loginform.password = ''
this.detailApplyList = res.data
this.loadingDetail = false
this.openHandle = true
......@@ -576,6 +622,7 @@ export default {
})
},
// 处理弹窗里的勾选确定
handleCance() {
this.loadingDetail = true
if (this.multipleSelection.length === 0) {
......@@ -584,6 +631,10 @@ export default {
this.canceList = []
this.multipleSelection.forEach(item => {
console.log('item', item)
if (!this.isWithinLastMonth(new Date(item.recycleDate))) {
this.monthDate = true
this.openHandle = false
}
const obj = {
applyId: this.applyId,
pn: item.pn,
......@@ -597,19 +648,26 @@ export default {
this.canceList.push(obj)
})
console.log('canceList', this.canceList)
batchAddition(this.canceList).then(res => {
if (res.code === 200) {
this.loadingDetail = false
this.openHandle = false
this.radio1 = '2'
this.isCheck = false
this.$message.success('操作成功')
this.queryParams.page = 1
this.getList()
}
})
console.log('monthDate', this.monthDate)
if (this.monthDate) {
this.menu = true
}
if (!this.monthDate) {
batchAddition(this.canceList).then(res => {
if (res.code === 200) {
this.loadingDetail = false
this.openHandle = false
this.radio1 = '2'
this.isCheck = false
this.$message.success('操作成功')
this.queryParams.page = 1
this.getList()
}
})
}
}
},
/** 查询warehouse列表 */
getDeviceList() {
this.loadingDetail = true
......@@ -641,8 +699,12 @@ export default {
this.handcheckPermissionQuery()
}
},
// 处理点击
handle(row) {
console.log('row', row)
this.monthDate = false
this.openHandle = true
this.applyId = row.businessId
this.pn = row.pn
this.ptype = row.ptype
......@@ -659,6 +721,7 @@ export default {
page: this.queryParamsDetail.page,
rows: this.queryParamsDetail.rows
}
// 调warehouse分页查询接口
getEquipment(obj).then(res => {
if (res.code === 200) {
if (res.data.createDate !== null) {
......@@ -672,7 +735,8 @@ export default {
this.title = '处理'
this.loadingDetail = true
},
// 获取所选行详情信息
// 获取行详情信息
handleDetail(row) {
const id = row.businessId
this.openDetails = true
......@@ -685,7 +749,8 @@ export default {
this.loadingDetail = false
})
},
/** 查询apply列表 */
// 查询apply表单
getList() {
this.isCheck = false
this.radio1 = '2'
......
src/views/processManagement/equipmentRequisition/index.vue
View file @ 212080b3
......@@ -434,8 +434,7 @@ export default {
}
}
})
},
}
}
}
......
src/views/sample/basicInformation/index.vue
View file @ 212080b3
......@@ -172,7 +172,7 @@ export default {
rules: {
pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
name: [{ required: true, message: '请输入name', trigger: 'blur' }],
qty: [{ required: true,pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
qty: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
maxQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
minQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
},
......
src/views/sample/correctionLibrary/index.vue
View file @ 212080b3
......@@ -154,7 +154,7 @@ export default {
rules: {
pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
name: [{ required: true, message: '请输入name', trigger: 'blur' }],
qty: [{ required: true,pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
qty: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
maxQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
minQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
},
......
src/views/sample/sampleType/index.vue
View file @ 212080b3
......@@ -46,13 +46,13 @@
icon="el-icon-plus"
@click="handleAdd"
>新增</el-button>
<!-- <el-button-->
<!-- style="padding: 8px 7px;"-->
<!-- type="success"-->
<!-- size="small"-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"-->
<!-- >导出</el-button>-->
<!-- <el-button-->
<!-- style="padding: 8px 7px;"-->
<!-- type="success"-->
<!-- size="small"-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"-->
<!-- >导出</el-button>-->
</el-form-item>
</div>
</el-form>
......@@ -78,11 +78,11 @@
{{ scope.row.dno || '-' }}
</template>
</el-table-column>
<!-- <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.remarks || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.remarks || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作人" prop="createName" :show-overflow-tooltip="true" width="200px">
<template slot-scope="scope">
{{ scope.row.createName || '-' }}
......@@ -138,9 +138,9 @@
<el-form-item label="dno" prop="dno">
<el-input v-model.trim="form.dno" clearable :maxlength="100" placeholder="请输入dno" />
</el-form-item>
<!-- <el-form-item label="remarks" prop="remarks">-->
<!-- <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="remarks" prop="remarks">-->
<!-- <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
......
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