mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

merge test

Browse Source
This commit is contained in:
lb
2023-11-17 10:00:04 +08:00
parent 23c1b4b3c6 88615a52a4
commit 6ef90a8eba
31 changed files with 227 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/extend/processEquMaterialBom/index.vue
View File

@@ -174,7 +174,7 @@ export default {
this.listQuery.pageSize = 10;
this.listQuery.equipmentId = val.equipmentId ? val.equipmentId : undefined;
this.listQuery.name = val.name ? val.name : undefined;
this.listQuery.name = val.name ? val.name : undefined;
this.listQuery.code = val.code ? val.code : undefined;
this.getDataList();
break;
case 'reset':

6
src/views/extend/processEquValueBom/index.vue
View File

@@ -96,7 +96,7 @@ export default {
},
{
type: 'input',
label: '物料配方名称',
label: '参数配方名称',
// selectOptions: [],
// labelField: 'name',
// valueField: 'id',
@@ -104,7 +104,7 @@ export default {
},
{
type: 'input',
label: '物料配方编码',
label: '参数配方编码',
// selectOptions: [],
// labelField: 'name',
// valueField: 'id',
@@ -174,7 +174,7 @@ export default {
this.listQuery.pageSize = 10;
this.listQuery.equipmentId = val.equipmentId ? val.equipmentId : undefined;
this.listQuery.name = val.name ? val.name : undefined;
this.listQuery.name = val.name ? val.name : undefined;
this.listQuery.code = val.code ? val.code : undefined;
this.getDataList();
break;
case 'reset':

9
src/views/extend/processFlowView/components/ProcessBomList.vue
View File

@@ -94,13 +94,6 @@ export default {
choosedEquipments: [],
searchBarFormConfig: [{ label: '工序下设备' }],
tableProps: [
// {
// prop: 'createTime',
// label: '添加时间',
// fixed: true,
// width: 180,
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
// },
{ prop: 'equipmentId', label: '设备名称' },
{ prop: 'materialName', label: '物料BOM' },
{ prop: 'valueName', label: '参数BOM' },
@@ -112,7 +105,7 @@ export default {
pageNo: 1,
pageSize: 10,
},
searchText: '',
searchText: ''
};
},
watch: {