Skip to content

T
template_vue
Commit 97d379ec authored by wdy's avatar wdy
Browse files
Options

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

parents f671b388 8fab2fe6
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 52 deletions
src/views/equipment/draw.vue
View file @ 97d379ec
......@@ -79,10 +79,9 @@
<span v-if="scope.row.pgx === '002'">排水</span>
</template>
</el-table-column>
<el-table-column label="pissb" prop="pissb">
<el-table-column label="pnumber" prop="pnumber">
<template slot-scope="scope">
<span v-if="scope.row.pissb === '0'">否</span>
<span v-else>是</span>
{{ scope.row.pnumber }}
</template>
</el-table-column>
<el-table-column label="状态" prop="pstatus">
......@@ -137,36 +136,35 @@
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="1200px" append-to-body>
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="phd：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="pgx：" prop="pgx">
<el-input v-model.trim="singleDetails.pgx" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="pissb：" prop="pissb">
<el-input v-model.trim="singleDetails.pissb" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="状态：" prop="pstatus">
<template>
<span v-if="singleDetails.pstatus === '0'" style="color: red">未完成</span>
......@@ -175,17 +173,23 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="申请人：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label=" 申请时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="pnumber：" prop="pnumber">
<el-input v-model.trim="singleDetails.pnumber" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
......@@ -375,12 +379,15 @@
</div>
</el-dialog>
<!-- 登录验证-->
<!-- 权限验证-->
<el-dialog :title="title" :visible.sync="openLogin" width="500px" append-to-body :close-on-click-modal="false">
<div style="text-align: center">
<span style="font-size: 15px">该操作需要权限认证</span>
</div>
<el-form ref="form" :model="loginform" label-width="80px">
<el-form-item class="premissVerificationTitle" style="margin: 0;">
当前选择跨越设备需要权限密码
</el-form-item>
<el-form-item label="密码">
<el-input v-model="loginform.password" type="password" placeholder="请输入密码" />
</el-form-item>
......@@ -433,6 +440,7 @@ export default {
prank: '',
pgx: '',
pissb: '',
pnumber: '',
pstatus: '',
createName: '',
createTime: ''
......@@ -583,6 +591,7 @@ export default {
// 处理弹窗里的勾选确定
handleCance() {
this.loadingDetail = true
this.title = '权限菜单'
if (this.multipleSelection.length === 0) {
this.$message.warning('请至少选择一个要处理的设备')
} else {
......@@ -845,4 +854,13 @@ export default {
height: 12em;
width: 4px;
}
.premissVerificationTitle{
/deep/ .el-form-item__content {
text-align: center;
margin-right: 80px;
font-weight: 600;
}
}
</style>
src/views/equipment/equipmentAbandonment.vue
View file @ 97d379ec
......@@ -212,6 +212,7 @@
<el-form-item label="fq_yy" prop="fq_yy">
<el-select
v-model.trim="abandonFrom.fq_yy"
style="width: 340px"
clearable
placeholder="请选择fq_yy"
>
......
src/views/processManagement/draw.vue
View file @ 97d379ec
......@@ -370,9 +370,9 @@
{{ scope.row.psm || '-' }}
</template>
</el-table-column>
<el-table-column label="回收时间" prop="recycleDate">
<el-table-column label="入库日期" prop="recycleDate">
<template slot-scope="scope">
{{ scope.row.recycleDate || '-' }}
{{ scope.row.recycleDate.substring(0, 7) }}
</template>
</el-table-column>
</el-table>
......
src/views/processManagement/inventoryRecord/index.vue
View file @ 97d379ec
......@@ -250,7 +250,7 @@ export default {
// TODO: 数据总条数
total: 0,
// TODO: 关于 Ptype的数据字典
// TODO: 关于 Poperate的数据字典
selectOptionsAboutPoperate: [
{
value: '1',
......@@ -369,7 +369,6 @@ export default {
{
time: true,
prop: 'createDate',
sortable: 'custom',
label: '操作时间',
align: 'center'
},
......
src/views/sample/inventoryRecord/index.vue
View file @ 97d379ec
......@@ -26,16 +26,16 @@
/>
</el-form-item>
<el-form-item label="库类型" prop="ptype">
<el-form-item label="库状态" prop="poperate">
<el-select
v-model="queryEntity.entity.ptype"
placeholder="请选择库类型"
v-model="queryEntity.entity.poperate"
placeholder="请选择库状态"
filterable
clearable
@keyup.enter.native="handleQuery"
>
<el-option
v-for="option in selectOptionsAboutPtype"
v-for="option in selectOptionsAboutPoperate"
:key="option.value"
:label="option.label"
:value="option.value"
......@@ -126,8 +126,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="库类型：" prop="ptype">
{{ selectedPtype(singleDetails.ptype) }}
<el-form-item label="库状态：" prop="poperate">
{{ selectedPoperate(singleDetails.poperate) }}
</el-form-item>
<el-form-item label="qty：" prop="qty">
{{ singleDetails.qty }}
......@@ -193,14 +193,21 @@ export default {
// TODO: 数据总条数
total: 0,
// TODO: 关于 Ptype的数据字典
selectOptionsAboutPtype: [
// TODO: 关于 Poperate的数据字典
selectOptionsAboutPoperate: [
{
value: '1',
label: '设备库'
label: '入库'
}, {
value: '2',
label: '工序库'
label: '出库'
},
{
value: '3',
label: '修正'
}, {
value: '4',
label: '废弃'
}
],
......@@ -220,8 +227,8 @@ export default {
pn: '',
// TODO: lot
lot: '',
// TODO: 库类型 1设备库 2工序库
ptype: ''
// TODO: 库状态 1入库 2出库 3修正 4废弃
poperate: ''
}
},
// TODO: list记录表名
......@@ -230,6 +237,10 @@ export default {
inventoryRecordList: [],
// TODO: 用来说明每一列的类型
columObj: {
// 序列
nIndex: true,
// 序列根据条件是否继承排序顺序
nIndextable: false,
// 选择框
selection: false,
// 选择框根据条件是否可选
......@@ -262,10 +273,10 @@ export default {
},
{
ownDefined: true,
prop: 'ptype',
label: '库类型',
prop: 'poperate',
label: '库状态',
ownDefinedReturn: (row, $index) => {
return this.selectedPtype(row.ptype)
return this.selectedPoperate(row.poperate)
}
},
{
......@@ -285,7 +296,6 @@ export default {
{
time: true,
prop: 'createDate',
sortable: 'custom',
label: '操作时间',
align: 'center'
},
......@@ -323,13 +333,6 @@ export default {
BaseTable() {
return BaseTable
},
/* TODO:自定义分页索引，实现索引继承 */
nIndex(index) {
// TODO: 当前页数 - 1 * 每页数据条数 + 1
const page = this.queryParams.page // TODO: 当前页码
const rows = this.queryParams.rows // TODO: 每页条数
return index + 1 + (page - 1) * rows
},
// TODO: 用来汇总Table组件所需要的全部数据并一次性传输给子组件
allTableArguments() {
const baseTableArgumentsTest = new BaseTableArgumentsTest()
......@@ -382,19 +385,20 @@ export default {
listLog(this.queryParams, this.addDateRange(this.queryEntity, this.dateRange)).then(response => {
this.inventoryRecordList = response.rows
this.total = response.total
// 暂时还没写后端 this.selectOptionsAboutPoperate = selectOptionsAboutPoperate
// this.selectOptionsAboutPtype = selectOptionsAboutPtype
this.loading = false
})
},
/* TODO: ptype 库类型判断的公用方法 */
selectedPtype(ptype) {
switch (ptype) {
/* TODO: poperate的库状态判断的公用方法 */
selectedPoperate(poperate) {
switch (poperate) {
case '1':
return '设备库'
return '入库'
case '2':
return '工序库'
return '出库'
case '3':
return '修正'
case '4':
return '废弃'
default:
return ''
}
......@@ -411,7 +415,7 @@ export default {
entity: {
pn: '',
lot: '',
ptype: ''
poperate: ''
}
}
this.dateRange = []
......
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