Commit bd65a63e by lichengming

修改了开土制备历史的制备详情按钮

parent becc6221
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24"> <Col span="24">
<Form v-show="searchOpen" id="search-sample-company" :label-width="80" inline onsubmit="return false"> <Form id="search-sample-company" v-show="searchOpen" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item label="样品编号:" class="search-item"> <Form-item label="样品编号:" class="search-item">
<Input v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable />
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_page"> <Button @click="_page" type="primary">
搜索 搜索
</Button> </Button>
</Form-item> </Form-item>
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
</Col> </Col>
<!--操作--> <!--操作-->
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" class="contHide" show-search-btn="true" @on-result-change="_btnClick"></btn-list> <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
</Col> </Col>
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange"> :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</Modal> </Modal>
<SoilSampleItemManage ref="sampleItemManage" @on-result-change="_page"></SoilSampleItemManage> <SoilSampleItemManage ref="sampleItemManage" @on-result-change="_page"></SoilSampleItemManage>
<DescribeDetailModal ref="writeDetailModal" @on-result-change="_page"></DescribeDetailModal> <DescribeDetailModal ref="writeDetailModal" @on-result-change="_page"></DescribeDetailModal>
<PreparationModal ref="preModal" @on-result-change="_page"></PreparationModal> <PreparationHis ref="preHisModal" @on-result-change="_page"></PreparationHis>
</div> </div>
</template> </template>
<script> <script>
...@@ -70,10 +70,14 @@ import { soilEntrust } from '../../api' ...@@ -70,10 +70,14 @@ import { soilEntrust } from '../../api'
import { getLodop } from '../../plugins/clodop/LodopFuncs' import { getLodop } from '../../plugins/clodop/LodopFuncs'
import SoilSampleItemManage from './SoilSampleItemManageHis' import SoilSampleItemManage from './SoilSampleItemManageHis'
import DescribeDetailModal from './sample-preparation/DescribeDetailModal' import DescribeDetailModal from './sample-preparation/DescribeDetailModal'
import PreparationModal from './sample-preparation/Preparation' import PreparationHis from './sample-preparation/PreparationHis'
let LODOP let LODOP
export default { export default {
components: { SoilSampleItemManage, DescribeDetailModal, PreparationModal }, components: {
SoilSampleItemManage,
DescribeDetailModal,
PreparationHis
},
data() { data() {
return { return {
formId: 'soilSampleManage', formId: 'soilSampleManage',
...@@ -93,6 +97,11 @@ export default { ...@@ -93,6 +97,11 @@ export default {
], ],
iconMsg: [ iconMsg: [
{ {
type: 'ios-paper',
id: '',
name: '制备详情'
},
{
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: '',
name: '管理检测项目' name: '管理检测项目'
...@@ -284,6 +293,9 @@ export default { ...@@ -284,6 +293,9 @@ export default {
case '管理检测项目': case '管理检测项目':
this._itemManage(data.id) this._itemManage(data.id)
break break
case '制备详情':
this._preEdit(data.id)
break
case '编辑': case '编辑':
this._editModal(true, data) this._editModal(true, data)
break break
...@@ -300,6 +312,9 @@ export default { ...@@ -300,6 +312,9 @@ export default {
} }
}) })
}, },
_preEdit(id) {
this.$refs.preHisModal._open(id)
},
_itemManage(data) { _itemManage(data) {
// 管理检测项目 // 管理检测项目
if (this.recordHis) { if (this.recordHis) {
......
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