diff --git a/src/api/orderIssure/soIssueNotify.js b/src/api/orderIssure/soIssueNotify.js index ed15e59..25615d0 100644 --- a/src/api/orderIssure/soIssueNotify.js +++ b/src/api/orderIssure/soIssueNotify.js @@ -40,3 +40,4 @@ export const getNoControlPartList= data => createAPI(`/orderIssure/issureNotify/ export const searchOtherPart= data => createAPI(`/orderIssure/issureNotify/searchOtherPart`,'post',data) export const searchNotifyLog= data => createAPI(`/orderIssure/issureNotify/searchNotifyLog`,'post',data) export const deleteNotifyMaterialWithOutLog= data => createAPI(`/orderIssure/issureNotify/deleteNotifyMaterialWithOutLog`,'post',data) +export const searchNotifyLogClose= data => createAPI(`/orderIssure/issureNotify/searchNotifyLogClose`,'post',data) diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue index 377f629..7eef102 100644 --- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue +++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue @@ -115,7 +115,7 @@ width="80" label="操作"> @@ -284,9 +284,66 @@ + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + 保存 + 关闭 + + @@ -301,6 +358,7 @@ ,updateNotifyStatus ,deleteNotifyMaterial ,searchNotifyLog + ,searchNotifyLogClose }from "@/api/orderIssure/soIssueNotify.js" import Chooselist from '@/views/modules/common/Chooselist' import {getEamWorkShop} from "@/api/factory/site.js"; @@ -324,7 +382,15 @@ dataList3: [], dataList4: [], dataList5: [], + dataList6: [], addOrUpdateVisible:false, + closeData:{ + site:'', + notifyNo:'', + closeRemark:'', + username:this.$store.state.user.name, + }, + closeModalFlag:false, searchData: { page: 1, limit: 100, @@ -1158,6 +1224,62 @@ columnWidth: 120 }, ], + columnList6:[ + { + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table6UserDisplay', + tableId: "701002Table6", + tableName: "申请单材料关闭明细", + columnProp: "userDisplay", + headerAlign: "center", + align: "left", + columnLabel: "操作人", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, + { + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table6ActionTime', + tableId: "701002Table6", + tableName: "申请单材料关闭明细", + columnProp: "actionTime", + headerAlign: "center", + align: "left", + columnLabel: "操作时间", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 130 + }, + { + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table6ActionRemark', + tableId: "701002Table6", + tableName: "申请单材料关闭明细", + columnProp: "actionRemark", + headerAlign: "center", + align: "left", + columnLabel: "关闭原因", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 300 + }, + ], favorite: false, dataRole: { partTypeDesc: [ @@ -1366,6 +1488,16 @@ this.dataList5 = []; } }); + }else if(this.activeName==='close'){ + searchNotifyLogClose(this.currentRow).then(({data}) => { + //区分请求成功和失败的状况 + if (data && data.code == 0) { + this.dataList6 = data.rows + + } else { + this.dataList6 = []; + } + }); }else { searchSumNotifyMaterialList(this.currentRow).then(({data}) => { //区分请求成功和失败的状况 @@ -1399,19 +1531,30 @@ } }); }, - closeNotify(row){ - this.$confirm('确认关闭?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { + closeNotifyModel(row){ + this.closeData.site=row.site + this.closeData.notifyNo=row.notifyNo + this.closeData.closeRemark='' + this.closeModalFlag=true + }, + closeNotify(){ + if(this.closeData.closeRemark==null||this.closeData.closeRemark===''){ + this.$alert("必须输入关闭原因", '错误', { + confirmButtonText: '确定' + }) + return false; + } + let inData={ - site:row.site, - notifyNo:row.notifyNo, + site:this.closeData.site, + notifyNo:this.closeData.notifyNo, + closeRemark:this.closeData.closeRemark, + username:this.$store.state.user.name, status:'已关闭', } updateNotifyStatus(inData).then(({data}) => { if (data && data.code === 0) { + this.closeModalFlag=false this.searchTable() this.$message({ message: '操作成功', @@ -1425,7 +1568,7 @@ }) } }) - }) + }, openNotify(row){ this.$confirm('确认打开?', '提示', {