diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js index 638b069c..6c75636b 100644 --- a/src/mixins/lb/basicPageMixin.js +++ b/src/mixins/lb/basicPageMixin.js @@ -28,7 +28,7 @@ export default { // tableBtn: [], // 占位 // searchBarFormConfig: [], // 占位 // // 弹窗表单配置 - // dialogFormConfig: [], // + // dialogFormConfig: [], // updateUrl: '', addUrl: '', pageUrl: '', @@ -109,7 +109,9 @@ export default { } }, // 处理搜索栏按钮 - handleSearchBarBtnClick(btn) { + handleSearchBarBtnClick(btn) { + console.log(btn); + // const keys = ['name', 'createTime']; // timeVal // 已被 searchBarKeys 替代 switch (btn.btnName) { case 'search': diff --git a/src/views/equipment/base/inspection/Settings/add.vue b/src/views/equipment/base/inspection/Settings/add.vue index 0e73a809..093649b8 100644 --- a/src/views/equipment/base/inspection/Settings/add.vue +++ b/src/views/equipment/base/inspection/Settings/add.vue @@ -201,7 +201,7 @@ export default { this.groupOptions = res1.data.map((item) => { item.label = - item.name + ' - ' + getDictDataLabel('workshop', item.roomNameDict); + item.name + (getDictDataLabel('workshop', item.roomNameDict) ? ' - ' + getDictDataLabel('workshop', item.roomNameDict) : '') return item; }) || []; // const res = await getEquipmentAll() diff --git a/src/views/equipment/base/inspection/items/components/basic-page.js b/src/views/equipment/base/inspection/items/components/basic-page.js index d4aab025..44beb69e 100644 --- a/src/views/equipment/base/inspection/items/components/basic-page.js +++ b/src/views/equipment/base/inspection/items/components/basic-page.js @@ -29,9 +29,9 @@ export default { }, created() { }, - mounted() { - this.getDataList() - }, + // mounted() { + // this.getDataList() + // }, methods: { // 获取数据列表 getDataList() { diff --git a/src/views/equipment/base/inspection/items/index.vue b/src/views/equipment/base/inspection/items/index.vue index fbf01d64..3cfb1926 100644 --- a/src/views/equipment/base/inspection/items/index.vue +++ b/src/views/equipment/base/inspection/items/index.vue @@ -40,7 +40,7 @@ export default { const t = new Date(); const [y, m, d] = [t.getFullYear(), t.getMonth(), t.getDate()]; return { - searchBarKeys: ['equipmentName', 'createTime'], + searchBarKeys: ['equipmentTypeId'], equipmentTypeList:[], tableBtn: [ { @@ -125,7 +125,7 @@ export default { created() { this.initSearchBar() this.getList(); - }, + }, methods: { /** 查询列表 */ getList() { @@ -231,13 +231,14 @@ export default { return; } // 添加的提交 - this.post(this.form).then((response) => { + this.post(this.form).then((res) => { + console.log('res', res) this.$modal.msgSuccess('新增成功'); this.open = false; this.getList() this.showDetailVisible = true this.$nextTick(() => { - this.$refs.showDetail.init(this.form.equipmentTypeId) + this.$refs.showDetail.init(res.data) }) }); }); diff --git a/src/views/equipment/base/inspection/items/showDetail.vue b/src/views/equipment/base/inspection/items/showDetail.vue index 34d5e57f..d24939f6 100644 --- a/src/views/equipment/base/inspection/items/showDetail.vue +++ b/src/views/equipment/base/inspection/items/showDetail.vue @@ -100,9 +100,10 @@ export default { // console.log(this.tableData) }, getDataList(id) { + console.log(id) this.dataListLoading = true; this.queryParams.equipmentTypeId = id - console.log(id); + console.log(this.queryParams.equipmentTypeId) this.urlOptions.getDataListURL(this.queryParams).then(response => { this.tableData = response.data.list; this.listQuery.total = response.data.total; diff --git a/src/views/equipment/base/spareParts/List/index.vue b/src/views/equipment/base/spareParts/List/index.vue index 905c206c..05c26bfe 100644 --- a/src/views/equipment/base/spareParts/List/index.vue +++ b/src/views/equipment/base/spareParts/List/index.vue @@ -404,8 +404,8 @@ export default { .catch(() => {}); }, async getDict() { - const materRes = await getMaterialTree(); // - let typeId = materRes.data.find((item) => item.product === 2).id; + const materRes = await getMaterialTree(); + let typeId = materRes.data.find((item) => item.product === 2); const listQuery = { typeId: typeId, }; @@ -416,7 +416,8 @@ export default { ...item })); }, - updateDialogFormZ(val) { + updateDialogFormZ(val) { + // console.log(this.rows[0][0].options) const selectData = this.rows[0][0].options.find( (item) => item.id === val.productMaterialId );