Skip to content

T
template_vue
Commit 67e0c018 authored by 高宇's avatar 高宇
Browse files
Options

出入库记录添加两个字段

parent db8a702a
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 64 deletions
src/views/equipment/inventoryRecord/index.vue
View file @ 67e0c018
......@@ -145,7 +145,7 @@
append-to-body
@closed="handleClose"
>
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="100px">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="140px">
<el-row :gutter="10" justify="start" align="middle">
<el-col :span="12">
......@@ -158,6 +158,9 @@
<el-form-item label="plocation：" prop="plocation">
<el-input v-model.trim="singleDetails.plocation" :readonly="isReadOnly" />
</el-form-item>
<el-form-item label="unlockUsername：" prop="unlockUsername">
<el-input v-model.trim="singleDetails.unlockUsername" :readonly="isReadOnly" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -170,6 +173,9 @@
<el-form-item label="fqYs：" prop="fqYs">
{{ singleDetails.fqYs }}
</el-form-item>
<el-form-item label="unlockDate：" prop="unlockDate">
<el-input v-model.trim="singleDetails.unlockDate" :readonly="isReadOnly" />
</el-form-item>
</el-col>
</el-row>
......@@ -578,6 +584,7 @@ export default {
type: 'warning'
})
} else {
console.log('详情')
var { fqYs, fqBz, fqDbxi, fqDd, fqMcode, fqYy } = response.data
var fq = { fqYs, fqBz, fqDbxi, fqDd, fqMcode, fqYy }
this.singleDetails = Object.assign({}, { ...row }, { ...fq })
......
src/views/processManagement/inventoryRecord/index.vue
View file @ 67e0c018
......@@ -100,20 +100,20 @@
</el-button>
</el-form-item>
<!-- &lt;!&ndash;TODO: 导出按钮所在 &ndash;&gt;-->
<!-- <div style="float: right; padding:3px 10px;">-->
<!-- <el-row :gutter="10">-->
<!-- <el-col :span="1.5">-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </div>-->
<!-- &lt;!&ndash;TODO: 导出按钮所在 &ndash;&gt;-->
<!-- <div style="float: right; padding:3px 10px;">-->
<!-- <el-row :gutter="10">-->
<!-- <el-col :span="1.5">-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </div>-->
</el-form>
</div>
<!-- TODO: 分隔符-->
<div class="placeholder" />
<div class="placeholder"/>
<!--TODO: Table表单-->
<transition name="fade-transform" mode="out-in">
......@@ -145,18 +145,21 @@
append-to-body
@closed="handleClose"
>
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="100px">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="140px">
<el-row :gutter="10" justify="start" align="middle">
<el-col :span="12">
<el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.pn" :readonly="isReadOnly"/>
</el-form-item>
<el-form-item label="lot：" prop="lot">
<el-input v-model.trim="singleDetails.lot" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.lot" :readonly="isReadOnly"/>
</el-form-item>
<el-form-item label="plocation：" prop="plocation">
<el-input v-model.trim="singleDetails.plocation" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.plocation" :readonly="isReadOnly"/>
</el-form-item>
<el-form-item label="unlockUsername：" prop="unlockUsername">
<el-input v-model.trim="singleDetails.unlockUsername" :readonly="isReadOnly"/>
</el-form-item>
</el-col>
......@@ -170,6 +173,9 @@
<el-form-item label="fqYs：" prop="fqYs">
{{ singleDetails.fqYs }}
</el-form-item>
<el-form-item label="unlockDate：" prop="unlockDate">
<el-input v-model.trim="singleDetails.unlockDate" :readonly="isReadOnly"/>
</el-form-item>
</el-col>
</el-row>
......@@ -201,13 +207,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="操作员：" prop="userName">
<el-input v-model.trim="singleDetails.userName" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.userName" :readonly="isReadOnly"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly" />
<el-input v-model.trim="singleDetails.createDate" :readonly="isReadOnly"/>
</el-form-item>
</el-col>
</el-row>
......@@ -219,10 +225,10 @@
</template>
<script>
import { exportInventoryRecord, findSingleLogDetail, listLog } from '@/api/processMangement/InventoryRecord'
import {exportInventoryRecord, findSingleLogDetail, listLog} from '@/api/processMangement/InventoryRecord'
import BaseTable from '@/components/Table/BaseTable/index.vue'
import { BaseTableArgumentsTest } from '@/components/Table/AllTableArguments/BaseTableArguments'
import { getDictData } from '@/api/equipment/application'
import {BaseTableArgumentsTest} from '@/components/Table/AllTableArguments/BaseTableArguments'
import {getDictData} from '@/api/equipment/application'
export default {
name: 'InventoryRecord',
......@@ -446,9 +452,10 @@ export default {
},
created() {
if (this.$store.getters.searchParams[this.$route.path]) {
const { searchParams } = this.$store.getters; const { path } = this.$route
const {searchParams} = this.$store.getters;
const {path} = this.$route
const param = JSON.parse(searchParams[path]) // 保留着的查询条件
this.queryParams = { ...param }
this.queryParams = {...param}
}
this.getList()
this.getDict()
......@@ -544,7 +551,7 @@ export default {
this.singleLogIdAndPn = {}
},
/* TODO: 进行排序 */
changeTableSort: function(val) {
changeTableSort: function (val) {
console.log('column', val)
// TODO:按照降序排序
if (val.order === 'descending') {
......@@ -556,10 +563,10 @@ export default {
this.getList()
},
/* TODO: 获取详情信息*/
handleDetail: function(row) {
handleDetail: function (row) {
/* TODO: 如果库状态为‘废弃’，即为‘4’时，则可以进入 */
if (row.poperate !== '4') {
this.singleDetails = { ...row }
this.singleDetails = {...row}
} else {
/* TODO: 设置单项详情的查询的条件 */
this.singleLogIdAndPn['businessId'] = row.businessId
......@@ -571,16 +578,16 @@ export default {
this.activateAbandonedState = true
this.title = '记录详情'
if (response.data === 'fail') {
this.singleDetails = Object.assign({}, { ...row })
this.singleDetails = Object.assign({}, {...row})
this.$message({
showClose: true,
message: response.message,
type: 'warning'
})
} else {
var { fqYs, fqBz, fqDbxi, fqDd, fqMcode, fqYy } = response.data
var fq = { fqYs, fqBz, fqDbxi, fqDd, fqMcode, fqYy }
this.singleDetails = Object.assign({}, { ...row }, { ...fq })
var {fqYs, fqBz, fqDbxi, fqDd, fqMcode, fqYy} = response.data
var fq = {fqYs, fqBz, fqDbxi, fqDd, fqMcode, fqYy}
this.singleDetails = Object.assign({}, {...row}, {...fq})
}
}
)
......@@ -621,40 +628,43 @@ export default {
}
</script>
<style lang="scss" scoped>
.app-container {
<style lang="scss" scoped>
.app-container {
padding: 0;
font-size: 18px;
.placeholder{
height:1.3vh;
.placeholder {
height: 1.3vh;
background-color: #F4F4F4;
margin-bottom:10px
margin-bottom: 10px
}
/*TODO: 这里是调整ToolBar的样式的噢！*/
.ToolBar{
.el-form{
.el-form-item{
.el-select{
.ToolBar {
.el-form {
.el-form-item {
.el-select {
width: 160px
}
.el-input{
.el-input {
width: 180px
}
}
}
/* TODO: 定义按钮样式 */
.el-button{
.el-button {
padding: 8px 7px;
}
}
}
}
/* TODO: 专门用来解决el-input边框的问题 */
.aboutSingleDetails{
.el-form{
.el-form-item{
.el-input >>> .el-input__inner {
/* TODO: 专门用来解决el-input边框的问题 */
.aboutSingleDetails {
.el-form {
.el-form-item {
.el-input > > > .el-input__inner {
-webkit-appearance: none;
background-color: #FFF;
background-image: none;
......@@ -665,7 +675,7 @@ export default {
}
}
}
}
</style>
</style>
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