Merge pull request 'projects/mes-zhp' (#131) from projects/mes-zhp into projects/mes-test

Reviewed-on: #131
This commit is contained in:
高天泽 2023-11-30 08:54:28 +08:00
commit 4e97989ede
4 changed files with 11 additions and 11 deletions

View File

@ -11,7 +11,7 @@
<base-table class="base-table__margin" :table-props="productProps" :page="1" :limit="10" :table-data="list">
</base-table>
<div v-for="(item,index) in downProps" :key="index">
<div class="blue-title">工单:{{ list[index].workOrderName }}</div>
<div class="blue-title">工单名称:{{ list[index].workOrderName }}</div>
<base-table class="base-table__margin" :table-props="item" :page="1" :limit="10"
:table-data="downList[index]">
</base-table>
@ -214,7 +214,7 @@ export default {
{
// width: 160,
prop: 'workOrderName',
label: '工单名',
label: '工单名',
},
...this.dynamicProps,
{

View File

@ -9,8 +9,8 @@
<el-form ref="form" :model="innerDataForm" label-width="100px" v-loading="formLoading">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工单" prop="workOrderId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
<el-select v-model="innerDataForm.workOrderId" placeholder="请选择工单" filterable clearable>
<el-form-item label="工单名称" prop="workOrderId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
<el-select v-model="innerDataForm.workOrderId" placeholder="请选择工单名称" filterable clearable>
<el-option v-for="opt in workOrderList" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>

View File

@ -141,8 +141,8 @@ export default {
searchBarFormConfig: [
{
type: 'select',
label: '工单号',
placeholder: '请选择工单',
label: '工单名称',
placeholder: '请选择工单名称',
param: 'workOrderId',
selectOptions: [],
filterable:true
@ -215,7 +215,7 @@ export default {
{
// width: 128,
prop: 'workOrderName',
label: '工单Id',
label: '工单名称',
},
{
// width: 128,

View File

@ -67,8 +67,8 @@ export default {
searchBarFormConfig: [
{
type: 'select',
label: '工单',
placeholder: '请选择工单',
label: '工单名称',
placeholder: '请选择工单名称',
param: 'workOrderIdList',
selectOptions: [],
multiple: true,
@ -205,8 +205,8 @@ export default {
return [
{
// width: 128,
prop: 'workOrderId',
label: '工单',
prop: 'workOrderName',
label: '工单名称',
},
{
// width: 128,