Skip to content

P
patzn-cloud-web-back-soil
Commit 27071013 by wangweidong
Options

Merge remote-tracking branch 'origin/dev' into dev

parents b554ee29 eedf2d58
Showing with 161 additions and 249 deletions
api/soil/soil-sample.js
......@@ -21,7 +21,7 @@ export default {
http.delete('soil/v1/receive_location/?ids=' + data).then(res => res),
removeSampleFromLocation: data =>
http
.post('soil/v1/sample/remove_sample_from_location/?ids=' + data)
.post('soil/v1/sample/remove_sample_from_location/', data)
.then(res => res),
locationEdit: data =>
http.put('soil/v1/receive_location/' + data.id, data.obj).then(res => res),
......@@ -176,7 +176,7 @@ export default {
prepareCheckBack: data =>
http.post('soil/v1/sample/prepare_check_back', data).then(res => res),
sampleBringOut: data =>
http.post('soil/v1/sample/sample_bring_out?ids=' + data).then(res => res),
http.post('soil/v1/sample/sample_bring_out', data).then(res => res),
boxPage: data => http.post('soil/v1/box/page', data).then(res => res),
addBox: data => http.post('soil/v1/box/', data).then(res => res),
deleteBox: data => http.delete('soil/v1/box/?ids=' + data).then(res => res),
......
api/soil/soil-test.js
......@@ -78,6 +78,8 @@ export default {
pageSoilAppendix: data =>
http.post('soil/v1/appendix/page', data).then(res => res),
appendixDelete: data =>
http.delete('soil/v1/appendix/?ids=' + data).then(res => res),
pageTest: data =>
http.post('soil/v1/experiment/page_test', data).then(res => res),
pageCheck: data =>
......
components/file/photo-manage/PhotoList.vue
......@@ -228,7 +228,12 @@ export default {
this._page()
})
},
_page: async function() {
_page: async function(fileName) {
if (fileName) {
this.formObj.fileName = fileName
} else {
this.formObj.fileName = undefined
}
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterEntrust.attachmentPage(
this.urlData.pageUrl,
......
components/file/photo-manage/PhotoManageCont.vue
......@@ -222,7 +222,7 @@ export default {
},
// 搜索
_search() {
this.$refs.fileModal._page()
this.$refs.fileModal._page(this.fileName)
}
}
}
......
pages/meter-entrust/entrust-register/EntrustRegister.vue
......@@ -353,6 +353,7 @@ export default {
_editModal(edit, id) {
this.currentComponent = 'EntrustRegisterEdit'
if (edit) {
this.$refs.pageTable._showLoading()
// 编辑
this._getById(id)
} else {
......@@ -373,6 +374,9 @@ export default {
const result = await soilEntrust.getVOById(id)
if (result) {
this.$refs.refModal._openEdit(result)
this.$refs.pageTable._hideLoading()
} else {
this.$refs.pageTable._hideLoading()
}
},
_delete: async function(ids) {
......
pages/soil-report-manage/report-audit/tabs/historyTask.vue
......@@ -10,25 +10,12 @@
class="search-form"
>
<label class="label-sign" />
<Form-item class="search-item" label="委托方:">
<Input @on-enter="_formSearch" name="client" placeholder="请输入委托方" clearable />
<Form-item class="search-item" label="委托商:">
<Input @on-enter="_formSearch" name="client" placeholder="请输入委托商" clearable />
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable />
</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">
<Button @click="_formSearch" type="primary">
搜索
......@@ -36,59 +23,45 @@
</Form-item>
</Form>
<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 span="24">
<element-table
ref="pageTable"
:page-columns="pageColumns"
:table-height="tableHeight"
:get-page="getPage"
@on-result-change="_tableResultChange"
show-check-box
select-data
>
<el-table-column
v-for="item in pageColumns"
:key="item.key"
:prop="item.key"
:label="item.title"
:align="item.align"
:width="item.width"
:min-width="200"
:fixed="item.fixed?item.fixed:undefined"
show-overflow-tooltip
sortable
>
<template slot-scope="scope" @click.stop="_handleIndex(scope)">
<span v-if="item.datetime">
{{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }}
</span>
<div v-else-if="item.status">
{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}
</div>
<span v-else>
{{ scope.row[item.key] }}
</span>
</template>
</el-table-column>
<el-table-column
slot="col"
:width="120"
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>
<PTVXETable
ref="pageTable"
:tableHeight="tableHeight"
:getPage="getPage"
:iconMsg="iconMsg"
@on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
:field="item.key"
:title="item.title"
:min-width="100"
:width="item.width"
:fixed="item.fixed?item.fixed:undefined"
sortable
>
<template slot-scope="scope">
<a @click.stop="_detailModal(scope.row.id,scope.row.type)"
v-if="item.detail">{{scope.row[item.key]}}</a>
<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'): ''}}
</div>
<div v-else-if="item.key==='havePhoto'">{{scope.row[item.key]===1?'是':
scope.row[item.key]===0?'否':''}}
</div>
<div v-else-if="item.status">
<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>
<span v-else>{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
</div>
<div v-else-if="item.judge">
{{Number(scope.row[item.key]) === 0? '否':'是'}}
</div>
<div v-else>{{scope.row[item.key]}}</div>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
<fileManage ref="FileManage" @on-result-change="_fileResult" />
......@@ -128,7 +101,6 @@ export default {
btn: [
// { id: 'env-report-make-submit', type: 'primary', name: '提交' },
// { id: '', type: 'primary', name: '生成' },
{ id: 'ZBC', type: 'primary', name: '下载' }
],
getPage: {},
searchOpen: false,
......@@ -312,12 +284,7 @@ export default {
},
_uploadByIds(id) {
const tempData = {
id: id,
uploadFileUrl: '/v1/entrust_attachment/upload/',
downloadFileUrl: '/v1/entrust_attachment/download/'
}
this.$refs.FileManage._open(tempData, 'entrustId')
this.$refs.FileManage._open(id, 'entrustId')
},
// 文件返回的数据
_fileResult(msg, data) {
......
pages/soil-report-manage/report-audit/tabs/reportAudit.vue
......@@ -318,12 +318,7 @@ export default {
},
_uploadByIds(id) {
const tempData = {
id: id,
uploadFileUrl: '/v1/entrust_attachment/upload/',
downloadFileUrl: '/v1/entrust_attachment/download/'
}
this.$refs.FileManage._open(tempData, 'entrustId')
this.$refs.FileManage._open(id, 'entrustId')
},
// 文件返回的数据
_fileResult(msg, data) {
......
pages/soil-report-manage/report-issue/tabs/historyTask.vue
......@@ -36,62 +36,48 @@
</Form-item>
</Form>
<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>
<!-- <Button type="primary" @click="_submitReportCheck">-->
<!-- 提交-->
<!-- </Button>-->
<Col span="24">
<element-table
ref="pageTable"
:page-columns="pageColumns"
:table-height="tableHeight"
:get-page="getPage"
@on-result-change="_tableResultChange"
show-check-box
select-data
>
<el-table-column
v-for="item in pageColumns"
:key="item.key"
:prop="item.key"
:label="item.title"
:align="item.align"
:width="item.width"
:min-width="200"
:fixed="item.fixed?item.fixed:undefined"
show-overflow-tooltip
sortable
>
<template slot-scope="scope" @click.stop="_handleIndex(scope)">
<span v-if="item.datetime">
{{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }}
</span>
<div v-else-if="item.status">
{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}
</div>
<span v-else>
{{ scope.row[item.key] }}
</span>
</template>
</el-table-column>
<el-table-column
slot="col"
:width="120"
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>
<PTVXETable
ref="pageTable"
:tableHeight="tableHeight"
:getPage="getPage"
:iconMsg="iconMsg"
@on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
:field="item.key"
:title="item.title"
:min-width="100"
:width="item.width"
:fixed="item.fixed?item.fixed:undefined"
sortable
>
<template slot-scope="scope">
<a @click.stop="_detailModal(scope.row.id,scope.row.type)"
v-if="item.detail">{{scope.row[item.key]}}</a>
<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'): ''}}
</div>
<div v-else-if="item.key==='havePhoto'">{{scope.row[item.key]===1?'是':
scope.row[item.key]===0?'否':''}}
</div>
<div v-else-if="item.status">
<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>
<span v-else>{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
</div>
<div v-else-if="item.judge">
{{Number(scope.row[item.key]) === 0? '否':'是'}}
</div>
<div v-else>{{scope.row[item.key]}}</div>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
<fileManage ref="FileManage" @on-result-change="_fileResult" />
......@@ -131,7 +117,6 @@ export default {
btn: [
// { id: 'env-report-make-submit', type: 'primary', name: '提交' },
// { id: '', type: 'primary', name: '生成' },
{ id: 'ZBC', type: 'primary', name: '下载' }
],
getPage: {},
searchOpen: false,
......@@ -162,7 +147,7 @@ export default {
const result = await soilReport.pageReportIssueHis(data)
if (result) {
this.getPage = result
this.$refs.pageTable._initTable()
this.$refs.pageTable._hideLoading()
}
},
_clearPage() {
......@@ -337,12 +322,7 @@ export default {
},
_uploadByIds(id) {
const tempData = {
id: id,
uploadFileUrl: '/v1/entrust_attachment/upload/',
downloadFileUrl: '/v1/entrust_attachment/download/'
}
this.$refs.FileManage._open(tempData, 'entrustId')
this.$refs.FileManage._open(id, 'entrustId')
},
// 文件返回的数据
_fileResult(msg, data) {
......
pages/soil-report-manage/report-issue/tabs/reportIssue.vue
......@@ -352,12 +352,7 @@ export default {
},
_uploadByIds(id) {
const tempData = {
id: id,
uploadFileUrl: '/v1/entrust_attachment/upload/',
downloadFileUrl: '/v1/entrust_attachment/download/'
}
this.$refs.FileManage._open(tempData, 'entrustId')
this.$refs.FileManage._open(id, 'entrustId')
},
// 文件返回的数据
_fileResult(msg, data) {
......
pages/soil-report-manage/report-make/tabs/ReportInfoMake.vue
......@@ -5,28 +5,6 @@
<div class="layout-content-main">
<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">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
......
pages/soil-report-manage/report-make/tabs/ReportMakeBySample.vue
......@@ -8,11 +8,8 @@
<Col span="24">
<Form id="search-form-make-sample" :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.num" placeholder="请输入样品编号" clearable/>
</Form-item>
<Form-item class="search-item" label="样品名称:">
<Input @on-enter="_formSearch" v-model="formObj.name" placeholder="请输入样品名称" clearable/>
<Form-item class="search-item" label="试样编号:">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" placeholder="请输入试样编号" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -129,18 +126,9 @@ export default {
selectIds: [],
selectData: [],
formObj: {
entrustId: '',
contractId: '',
num: '',
name: '',
detectType: '',
taskSource: '',
onlyReportMake: 1,
reportDateBegin: '',
reportDateEnd: '',
reported: 0,
personal: 0,
dataPushed: ''
entrustId: undefined,
contractId: undefined,
sampleCode: undefined
},
dateList: [],
type: '',
......@@ -196,20 +184,7 @@ export default {
mounted() {},
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接口
_getPage(contractId, type, personal) {
this._resetData(contractId, type, personal)
this.getPage = this.$store.state.FoodSample.page
},
_reportDateChange(data) {
this.formObj.reportDateBegin = data[0]
this.formObj.reportDateEnd = data[1]
......
pages/soil-sample-manage/keep-address/AddressManage.vue
......@@ -251,7 +251,9 @@ export default {
},
_calloutOk() {
console.log(this.selectIds)
const result = soilSample.sampleBringOut(this.selectIds)
const result = soilSample.sampleBringOut({
ids: this.selectIds.join(',')
})
if (result) {
this.$Message.success('调出成功')
this._page()
......
pages/soil-sample-manage/sample-address/ViewLocationEntrust.vue
......@@ -11,11 +11,8 @@
<Col span="24">
<Form v-show="searchOpen" id="search-sample-company" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item label="试样编号:" class="search-item">
<Input v-model="formObj.sampleCode" placeholder="请输入试样编号" clearable @on-enter="_formSearch" />
</Form-item>
<Form-item label="现场编号:" class="search-item">
<Input v-model="formObj.siteNo" placeholder="请输入现场编号" clearable @on-enter="_formSearch" />
<Form-item label="委托编号:" class="search-item">
<Input v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch" />
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_page">
......
pages/soil-sample-manage/sample-address/ViewSample.vue
......@@ -68,11 +68,6 @@ export default {
currentComponent: '',
btn: [
{
type: 'success',
id: 'ZBC',
name: '打印标签'
},
{
type: 'error',
id: '',
name: '批量删除'
......@@ -237,7 +232,9 @@ export default {
}
},
_deleteOk: async function(ids) {
const result = await soilSample.removeSampleFromLocation(ids.join(','))
const result = await soilSample.removeSampleFromLocation({
ids: ids.join(',')
})
if (result) {
this.$Message.success('成功移除')
this._page()
......
pages/soil-sample-manage/sample-preparation/PrepareItemBatchEdit.vue
......@@ -98,6 +98,8 @@ export default {
_selTestBasis(msg, data) {
if (msg === 'select') {
this.formObj.testBasis = data.name
} else if (msg === 'query') {
this.formObj.testBasis = data.name
}
},
channelInputLimit(e) {
......@@ -168,6 +170,7 @@ export default {
this.showModal = true
this.formObj = this.$resetFields(this.formObj)
this.sampleUnit = ''
this.formObj.testBasis = ''
this.$refs.footerModal._hideLoading()
this.ids = data
// 循环遍历数据
......@@ -212,7 +215,7 @@ export default {
this.$refs.formObj.validate(valid => {
if (valid) {
console.log(this.formObj)
const tempData = this.formObj
const tempData = this.$serializeForm(this.formObj)
tempData.ids = this.ids.join(',')
this._saveInfo(tempData)
} else {
......
pages/soil-sample-manage/sample-preparation/SampleParpareBatchEdit.vue
......@@ -3,7 +3,7 @@
<Modal v-model="showModal" v-drag :mask-closable="false">
<p slot="header">填写制备信息</p>
<div>
<Form id="storage-location-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
<Form id="storage-location-form" :id="formId" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
<Form-item label="制备方式:" prop="prepareWay">
<el-select :value="formObj.prepareWay" @change="selPrepareWay" style="width:100%" size="small">
<el-option v-for="item in prepareWayList" :value="item.name" :key="item.name">{{ item.name }}
......@@ -63,6 +63,7 @@ export default {
showModal: false,
formObj: {},
ruleValidate: {},
formId: '',
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '保存', type: 'primary' }
......@@ -161,6 +162,7 @@ export default {
},
_open(data) {
this.showModal = true
this.formId = 'edit-form-batchEdit'
this.formObj = this.$resetFields(this.formObj)
this.sampleUnit = ''
this.$refs.footerModal._hideLoading()
......@@ -206,7 +208,8 @@ export default {
_ok() {
this.$refs.formObj.validate(valid => {
if (valid) {
this.$emit('on-result-change', this.formObj)
console.log('formObj', this.$serializeForm(this.formObj))
this.$emit('on-result-change', this.$serializeForm(this.formObj))
this.showModal = false
this.$refs.footerModal._hideLoading()
} else {
......
pages/soil-sample-manage/sample-preparation/SoilSampleItemManageEdit.vue
......@@ -591,6 +591,7 @@ export default {
this.$refs.pageTable._pageChange(1)
},
_pageByEntrustId: async function() {
this.selectIds = []
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj = this.$serializeForm(this.formObj)
this.formObj.entrustId = this.entrustId
......
pages/soil-sample-manage/sample-preparation/sample-preparation-record/RecordRightList.vue
......@@ -5,8 +5,8 @@
<Col span="24">
<Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="检测项目:">
<Input @on-enter="_formSearch" name="name" placeholder="请输入检测项目" clearable></Input>
<Form-item class="search-item" label="试样编号:">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......
pages/soil-sample-manage/sample-surplus-dispose/tab/SurplusDisposeManage.vue
......@@ -8,9 +8,6 @@
<Col span="24">
<Form id="search-form" :label-width="80" 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.entrustCode" name="entrustCode" placeholder="请输入样品编号" clearable/>
</Form-item>
<Form-item class="search-item" label="试样编号:">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品名称" clearable/>
</Form-item>
......
pages/soil-test-manage/test-data-audit/IndexManage.vue
......@@ -34,7 +34,7 @@
</template>
<script>
import { soilAptitude, soilTest } from '../../../api'
import { soilTest } from '../../../api'
import IndexManageEdit from './IndexManageEdit'
export default {
......@@ -151,9 +151,9 @@ export default {
}
},
_delOk: async function(ids) {
const result = await soilAptitude.expItemDeleteByIds(ids)
const result = await soilTest.itemDelete(ids)
if (result) {
this.$message.success('删除成功')
this.$Message.success('删除成功')
this._page()
}
}
......
pages/soil-test-manage/test-data-check/IndexManage.vue
......@@ -34,7 +34,7 @@
</template>
<script>
import { soilAptitude, soilTest } from '../../../api'
import { soilTest } from '../../../api'
import IndexManageEdit from './IndexManageEdit'
export default {
......@@ -151,9 +151,9 @@ export default {
}
},
_delOk: async function(ids) {
const result = await soilAptitude.expItemDeleteByIds(ids)
const result = await soilTest.itemDelete(ids)
if (result) {
this.$message.success('删除成功')
this.$Message.success('删除成功')
this._page()
}
}
......
pages/soil-test-manage/test-input/ItemReportView.vue
......@@ -5,11 +5,8 @@
<Col span="24">
<Form :label-width="80" v-show="searchOpen" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="模板名称:">
<Input v-model="formObj.title" @on-enter="_formSearch" placeholder="请输入模板名称" clearable></Input>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" placeholder="请输入委托编号" clearable></Input>
<Form-item class="search-item" label="项目名称:">
<Input v-model="formObj.expName" @on-enter="_formSearch" placeholder="请输入项目名称" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -86,7 +83,8 @@ export default {
{ title: '创建时间', key: 'ctime', dateTime: true }
],
formObj: {
entrustId: ''
entrustId: '',
expName: undefined
},
searchOpen: false
}
......
pages/soil-test-manage/test-input/SoilAppendix.vue
......@@ -68,20 +68,10 @@ export default {
selectIds: [],
iconMsg: [
{
type: 'md-create',
id: '',
name: '编辑'
},
{
type: 'ios-book',
id: '',
name: '查看附录'
},
{
type: 'ios-list',
id: '',
name: '查看试验项目'
},
{ type: 'md-trash', id: '', name: '删除' }
],
pageColumns: [
......@@ -267,7 +257,7 @@ export default {
})
},
_deleteOk: async function(ids) {
const result = await soilTest.deleteRecord(ids)
const result = await soilTest.appendixDelete(ids)
if (result) {
this.$Message.success('删除成功')
this._page()
......
pages/soil-test-manage/test-input/TestInput.vue
......@@ -60,6 +60,7 @@
</div>
</div>
<keep-alive>
<!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
</keep-alive>
</div>
......@@ -70,6 +71,7 @@ import { soilTest } from '../../../api'
import Operation from '../../../components/operation/Operation'
import SampleManage from './SampleManage'
export default {
// eslint-disable-next-line vue/no-unused-components
components: { UserInfo, Operation, SampleManage },
data() {
return {
......
pages/soil-test-manage/test-input/TestInputIndex.vue
......@@ -7,6 +7,7 @@
<el-tab-pane label="录入历史" name="queryTabs"></el-tab-pane>
</el-tabs>
<keep-alive>
<!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent"></component>
</keep-alive>
</div>
......
pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue
......@@ -353,6 +353,7 @@ export default {
if (result) {
this.$Message.success('添加成功')
this.$refs.pageTable._hideLoading()
this._page()
} else {
this.$refs.pageTable._hideLoading()
}
......
pages/soil-test-manage/test-input/sample-tabs/SampleLeftList.vue
......@@ -5,8 +5,8 @@
<Col span="24">
<Form id="task-assign-sample-left" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
<Form-item class="search-item" label="样品编号:">
<Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -51,7 +51,8 @@ export default {
return {
currentComponent: '',
formObj: {
entrustId: undefined
entrustId: undefined,
sampleCode: undefined
},
entrustId: '',
tableName: 'food-task-assign-item-left',
......
pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue
......@@ -8,9 +8,6 @@
<Form-item class="search-item" label="试验项目:">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验项目" clearable></Input>
</Form-item>
<Form-item class="search-item" label="试样编号:">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
......@@ -294,6 +291,7 @@ export default {
if (result) {
this.$Message.success('添加成功')
this.$refs.pageTable._hideLoading()
this._page()
} else {
this.$refs.pageTable._hideLoading()
}
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/SampleManage.vue
......@@ -68,13 +68,17 @@ export default {
// this._issuedPage()
} else if (tab.name === 'waitReceive') {
// this._waitPage()
this.$refs.waitScanModal._clearTable()
this.$refs.waitReceiveModal._open(this.entrustId)
} else if (tab.name === 'waitScan') {
this.$refs.waitReceiveModal._clearTable()
this.$refs.waitScanModal._open(this.entrustId)
// this._waitSend()
}
},
_search() {
this.$refs.waitScanModal._clearTable()
this.$refs.waitReceiveModal._clearTable()
this.$emit('on-result-change')
},
// 关闭弹框的时候刷新上个界面
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/item-tabs/ItemRightList.vue
......@@ -170,6 +170,10 @@ export default {
this.formObj.sampleCode = ''
this.getPage = {}
},
_clearAll() {
this.getPage.records = []
this.selectIds = []
},
_modalResult(data) {
switch (this.currentComponent) {
case 'AssignPerson':
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/item-tabs/ItemTabs.vue
......@@ -40,6 +40,9 @@ export default {
console.log(id)
this.$refs.leftModal._open(this.id)
// this.$refs.rightModal._getColumn()
},
_clearTable() {
this.$refs.rightModal._clearAll()
}
}
}
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/sample-tabs/SampleRightList.vue
......@@ -318,6 +318,10 @@ export default {
this._page()
}
},
_clearAll() {
this.getPage.records = []
this.selectIds = []
},
_refresh() {
this.$emit('on-result-change')
},
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/sample-tabs/SampleTabs.vue
......@@ -35,6 +35,9 @@ export default {
_open(id) {
this.$refs.SampleleftModal._open(id)
// this.$refs.rightModal._getColumn()
},
_clearTable() {
this.$refs.SamplerightModal._clearAll()
}
}
}
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/SampleManage.vue
......@@ -78,6 +78,8 @@ export default {
}
},
_search() {
this.$refs.waitScanModal._clearTab()
this.$refs.waitReceiveModal._clearTab()
this.$emit('on-result-change')
},
// 关闭弹框的时候刷新上个界面
......
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