Skip to content

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

修改了开土制备

parent f10b3f0b
Showing with 30 additions and 35 deletions
pages/soil-sample-manage/SoilSampleManage.vue
<template> <template>
<div> <div>
<Modal v-model="showModal" @on-visible-change="_visibleChange" width="1200" class="modal-footer-none"> <Modal v-model="showModal" @on-visible-change="_visibleChange" width="970" class="modal-footer-none">
<p slot="header"> <p slot="header">
{{ modalTitle }} {{ modalTitle }}
</p> </p>
...@@ -14,18 +14,6 @@ ...@@ -14,18 +14,6 @@
<Form-item label="试样编号:" class="search-item"> <Form-item label="试样编号:" class="search-item">
<Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable /> <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable />
</Form-item> </Form-item>
<!-- <Form-item label="制单日期:" style="width: 25%">-->
<!-- <Date-picker-->
<!-- v-model="dateList"-->
<!-- type="daterange"-->
<!-- placeholder="制单日期"-->
<!-- format="yyyy-MM-dd"-->
<!-- :editable="false"-->
<!-- style="width:100%"-->
<!-- placement="bottom-end"-->
<!-- @on-change="_dateChange"-->
<!-- ></Date-picker>-->
<!-- </Form-item>-->
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_page" type="primary"> <Button @click="_page" type="primary">
搜索 搜索
...@@ -39,14 +27,14 @@ ...@@ -39,14 +27,14 @@
</Col> </Col>
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true" <PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data> :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"
:field="item.key" :field="item.key"
:title="item.title" :title="item.title"
:min-width="item.width?item.width:200" :width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.detail"> <div v-if="item.detail">
...@@ -66,7 +54,7 @@ ...@@ -66,7 +54,7 @@
</div> </div>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETableHeight>
</Col> </Col>
</Row> </Row>
</div> </div>
...@@ -121,8 +109,7 @@ export default { ...@@ -121,8 +109,7 @@ export default {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: '',
name: '管理检测项目' name: '管理检测项目'
}, }
{ type: 'md-trash', id: '', name: '删除' }
], ],
contractId: '', // 委托id contractId: '', // 委托id
showModal: false, showModal: false,
...@@ -133,12 +120,12 @@ export default { ...@@ -133,12 +120,12 @@ export default {
selectData: {}, selectData: {},
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{ title: '试样编号', key: 'sampleCode', width: 160, fixed: 'left' }, { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
{ title: '试样深度', key: 'sampleDepth', width: 160 }, { title: '试样深度', key: 'sampleDepth', width: 100 },
{ title: '土质描述详情', key: 'describeDetail', width: 160 }, { title: '现场编号', key: 'siteNo', width: 100 },
{ title: '土质描述', key: 'sampleDescribe', width: 160 }, { title: '土质描述', key: 'sampleDescribe', width: 160 },
{ title: '样品包装类型', key: 'samplePack', width: 160 }, { title: '土质描述详情', key: 'describeDetail', width: 160 },
{ title: '现场编号', key: 'siteNo', width: 130 } { title: '样品包装类型', key: 'samplePack', width: 120 }
], ],
sampleId: '', sampleId: '',
dateList: [], dateList: [],
...@@ -150,7 +137,11 @@ export default { ...@@ -150,7 +137,11 @@ export default {
}, },
computed: { computed: {
tableHeight: function() { tableHeight: function() {
return this.$tableHeight('tableModal') if (this.searchOpen) {
return this.$tableHeight('search')
} else {
return this.$tableHeight('noSearch')
}
} }
}, },
methods: { methods: {
......
pages/soil-sample-manage/SoilSampleManageHis.vue
<template> <template>
<div> <div>
<Modal v-model="showModal" width="1200" class="modal-footer-none"> <Modal v-model="showModal" width="980" class="modal-footer-none">
<p slot="header"> <p slot="header">
{{ modalTitle }} {{ modalTitle }}
</p> </p>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<Col span="24"> <Col span="24">
<Form id="search-sample-company" v-show="searchOpen" :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" @on-enter="_formSearch" placeholder="请输入样品编号" clearable /> <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable />
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
</Col> </Col>
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true" <PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data> :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"
:field="item.key" :field="item.key"
:title="item.title" :title="item.title"
:min-width="item.width?item.width:200" :width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.detail"> <div v-if="item.detail">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</div> </div>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETableHeight>
</Col> </Col>
</Row> </Row>
</div> </div>
...@@ -117,12 +117,12 @@ export default { ...@@ -117,12 +117,12 @@ export default {
selectData: {}, selectData: {},
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{ title: '试样编号', key: 'sampleCode', width: 160, fixed: 'left' }, { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
{ title: '试样深度', key: 'sampleDepth', width: 160 }, { title: '试样深度', key: 'sampleDepth', width: 100 },
{ title: '土质描述详情', key: 'describeDetail', width: 160 }, { title: '现场编号', key: 'siteNo', width: 100 },
{ title: '土质描述', key: 'sampleDescribe', width: 160 }, { title: '土质描述', key: 'sampleDescribe', width: 160 },
{ title: '样品包装类型', key: 'samplePack', width: 160 }, { title: '土质描述详情', key: 'describeDetail', width: 160 },
{ title: '现场编号', key: 'siteNo', width: 130 } { title: '样品包装类型', key: 'samplePack', width: 120 }
], ],
sampleId: '', sampleId: '',
dateList: [], dateList: [],
...@@ -134,7 +134,11 @@ export default { ...@@ -134,7 +134,11 @@ export default {
}, },
computed: { computed: {
tableHeight: function() { tableHeight: function() {
return this.$tableHeight('tableModal') if (this.searchOpen) {
return this.$tableHeight('search')
} else {
return this.$tableHeight('noSearch')
}
} }
}, },
methods: { methods: {
......
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