|
|
|
@ -115,7 +115,7 @@ |
|
|
|
width="80" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotify(scope.row)">关闭</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotifyModel(scope.row)">关闭</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='已关闭'" @click="openNotify(scope.row)">开启</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -284,9 +284,66 @@ |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="关闭记录" name="close"> |
|
|
|
<el-table |
|
|
|
:data="dataList6" |
|
|
|
:height="height" |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%; "> |
|
|
|
<!-- <el-table-column--> |
|
|
|
<!-- header-align="center"--> |
|
|
|
<!-- align="center"--> |
|
|
|
<!-- width="80"--> |
|
|
|
<!-- fixed="left"--> |
|
|
|
<!-- label="操作">--> |
|
|
|
<!-- <template slot-scope="scope">--> |
|
|
|
<!-- <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>--> |
|
|
|
<!-- </template>--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in columnList6" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
:prop="item.columnProp" |
|
|
|
:header-align="item.headerAlign" |
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
:align="item.align" |
|
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
|
:min-width="item.columnWidth" |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" |
|
|
|
style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-tab-pane> |
|
|
|
</el-tabs> |
|
|
|
|
|
|
|
|
|
|
|
<el-dialog title="关闭原因" :close-on-click-modal="false" v-drag :visible.sync="closeModalFlag" width="450px"> |
|
|
|
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"> |
|
|
|
<el-row :gutter="20"> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-form-item > |
|
|
|
<el-input |
|
|
|
type="textarea" |
|
|
|
v-model="closeData.closeRemark " |
|
|
|
:rows="3" |
|
|
|
resize='none' |
|
|
|
maxlength="200" |
|
|
|
show-word-limit |
|
|
|
style="height: 60px" > |
|
|
|
</el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:40px;margin-top: 60px;text-align:center"> |
|
|
|
<el-button type="primary" @click="closeNotify()">保存</el-button> |
|
|
|
<el-button type="primary" @click="closeModalFlag=false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
@ -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('确认打开?', '提示', { |
|
|
|
|
