Commit 1452fe8e authored by Hagsn3's avatar Hagsn3

修改代码

parent 6915008a
...@@ -127,14 +127,14 @@ ...@@ -127,14 +127,14 @@
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="pn" prop="pn" :show-overflow-tooltip="true"> <el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.pn || '-' }} {{ scope.row.orderCode || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="qty" prop="qty" :show-overflow-tooltip="true"> <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.qty || '-' }} {{ scope.row.pn || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="LOT" prop="lot" :show-overflow-tooltip="true"> <el-table-column label="LOT" prop="lot" :show-overflow-tooltip="true">
...@@ -142,16 +142,22 @@ ...@@ -142,16 +142,22 @@
{{ scope.row.lot || '-' }} {{ scope.row.lot || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="rank" prop="rank" :show-overflow-tooltip="true"> <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.rank || '-' }} {{ scope.row.qty || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true"> <el-table-column label="rank" prop="rank" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span> {{ scope.row.rank || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="出库状态" prop="dealStatus" :show-overflow-tooltip="true"> <el-table-column label="出库状态" prop="dealStatus" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.dealStatus === '1'">已出库</span> <span v-if="scope.row.dealStatus === '1'">已出库</span>
...@@ -162,12 +168,14 @@ ...@@ -162,12 +168,14 @@
<el-table-column label="操作" class-name="small-padding fixed-width" width="130px"> <el-table-column label="操作" class-name="small-padding fixed-width" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-show="scope.row.dealStatus !=='1'"
:class="commonField.updateClass" :class="commonField.updateClass"
:type="commonField.typeParent" :type="commonField.typeParent"
:size="commonField.size" :size="commonField.size"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>修改</el-button> >修改</el-button>
<el-button <el-button
v-show="scope.row.dealStatus !=='1'"
:class="commonField.delClass" :class="commonField.delClass"
:type="commonField.typeParent" :type="commonField.typeParent"
:size="commonField.size" :size="commonField.size"
...@@ -189,8 +197,16 @@ ...@@ -189,8 +197,16 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改检查申请配置对话框 --> <!-- 添加或修改检查申请配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <!-- class="my-custom-dialog"-->
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px"> <el-dialog
class="my-custom-dialog"
:title="title"
:visible.sync="open"
width="600px"
:close-on-click-modal="false"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px" class="my-custom-form">
<el-form-item label="wh_id" prop="whId"> <el-form-item label="wh_id" prop="whId">
<el-select <el-select
v-model="form.whId" v-model="form.whId"
...@@ -212,7 +228,7 @@ ...@@ -212,7 +228,7 @@
v-model="form.ptype" v-model="form.ptype"
placeholder="请选择ptype值" placeholder="请选择ptype值"
clearable clearable
:maxlength="1" :maxlength="2"
size="small" size="small"
style="width: 100%" style="width: 100%"
@change="handleInputChange" @change="handleInputChange"
...@@ -225,6 +241,14 @@ ...@@ -225,6 +241,14 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="code" prop="orderCode">
<el-input
v-model.trim="form.orderCode"
show-word-limit
:maxlength="100"
placeholder="请输入code"
/>
</el-form-item>
<el-form-item label="pn" prop="pn"> <el-form-item label="pn" prop="pn">
<el-input <el-input
v-model.trim="form.pn" v-model.trim="form.pn"
...@@ -257,7 +281,7 @@ ...@@ -257,7 +281,7 @@
v-model.trim="form.remarks" v-model.trim="form.remarks"
type="textarea" type="textarea"
:rows="5" :rows="5"
maxlength="500" maxlength="200"
show-word-limit show-word-limit
placeholder="请输入内容" placeholder="请输入内容"
/> />
...@@ -520,6 +544,7 @@ export default { ...@@ -520,6 +544,7 @@ export default {
createByName: undefined, createByName: undefined,
rank: undefined, rank: undefined,
lot: undefined, lot: undefined,
orderCode: undefined,
flag: '' flag: ''
}, },
// 表单参数 // 表单参数
...@@ -538,6 +563,9 @@ export default { ...@@ -538,6 +563,9 @@ export default {
lot: [ lot: [
{ required: true, message: '请输入lot的值', trigger: 'blur' } { required: true, message: '请输入lot的值', trigger: 'blur' }
], ],
orderCode: [
{ required: true, message: '请输入code的值', trigger: 'blur' }
],
qty: [ qty: [
{ required: true, message: '请输入qty的值', trigger: 'blur' }, { required: true, message: '请输入qty的值', trigger: 'blur' },
{ pattern: /^(0|[1-9]\d*)$/, message: '输入值不符合格式要求,请重新输入', trigger: 'blur' } { pattern: /^(0|[1-9]\d*)$/, message: '输入值不符合格式要求,请重新输入', trigger: 'blur' }
...@@ -721,11 +749,11 @@ export default { ...@@ -721,11 +749,11 @@ export default {
qty: undefined, qty: undefined,
whId: this.warehouseList[0].dictValue, whId: this.warehouseList[0].dictValue,
ptype: '20', ptype: '20',
dealStatus: undefined, orderCode: undefined,
dealStatus: '0',
createByName: undefined, createByName: undefined,
rank: undefined, rank: undefined,
lot: undefined, lot: undefined
flag: '1'
} }
this.resetForm('form') this.resetForm('form')
}, },
...@@ -892,5 +920,22 @@ export default { ...@@ -892,5 +920,22 @@ export default {
background-color: #F4F4F4; background-color: #F4F4F4;
margin-bottom: 10px margin-bottom: 10px
} }
}
.my-custom-dialog {
::v-deep .el-dialog{
height: 650px;
}
::v-deep .el-dialog__body{
overflow-y: visible;
}
::v-deep .dialog-footer {
margin-top: 5%;
}
} }
//.my-custom-form {
// height: 600px; /* 设置表单的高度 */
// overflow-y: auto; /* 当内容溢出时显示垂直滚动条 */
//}
</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