Commit 80dccefa by lichengming

修改了报告审核报告签发

parent d0f578f6
<template> <template>
<div> <div>
<!--内容--> <!--内容-->
<Modal v-model="showModal" :width="100" class="modal-footer-none modal-top-0"> <Modal v-model="showModal" :width="100" @on-visible-change="_visibleChange" class="modal-footer-none modal-top-0">
<p slot="header">{{modalTitle}}</p> <p slot="header">{{modalTitle}}</p>
<div> <div>
<el-tabs v-model="activeName" @tab-click="_changeTabs"> <el-tabs v-model="activeName" @tab-click="_changeTabs">
...@@ -103,6 +103,9 @@ export default { ...@@ -103,6 +103,9 @@ export default {
this._summary() this._summary()
break break
} }
},
_visibleChange() {
this.$emit('on-result-change')
} }
// _sampleTabResult(msg) { // _sampleTabResult(msg) {
// if (msg === 'changeTab') { // if (msg === 'changeTab') {
......
...@@ -276,6 +276,8 @@ export default { ...@@ -276,6 +276,8 @@ export default {
this._page() this._page()
}, },
_page: async function() { _page: async function() {
this.selectData = []
this.selectIds = []
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilTest.pageSummaryCheck( const result = await soilTest.pageSummaryCheck(
this.$serializeForm(this.formObj) this.$serializeForm(this.formObj)
......
...@@ -60,18 +60,20 @@ ...@@ -60,18 +60,20 @@
style="width:400px"> style="width:400px">
</DatePicker> </DatePicker>
</Modal> </Modal>
<Reason ref="reasonModal" @on-result-change="_reasonResult" ></Reason>
</div> </div>
</template> </template>
<script> <script>
import http from '../../../api/http' import http from '../../../api/http'
import { soilReport, soilStatistics, soilTest } from '../../../api' import { soilReport, soilSample, soilStatistics, soilTest } from '../../../api'
import Global from '../../../api/config' import Global from '../../../api/config'
import Reason from '../../../components/base/Reason'
/** /**
* 报告编制的-待办-报告台账 * 报告编制的-待办-报告台账
*/ */
export default { export default {
components: {}, components: { Reason },
data() { data() {
return { return {
notOkCountList: [ notOkCountList: [
...@@ -92,6 +94,11 @@ export default { ...@@ -92,6 +94,11 @@ export default {
type: 'primary', type: 'primary',
id: '', id: '',
name: '提交' name: '提交'
},
{
type: 'primary',
id: '',
name: '退回'
} }
], ],
selectIds: [], selectIds: [],
...@@ -300,12 +307,39 @@ export default { ...@@ -300,12 +307,39 @@ export default {
case '提交': case '提交':
this._submit() this._submit()
break break
case '退回':
this._goBack()
break
case 'search': case 'search':
this.searchOpen = !this.searchOpen this.searchOpen = !this.searchOpen
break break
} }
}) })
}, },
_goBack() {
// 退回
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条委托!')
} else {
this.$refs.reasonModal._open('退回原因')
}
},
_reasonResult(data) {
if (undefined !== data && data !== '') {
this._reportCheckBack(data)
}
},
_reportCheckBack: async function(data) {
const result = await soilSample.reportIssueBack({
ids: this.selectIds,
remark: data
})
if (result) {
this.$Message.success('退回成功!')
await this._page()
}
},
// 选择审核人 // 选择审核人
_selectAuditor() { _selectAuditor() {
if (this.selectIds.length === 0) { if (this.selectIds.length === 0) {
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</Form-item> </Form-item>
</Form> </Form>
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" /> <btn-list :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" />
</Col> </Col>
<!-- <Col span="24">--> <!-- <Col span="24">-->
<!-- &lt;!&ndash; <Button type="primary" @click="_submitReportCheck">&ndash;&gt;--> <!-- &lt;!&ndash; <Button type="primary" @click="_submitReportCheck">&ndash;&gt;-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment