Skip to content

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

修改了收样室收样

parent d9e28236
Showing with 40 additions and 70 deletions
pages/soil-sample-manage/sample-receive/ReceiveByEntrust.vue
...@@ -94,16 +94,6 @@ export default { ...@@ -94,16 +94,6 @@ export default {
id: '', id: '',
name: '管理样品' name: '管理样品'
}, },
// {
// type: 'ios-list',
// id: '',
// name: '项目管理'
// },
// {
// type: 'md-create',
// id: '',
// name: '编辑协议'
// },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ {
type: 'ios-clock', type: 'ios-clock',
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/AlreadyIssuedHis.vue
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<Col span="24" style="padding-bottom: 5px"> <Col span="24" style="padding-bottom: 5px">
<Form v-show="searchOpen" id="search-wait-scan" :label-width="90" inline onsubmit="return false"> <Form v-show="searchOpen" id="search-wait-scan" :label-width="90" 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" name="sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch"></Input> <Input v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable @on-enter="_formSearch"></Input>
<input name="entrustId" type="hidden"> <input name="entrustId" type="hidden">
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
...@@ -18,15 +18,10 @@ ...@@ -18,15 +18,10 @@
</Col> </Col>
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" @on-result-change="_btnClick"> <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" @on-result-change="_btnClick">
<!--<template slot="processTask">-->
<!--<div class="fr process-task">-->
<!--<Button @click="_exportReceiveRecord">导出交接记录</Button>-->
<!--</div>-->
<!--</template>-->
</btn-list> </btn-list>
</Col> </Col>
<Col span="24"> <Col span="24">
<PTVXETable <PTVXETableHeight
ref="pageTable" ref="pageTable"
:table-height="tableHeight" :table-height="tableHeight"
:get-page="getPage" :get-page="getPage"
...@@ -50,7 +45,7 @@ ...@@ -50,7 +45,7 @@
<div v-else>{{scope.row[item.key]}}</div> <div v-else>{{scope.row[item.key]}}</div>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETableHeight>
</Col> </Col>
</Row> </Row>
</div> </div>
...@@ -68,11 +63,11 @@ export default { ...@@ -68,11 +63,11 @@ export default {
selectIds: [], selectIds: [],
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: 95 },
{ title: '土质描述', key: 'sampleDescribe', width: 160 }, { title: '现场编号', key: 'siteNo', width: 100 },
{ title: '样品包装类型', key: 'samplePack', width: 160 }, { title: '土质描述', key: 'sampleDescribe', width: 185 },
{ title: '现场编号', key: 'siteNo', width: 130 } { title: '样品包装类型', key: 'samplePack', width: 120 }
], ],
iconMsg: [ iconMsg: [
{ type: 'md-create', id: '', name: '编辑' }, { type: 'md-create', id: '', name: '编辑' },
...@@ -159,6 +154,7 @@ export default { ...@@ -159,6 +154,7 @@ export default {
}, },
_page: async function() { _page: async function() {
const result = await soilEntrust.pageSendHis(this.formObj) const result = await soilEntrust.pageSendHis(this.formObj)
console.log(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
this.getPage = result this.getPage = result
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/SampleManage.vue
<template> <template>
<div> <div>
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200" <Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="818"
class="zIndex-900 modal-footer-none"> class="zIndex-900 modal-footer-none">
<p slot="header"> {{name}}--管理样品</p> <p slot="header"> {{name}}--管理样品</p>
<div> <div>
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/SampleManageHis.vue
<template> <template>
<div> <div>
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200" <Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="818"
class="zIndex-900 modal-footer-none"> class="zIndex-900 modal-footer-none">
<p slot="header"> {{name}}--管理样品</p> <p slot="header"> {{name}}--管理样品</p>
<div> <div>
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue
...@@ -7,12 +7,8 @@ ...@@ -7,12 +7,8 @@
<Col span="24" style="padding-bottom: 5px"> <Col span="24" style="padding-bottom: 5px">
<Form id="search-wait" :label-width="90" v-show="searchOpen" inline onsubmit="return false"> <Form id="search-wait" :label-width="90" v-show="searchOpen" 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 @on-enter="_formSearch" v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable></Input> <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
</Form-item>
<Form-item label="样品编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.num" name="num" placeholder="请输入样品编号" clearable></Input>
<input name="contractId" type="hidden">
</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>
...@@ -21,15 +17,10 @@ ...@@ -21,15 +17,10 @@
</Col> </Col>
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" :show-search-btn="true" class="contHide"> <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" :show-search-btn="true" class="contHide">
<!--<template slot="processTask">-->
<!--<div class="fr process-task">-->
<!--<Button @click="_exportReceiveRecord">导出交接记录</Button>-->
<!--</div>-->
<!--</template>-->
</btn-list> </btn-list>
</Col> </Col>
<Col span="24"> <Col span="24">
<PTVXETable <PTVXETableHeight
ref="pageTable" ref="pageTable"
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange"
...@@ -41,7 +32,7 @@ ...@@ -41,7 +32,7 @@
: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" :fixed="item.fixed?item.fixed:undefined"
sortable sortable
> >
...@@ -54,7 +45,7 @@ ...@@ -54,7 +45,7 @@
<div v-else>{{scope.row[item.key]}}</div> <div v-else>{{scope.row[item.key]}}</div>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETableHeight>
</Col> </Col>
</Row> </Row>
</div> </div>
...@@ -75,11 +66,11 @@ export default { ...@@ -75,11 +66,11 @@ export default {
selectIds: [], selectIds: [],
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: 95 },
{ title: '土质描述', key: 'sampleDescribe', width: 160 }, { title: '现场编号', key: 'siteNo', width: 100 },
{ title: '样品包装类型', key: 'samplePack', width: 160 }, { title: '土质描述', key: 'sampleDescribe', width: 185 },
{ title: '现场编号', key: 'siteNo', width: 130 } { title: '样品包装类型', key: 'samplePack', width: 120 }
], ],
iconMsg: [{ type: 'ios-list', id: '', name: '试验项目' }], iconMsg: [{ type: 'ios-list', id: '', name: '试验项目' }],
type: '', type: '',
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceiveHis.vue
...@@ -7,11 +7,8 @@ ...@@ -7,11 +7,8 @@
<Col span="24" style="padding-bottom: 5px"> <Col span="24" style="padding-bottom: 5px">
<Form v-show="searchOpen" id="search-wait" :label-width="90" inline onsubmit="return false"> <Form v-show="searchOpen" id="search-wait" :label-width="90" 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.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"></Input> <Input v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable @on-enter="_formSearch"></Input>
</Form-item>
<Form-item label="样品编号:" class="search-item">
<Input v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch"></Input>
<input name="entrustId" type="hidden"> <input name="entrustId" type="hidden">
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
...@@ -29,7 +26,7 @@ ...@@ -29,7 +26,7 @@
</btn-list> </btn-list>
</Col> </Col>
<Col span="24"> <Col span="24">
<PTVXETable <PTVXETableHeight
ref="pageTable" ref="pageTable"
:table-height="tableHeight" :table-height="tableHeight"
:get-page="getPage" :get-page="getPage"
...@@ -54,7 +51,7 @@ ...@@ -54,7 +51,7 @@
<div v-else>{{scope.row[item.key]}}</div> <div v-else>{{scope.row[item.key]}}</div>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETableHeight>
</Col> </Col>
</Row> </Row>
</div> </div>
...@@ -77,11 +74,11 @@ export default { ...@@ -77,11 +74,11 @@ export default {
selectIds: [], selectIds: [],
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: 95 },
{ title: '土质描述', key: 'sampleDescribe', width: 160 }, { title: '现场编号', key: 'siteNo', width: 100 },
{ title: '样品包装类型', key: 'samplePack', width: 160 }, { title: '土质描述', key: 'sampleDescribe', width: 185 },
{ title: '现场编号', key: 'siteNo', width: 130 } { title: '样品包装类型', key: 'samplePack', width: 120 }
], ],
iconMsg: [{ type: 'ios-list', id: '', name: '试验项目' }], iconMsg: [{ type: 'ios-list', id: '', name: '试验项目' }],
type: '', type: '',
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitScan.vue
...@@ -7,12 +7,8 @@ ...@@ -7,12 +7,8 @@
<Col span="24" style="padding-bottom: 5px"> <Col span="24" style="padding-bottom: 5px">
<Form id="search-wait-scan" :label-width="90" v-show="searchOpen" inline onsubmit="return false"> <Form id="search-wait-scan" :label-width="90" v-show="searchOpen" 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 @on-enter="_formSearch" v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable></Input> <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable></Input>
</Form-item>
<Form-item label="样品编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.num" name="num" placeholder="请输入样品编号" clearable></Input>
<input name="contractId" type="hidden">
</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>
...@@ -29,7 +25,7 @@ ...@@ -29,7 +25,7 @@
</btn-list> </btn-list>
</Col> </Col>
<Col span="24"> <Col span="24">
<PTVXETable <PTVXETableHeight
ref="pageTable" ref="pageTable"
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange"
...@@ -53,7 +49,7 @@ ...@@ -53,7 +49,7 @@
<div v-else>{{scope.row[item.key]}}</div> <div v-else>{{scope.row[item.key]}}</div>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETableHeight>
</Col> </Col>
</Row> </Row>
</div> </div>
...@@ -71,11 +67,11 @@ export default { ...@@ -71,11 +67,11 @@ export default {
selectIds: [], selectIds: [],
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: 95 },
{ title: '土质描述', key: 'sampleDescribe', width: 160 }, { title: '现场编号', key: 'siteNo', width: 100 },
{ title: '样品包装类型', key: 'samplePack', width: 160 }, { title: '土质描述', key: 'sampleDescribe', width: 185 },
{ title: '现场编号', key: 'siteNo', width: 130 } { title: '样品包装类型', key: 'samplePack', width: 120 }
], ],
iconMsg: [ iconMsg: [
{ type: 'md-create', id: '', name: '编辑' }, { type: 'md-create', id: '', name: '编辑' },
......
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