projects/mes-test #132

Manually merged
gtz217 merged 281 commits from projects/mes-test into projects/mes 2023-11-30 09:11:34 +08:00
4 changed files with 11 additions and 11 deletions
Showing only changes of commit 40b023cd8d - Show all commits

View File

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

View File

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

View File

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

View File

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