diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index 94ebf99..d4ea3c3 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -24,3 +24,6 @@ export const searchBMPropertiesValue= data => createAPI(`/technicalSpecification export const saveBMPropertiesValue= data => createAPI(`/technicalSpecification/saveBMPropertiesValue`,'post',data) export const refreshBMPageModal= data => createAPI(`/technicalSpecification/refreshBMPageModal`,'post',data) export const getBMPageBase= data => createAPI(`/technicalSpecification/getBMPageBase`,'post',data) +export const saveBMRoute= data => createAPI(`/technicalSpecification/saveBMRoute`,'post',data) +export const searchBMRoute= data => createAPI(`/technicalSpecification/searchBMRoute`,'post',data) +export const deleteBMRoute= data => createAPI(`/technicalSpecification/deleteBMRoute`,'post',data) diff --git a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue index 2c36ede..4ad113d 100644 --- a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue +++ b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue @@ -7,6 +7,16 @@ + + + + + + + + + + @@ -345,6 +355,7 @@ site: this.$store.state.user.site, codeNo: '', codeDesc: '', + buNo:'', active:'Y', functionType:'', page: 1, @@ -436,6 +447,23 @@ status: true, fixed: '', }, + { + userId: this.$store.state.user.name, + functionId: 100003001, + serialNumber: '100003001TableActive', + tableId: "100003001Table", + tableName: "BM模板表", + columnProp: 'active', + headerAlign: "center", + align: "center", + columnLabel: '是否启用', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, ], detailModelFlag:false, diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue index 6561649..a91e367 100644 --- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue +++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue @@ -59,12 +59,10 @@ -
- + {{'确定'}} {{'关闭'}} - -
+
- - + + + + + + + + 更新模板 刷新数据 保存数据 @@ -16,16 +22,26 @@ prop="propertiesItemNo" header-align="center" align="left" - width="100" + width="150" label="属性编码"> + + +
- +
@@ -141,10 +141,10 @@ - + 刷新 - 新增 + 新增 - - - - - - + label="工序号"> - - + min-width="200" + label="工序名称"> + + + + + + + - + - - 800料号 - + + - - - - - + + - - - - - - - - - - - - - - - - 保存 - 取消 + + 保存 + 取消 - - - - - - - - - - - - 查询 - - - - - - - - - - - - - - -
- 取消 -
- - { - this.partList = data.rows; - - }); - }, - newData(){ - this.dataForm={ - addId:0, - site: this.searchData.site, + newRoute(){ + let number=10; + for (let i = 0; i { - saveBMBom(this.dataForm).then(({data}) => { + saveBMRoute(this.routingData).then(({data}) => { if (data && data.code === 0) { this.searchTable(); - this.bomFlag=false + this.routeFlag=false this.$message.success( '操作成功') } else { this.$message.error(data.msg) } }) }).catch(() => { - return + }) }, - erpPartModel(){ - if(this.dataForm.addId==1){ - return false - } - this.partSearchData={ - site:this.searchData.site, - erpPartNo:'', - familyId:'', - partDesc:'', - } - this.searchPartData(); - this.partModelFlag=true; - }, - choosePart(row){ - this.dataForm.erpPartNo=row.erpPartNo - this.dataForm.familyId=row.familyId - this.dataForm.familyName=row.familyName - this.dataForm.partDesc=row.partDesc - this.dataForm.spec=row.spec - this.partModelFlag=false; - }, + + //初始化组件的参数 init(inData) { if(this.dataForm.codeNo!=null&&this.dataForm.codeNo!=''){ @@ -548,7 +421,7 @@ }, searchTable(){ - if(this.searchData.buNo!='DBE'){ + if(this.searchData.buNo==='RDC'){ searchBMRoutingDetail(this.searchData).then(({data}) => { if(data.rows.length>0){ this.dataForm=data.rows[0] @@ -584,22 +457,21 @@ }) }else { - searchBMBom(this.searchData).then(({data}) => { + searchBMRoute(this.searchData).then(({data}) => { this.tableData = data.rows; }); } }, deleteData(row){ - this.$confirm(`是否删除这条代理商信息?`, '提示', { + this.$confirm(`是否删除这条信息?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - deleteBMBom(row).then(({data}) => { + deleteBMRoute(row).then(({data}) => { if (data && data.code === 0) { this.searchTable(); - this.bomFlag=false this.$message({ message: '操作成功', type: 'success', @@ -668,6 +540,7 @@ this.dataForm.peEngineerList=JSON.parse(JSON.stringify(this.peEngineerList)); this.peEngineerFlag=false }, + cqeModal(){ if(this.ifDisableFlag){ return false diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue index 71ffd23..644b290 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue @@ -1,19 +1,19 @@