diff --git a/src/views/modules/eam/eamMaintenanceItem.vue b/src/views/modules/eam/eamMaintenanceItem.vue index d2c6d20..66b85d3 100644 --- a/src/views/modules/eam/eamMaintenanceItem.vue +++ b/src/views/modules/eam/eamMaintenanceItem.vue @@ -31,6 +31,7 @@ + @@ -65,6 +66,18 @@ + + + + + @@ -215,8 +228,13 @@ itemNo: '', itemDesc: '', itemType:'B', + page: 1, + limit: 10, }, height: 200, + pageIndex: 1, + pageSize: 100, + totalPage: 0, dataList: [], chooseTableData:[], @@ -507,11 +525,19 @@ methods: { // 获取数据列表 getDataList () { + this.searchData.limit = this.pageSize + this.searchData.page = this.pageIndex eamPropertiesItemSearch(this.searchData).then(({data}) => { - this.dataList = data.rows + if (data.code === 0) { + this.dataList = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + } + this.dataListLoading = false }) }, -//导出excel + //导出excel async createExportData() { await eamPropertiesItemSearch(this.searchData).then(({data}) => { this.exportList= data.rows; diff --git a/src/views/modules/eam/eamMaintenanceModel.vue b/src/views/modules/eam/eamMaintenanceModel.vue index 43b86e5..1c9196c 100644 --- a/src/views/modules/eam/eamMaintenanceModel.vue +++ b/src/views/modules/eam/eamMaintenanceModel.vue @@ -81,7 +81,7 @@ :min-width="item.columnWidth" :label="item.columnLabel"> @@ -137,8 +137,8 @@ - 新增 - 快速新增 + + 新增 - +
- 维保模板编码： - 维保模板名称： + + + + + + + + + + + 查询 + +
- - + + 可选项目： + + - -
+ +
添加>>
-
+
删除<<
- + 已有项目： + + @@ -763,17 +788,10 @@ functionId: this.$route.meta.menuId, } if (this.favorite) { - // 取消收藏 - // this.$confirm(`确定取消收藏`, '提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // type: 'warning' - // }).then(() => { - removeUserFavorite(userFavorite).then(({data}) => { - this.$message.success(data.msg) - this.favorite = false - }) - // }) + removeUserFavorite(userFavorite).then(({data}) => { + this.$message.success(data.msg) + this.favorite = false + }) } else { // 收藏 saveUserFavorite(userFavorite).then(({data}) => { @@ -970,12 +988,12 @@ //打开项目清单 detailModal(row){ - this.detailData.codeNo=row.codeNo - this.detailData.codeDesc=row.codeDesc + this.detailData.codeNo = row.codeNo + this.detailData.codeDesc = row.codeDesc searchModalDetails(this.detailData).then(({data}) => { this.detailList = data.rows }) - this.detailModelFlag=true; + this.detailModelFlag = true; }, addDetailModal(){ @@ -1064,14 +1082,21 @@ }, //---------快速添加---------- + queryTemplateItem(){ + getItemLists(this.detailData).then(({data}) => { + this.itemList1 = data.row1; + this.itemList2 = data.row2; + }) + }, + addFastModal(){ - this.itemListRow2=null - this.itemListRow1=null + this.itemListRow2 = null + this.itemListRow1 = null getItemLists(this.detailData).then(({data}) => { - this.itemList1=data.row1; - this.itemList2=data.row2; + this.itemList1 = data.row1; + this.itemList2 = data.row2; }) - this.fastAddFlag=true; + this.fastAddFlag = true; }, // 可选项目 itemClickRow1(row){ @@ -1103,7 +1128,7 @@ }) return false; } - let inData={ + let inData = { codeNo: this.detailData.codeNo, codeDesc: this.detailData.codeDesc, functionType: this.detailData.functionType, @@ -1114,7 +1139,7 @@ userId: this.$store.state.user.name } saveModalDetails(inData).then(({data}) => { - if (data && data.code == 0) { + if (data && data.code === 0) { getItemLists(this.detailData).then(({data}) => { this.itemList1 = data.row1; this.itemList2 = data.row2; diff --git a/src/views/modules/eam/eamPropertiesItem.vue b/src/views/modules/eam/eamPropertiesItem.vue index 4e1e619..8011e41 100644 --- a/src/views/modules/eam/eamPropertiesItem.vue +++ b/src/views/modules/eam/eamPropertiesItem.vue @@ -5,16 +5,16 @@
- + - + - + - + 查询 - 新增 + 新增 + @@ -65,6 +66,18 @@ + + + + + @@ -216,8 +229,13 @@ itemNo: '', itemDesc: '', itemType:'A', + page: 1, + limit: 10, }, height: 200, + pageIndex: 1, + pageSize: 100, + totalPage: 0, dataList: [], chooseTableData:[], dataListLoading: false, @@ -505,22 +523,29 @@ this.getDataList() }, methods: { + // 每页数 + sizeChangeHandle (val) { + this.pageSize = val + this.pageIndex = 1 + this.getDataList() + }, + // 当前页 + currentChangeHandle (val) { + this.pageIndex = val + this.getDataList() + }, // 校验用户是否收藏 favoriteIsOk() { let userFavorite = { userId: this.$store.state.user.id, languageCode: this.$i18n.locale } - console.log(this.$route.meta.menuId) userFavoriteList(userFavorite).then(({data}) => { for (let i = 0; i < data.list.length; i++) { - // let flag=false; if(this.$route.meta.menuId==data.list[i].menuId){ this.favorite = true - // flag=true; } } - }) }, // 收藏 OR 取消收藏 @@ -574,8 +599,16 @@ // 导出 end // 获取数据列表 getDataList () { + this.searchData.limit = this.pageSize + this.searchData.page = this.pageIndex eamPropertiesItemSearch(this.searchData).then(({data}) => { - this.dataList = data.rows + if (data.code === 0) { + this.dataList = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + } + this.dataListLoading = false }) }, diff --git a/src/views/modules/eam/eamPropertiesModel.vue b/src/views/modules/eam/eamPropertiesModel.vue index 6fd97ed..bb31672 100644 --- a/src/views/modules/eam/eamPropertiesModel.vue +++ b/src/views/modules/eam/eamPropertiesModel.vue @@ -81,7 +81,7 @@ :min-width="item.columnWidth" :label="item.columnLabel"> @@ -137,8 +137,8 @@ - 新增 - 快速新增 + + 新增 @@ -170,7 +170,7 @@ label="操作"> @@ -179,30 +179,41 @@ - - - - 点检项目编码 - - - - - - - - 保存 - 关闭 - - + + + + + + + + + + + + + + + - +
- 点检模板编码： - 点检模板名称： + + + + + + + + + + + 查询 + +
- - - 可选项目： + + + 可选项目： + + - -
+ +
添加>>
-
+
删除<<
- - 已有项目： + + 已有项目： + + @@ -390,7 +415,7 @@ pageIndex: 1, pageSize: 100, totalPage: 0, - addDetailModalFlag:false, + // addDetailModalFlag:false, modalFlag:false, modalDisableFlag:false, modalData:{ @@ -846,6 +871,7 @@ this.pageIndex = val this.getDataList() }, + addModal(){ this.modalData={ flag:'1', @@ -860,6 +886,7 @@ this.modalDisableFlag=false; this.modalFlag=true; }, + updateModal(row){ this.modalData={ flag:'2', @@ -873,13 +900,13 @@ this.modalDisableFlag=true; this.modalFlag=true; }, + // 删除 deletePropertiesModel (row) { this.$confirm(`是否删除这个点检模板?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' - }).then(() => { eamPropertiesModelDelete(row).then(({data}) => { if (data && data.code === 0) { @@ -900,6 +927,7 @@ }).catch(() => { }) }, + saveData(){ if (this.modalData.codeNo == '' || this.modalData.codeNo == null) { this.$alert('请输入点检模板编码！', '错误', { @@ -967,40 +995,40 @@ this.detailModelFlag = true; }, - addDetailModal(){ - this.detailData.itemNo = ''; - this.detailData.itemDesc = ''; - this.addDetailModalFlag = true; - }, + // addDetailModal(){ + // this.detailData.itemNo = ''; + // this.detailData.itemDesc = ''; + // this.addDetailModalFlag = true; + // }, //保存项目明细 - saveModalDetails(){ - if(this.detailData.itemNo==""||this.detailData.itemNo==null){ - this.$alert('请选择点检项目编码！', '错误', { - confirmButtonText: '确定' - }) - return false - } - saveModalDetails(this.detailData).then(({data}) => { - if (data && data.code == 0) { - searchModalDetails(this.detailData).then(({data}) => { - this.detailList = data.rows - }) - this.addDetailModalFlag=false; - this.$message({ - message: '操作成功', - type: 'success', - duration: 1500, - onClose: () => { - } - }) - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }) + // saveModalDetails(){ + // if(this.detailData.itemNo==""||this.detailData.itemNo==null){ + // this.$alert('请选择点检项目编码！', '错误', { + // confirmButtonText: '确定' + // }) + // return false + // } + // saveModalDetails(this.detailData).then(({data}) => { + // if (data && data.code == 0) { + // searchModalDetails(this.detailData).then(({data}) => { + // this.detailList = data.rows + // }) + // this.addDetailModalFlag=false; + // this.$message({ + // message: '操作成功', + // type: 'success', + // duration: 1500, + // onClose: () => { + // } + // }) + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, - }, itemNoBlur(){ let inData={ itemType:'A', @@ -1014,12 +1042,12 @@ } }) }, + deleteModalDetails(row){ this.$confirm(`是否删除这个点检项目?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' - }).then(() => { deleteModalDetails(row).then(({data}) => { if (data && data.code === 0) { @@ -1053,12 +1081,20 @@ this.chooseModalFlag=true; }, //---------快速添加---------- + + queryTemplateItem(){ + getItemLists(this.detailData).then(({data}) => { + this.itemList1 = data.row1; + this.itemList2 = data.row2; + }) + }, + addFastModal(){ this.itemSelections1 = null this.itemSelections2 = null getItemLists(this.detailData).then(({data}) => { - this.itemList1 = data.row1; - this.itemList2 = data.row2; + this.itemList1 = data.row1; + this.itemList2 = data.row2; }) this.fastAddFlag = true; }, @@ -1073,12 +1109,6 @@ selectFlag(){ return true; }, - // clickItem1(row){ - // this.itemListRow1 = JSON.parse(JSON.stringify(row)); - // }, - // clickItem2(row){ - // this.itemListRow2 = JSON.parse(JSON.stringify(row)); - // }, selectionItem1(val){ this.itemSelections1 = val }, diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index d762d42..4883034 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -1113,6 +1113,7 @@ }) } }, + //打开物料模板清单 detailModal(row){ this.detailData.partNo = row.partNo @@ -1123,12 +1124,14 @@ }) this.detailModelFlag = true; }, + checkInspectionType(){ getPartTemplateLists(this.detailData).then(({data}) => { this.itemList1 = data.row1; this.itemList2 = data.row2; }) }, + // 快速新增 addFastModal(){ this.itemSelections1 = null diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue index 1f0f88d..eba5f36 100644 --- a/src/views/modules/qc/qcTemplate.vue +++ b/src/views/modules/qc/qcTemplate.vue @@ -312,7 +312,7 @@ - +
@@ -347,14 +347,14 @@ prop="itemNo" header-align="center" align="center" - min-width="110" + min-width="80" label="项目编码"> @@ -390,15 +390,15 @@ prop="itemNo" header-align="center" align="center" - min-width="110" - label="明细编码"> + min-width="80" + label="项目编码"> + min-width="230" + label="项目名称">