Skip to content

P
patzn-cloud-web-back-soil
Commit aeea98a4 by lichengming
Options

修改了报告管理

parent 7222f770
Showing with 44 additions and 119 deletions
pages/soil-report-manage/report-audit/tabs/historyTask.vue
...@@ -10,25 +10,12 @@ ...@@ -10,25 +10,12 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="委托方:"> <Form-item class="search-item" label="委托商:">
<Input @on-enter="_formSearch" name="client" placeholder="请输入委托方" clearable /> <Input @on-enter="_formSearch" name="client" placeholder="请输入委托商" clearable />
</Form-item> </Form-item>
<Form-item class="search-item" label="委托编号:"> <Form-item class="search-item" label="委托编号:">
<Input @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable /> <Input @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable />
</Form-item> </Form-item>
<!-- <Form-item class="search-item" label="报检时间:">-->
<!-- <Date-picker-->
<!-- ref="sampleTime"-->
<!-- type="datetimerange"-->
<!-- placeholder="报检时间"-->
<!-- style="width: 100%;"-->
<!-- :editable="false"-->
<!-- transfer-->
<!-- @on-change="_labSampleTime"-->
<!-- />-->
<!-- <input type="hidden" name="inspectionDateBegin">-->
<!-- <input type="hidden" name="inspectionDateEnd">-->
<!-- </Form-item>-->
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary"> <Button @click="_formSearch" type="primary">
搜索 搜索
...@@ -36,59 +23,45 @@ ...@@ -36,59 +23,45 @@
</Form-item> </Form-item>
</Form> </Form>
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" show-search-btn="true" /> <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" style="height: 30px;" show-search-btn="true" />
</Col> </Col>
<Col span="24"> <Col span="24">
<element-table <PTVXETable
ref="pageTable" ref="pageTable"
:page-columns="pageColumns" :tableHeight="tableHeight"
:table-height="tableHeight" :getPage="getPage"
:get-page="getPage" :iconMsg="iconMsg"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange" select-data>
show-check-box <vxe-table-column
select-data v-for="item in pageColumns"
> :key="item.key"
<el-table-column :field="item.key"
v-for="item in pageColumns" :title="item.title"
:key="item.key" :min-width="100"
:prop="item.key" :width="item.width"
:label="item.title" :fixed="item.fixed?item.fixed:undefined"
:align="item.align" sortable
:width="item.width" >
:min-width="200" <template slot-scope="scope">
:fixed="item.fixed?item.fixed:undefined" <a @click.stop="_detailModal(scope.row.id,scope.row.type)"
show-overflow-tooltip v-if="item.detail">{{scope.row[item.key]}}</a>
sortable <div v-else-if="item.type">{{scope.row[item.key]?'政府':'企业'}}</div>
> <div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'): ''}}
<template slot-scope="scope" @click.stop="_handleIndex(scope)"> </div>
<span v-if="item.datetime"> <div v-else-if="item.key==='havePhoto'">{{scope.row[item.key]===1?'是':
{{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }} scope.row[item.key]===0?'否':''}}
</span> </div>
<div v-else-if="item.status"> <div v-else-if="item.status">
{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }} <span v-if="scope.row[item.key].display === '报告审核退回'||'报告签发退回' ===scope.row[item.key].display " style="color: red;">{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
</div> <span v-else>{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
<span v-else> </div>
{{ scope.row[item.key] }} <div v-else-if="item.judge">
</span> {{Number(scope.row[item.key]) === 0? '否':'是'}}
</template> </div>
</el-table-column> <div v-else>{{scope.row[item.key]}}</div>
<el-table-column </template>
slot="col" </vxe-table-column>
:width="120" </PTVXETable>
label="操作"
align="center"
fixed="right"
>
<template slot-scope="scope">
<icon-list
:msg="iconMsg"
:row-data="scope.row"
:row-index="scope.$index"
@on-result-change="_iconClick"
/>
</template>
</el-table-column>
</element-table>
</Col> </Col>
</Row> </Row>
<fileManage ref="FileManage" @on-result-change="_fileResult" /> <fileManage ref="FileManage" @on-result-change="_fileResult" />
...@@ -128,7 +101,6 @@ export default { ...@@ -128,7 +101,6 @@ export default {
btn: [ btn: [
// { id: 'env-report-make-submit', type: 'primary', name: '提交' }, // { id: 'env-report-make-submit', type: 'primary', name: '提交' },
// { id: '', type: 'primary', name: '生成' }, // { id: '', type: 'primary', name: '生成' },
{ id: 'ZBC', type: 'primary', name: '下载' }
], ],
getPage: {}, getPage: {},
searchOpen: false, searchOpen: false,
......
pages/soil-report-manage/report-make/tabs/ReportInfoMake.vue
...@@ -5,28 +5,6 @@ ...@@ -5,28 +5,6 @@
<div class="layout-content-main"> <div class="layout-content-main">
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24">
<Form :label-width="90" v-show="searchOpen" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="报告编号:">
<Input @on-enter="_formSearch" v-model="formObj.reportSn" placeholder="请输入报告编号" clearable/>
</Form-item>
<Form-item class="search-item" label="样品编号:">
<Input @on-enter="_formSearch" v-model="formObj.sampleNum" placeholder="请输入样品编号" clearable/>
</Form-item>
<Form-item class="search-item" label="样品名称:">
<Input @on-enter="_formSearch" v-model="formObj.sampleName" placeholder="请输入样品名称" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick"
class="contHide">
</btn-list>
</Col>
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
......
pages/soil-report-manage/report-make/tabs/ReportMakeBySample.vue
...@@ -8,11 +8,8 @@ ...@@ -8,11 +8,8 @@
<Col span="24"> <Col span="24">
<Form id="search-form-make-sample" :label-width="90" v-show="searchOpen" inline onsubmit="return false"> <Form id="search-form-make-sample" :label-width="90" v-show="searchOpen" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="样品编号:"> <Form-item class="search-item" label="试样编号:">
<Input @on-enter="_formSearch" v-model="formObj.num" placeholder="请输入样品编号" clearable/> <Input @on-enter="_formSearch" v-model="formObj.sampleCode" placeholder="请输入试样编号" clearable/>
</Form-item>
<Form-item class="search-item" label="样品名称:">
<Input @on-enter="_formSearch" v-model="formObj.name" placeholder="请输入样品名称" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
...@@ -129,18 +126,9 @@ export default { ...@@ -129,18 +126,9 @@ export default {
selectIds: [], selectIds: [],
selectData: [], selectData: [],
formObj: { formObj: {
entrustId: '', entrustId: undefined,
contractId: '', contractId: undefined,
num: '', sampleCode: undefined
name: '',
detectType: '',
taskSource: '',
onlyReportMake: 1,
reportDateBegin: '',
reportDateEnd: '',
reported: 0,
personal: 0,
dataPushed: ''
}, },
dateList: [], dateList: [],
type: '', type: '',
...@@ -196,20 +184,7 @@ export default { ...@@ -196,20 +184,7 @@ export default {
mounted() {}, mounted() {},
methods: { methods: {
// 初始化值 // 初始化值
_resetData(contractId, type, personal) {
this.formObj = this.$resetFields(this.formObj)
this.formObj.contractId = contractId
this.formObj.reported = 0
this.formObj.onlyReportMake = 1
this.formObj.personal = personal
this.type = type
this.dateList = []
},
// 当前列表有值，则不会重新调page接口 // 当前列表有值，则不会重新调page接口
_getPage(contractId, type, personal) {
this._resetData(contractId, type, personal)
this.getPage = this.$store.state.FoodSample.page
},
_reportDateChange(data) { _reportDateChange(data) {
this.formObj.reportDateBegin = data[0] this.formObj.reportDateBegin = data[0]
this.formObj.reportDateEnd = data[1] this.formObj.reportDateEnd = data[1]
......
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