Commit 2b1dcf46 by lichengming

修改了试样检测的历史任务

parent 4a27e317
...@@ -21,6 +21,8 @@ export default { ...@@ -21,6 +21,8 @@ export default {
http.post('soil/v1/experiment/page_allot', data).then(res => res), http.post('soil/v1/experiment/page_allot', data).then(res => res),
pageExpTest: data => pageExpTest: data =>
http.post('soil/v1/entrust/page_exp_test', data).then(res => res), http.post('soil/v1/entrust/page_exp_test', data).then(res => res),
pageExpTestHis: data =>
http.post('soil/v1/entrust/page_exp_test_his', data).then(res => res),
samplePage: data => http.post('soil/v1/sample/page', data).then(res => res), samplePage: data => http.post('soil/v1/sample/page', data).then(res => res),
pageExpTestSample: data => pageExpTestSample: data =>
http.post('soil/v1/sample/page_exp_test_sample', data).then(res => res), http.post('soil/v1/sample/page_exp_test_sample', data).then(res => res),
......
...@@ -64,16 +64,19 @@ ...@@ -64,16 +64,19 @@
<UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo> <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
<Operation ref="operation"></Operation> <Operation ref="operation"></Operation>
<FileManage ref="FileManage"></FileManage> <FileManage ref="FileManage"></FileManage>
<SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>
</div> </div>
</template> </template>
<script> <script>
import UserInfo from '../../../components/user-info-single/AssignPerson' import UserInfo from '../../../components/user-info-single/AssignPerson'
import { soilTest } from '../../../api' import { soilTest } from '../../../api'
import Operation from '../../../components/operation/Operation' import Operation from '../../../components/operation/Operation'
import SoilSampleManageHis from '../SoilSampleManageHis'
export default { export default {
components: { components: {
UserInfo, UserInfo,
Operation Operation,
SoilSampleManageHis
}, },
data() { data() {
return { return {
......
...@@ -64,16 +64,19 @@ ...@@ -64,16 +64,19 @@
<UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo> <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
<Operation ref="operation"></Operation> <Operation ref="operation"></Operation>
<FileManage ref="FileManage"></FileManage> <FileManage ref="FileManage"></FileManage>
<SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>
</div> </div>
</template> </template>
<script> <script>
import UserInfo from '../../../components/user-info-single/AssignPerson' import UserInfo from '../../../components/user-info-single/AssignPerson'
import { soilTest } from '../../../api' import { soilTest } from '../../../api'
import Operation from '../../../components/operation/Operation' import Operation from '../../../components/operation/Operation'
import SoilSampleManageHis from '../SoilSampleManageHis'
export default { export default {
components: { components: {
UserInfo, UserInfo,
Operation Operation,
SoilSampleManageHis
}, },
data() { data() {
return { return {
...@@ -89,7 +92,6 @@ export default { ...@@ -89,7 +92,6 @@ export default {
name: '管理样品' name: '管理样品'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-trash', id: '', name: '删除' },
{ {
type: 'ios-clock', type: 'ios-clock',
id: '', id: '',
......
...@@ -64,16 +64,19 @@ ...@@ -64,16 +64,19 @@
<UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo> <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
<Operation ref="operation"></Operation> <Operation ref="operation"></Operation>
<FileManage ref="FileManage"></FileManage> <FileManage ref="FileManage"></FileManage>
<SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>
</div> </div>
</template> </template>
<script> <script>
import UserInfo from '../../../components/user-info-single/AssignPerson' import UserInfo from '../../../components/user-info-single/AssignPerson'
import { soilTest } from '../../../api' import { soilTest } from '../../../api'
import Operation from '../../../components/operation/Operation' import Operation from '../../../components/operation/Operation'
import SoilSampleManageHis from '../SoilSampleManageHis'
export default { export default {
components: { components: {
UserInfo, UserInfo,
Operation Operation,
SoilSampleManageHis
}, },
data() { data() {
return { return {
...@@ -89,7 +92,6 @@ export default { ...@@ -89,7 +92,6 @@ export default {
name: '管理样品' name: '管理样品'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-trash', id: '', name: '删除' },
{ {
type: 'ios-clock', type: 'ios-clock',
id: '', id: '',
...@@ -399,7 +401,7 @@ export default { ...@@ -399,7 +401,7 @@ export default {
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj) console.log('this.formObj', this.formObj)
const result = await soilTest.pageExpTest( const result = await soilTest.pageExpTestHis(
this.$serializeForm(this.formObj) this.$serializeForm(this.formObj)
) )
if (result) { if (result) {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<Col span="24"> <Col span="24">
<Form id="task-assign-item-left" :label-width="70" inline onsubmit="return false"> <Form id="task-assign-item-left" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="检测项目1:"> <Form-item class="search-item" label="检测项目:">
<Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input> <Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
......
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