Commit dcd8d1a4 by lichengming

修改了报告档案按样品查看原始记录接口

parent c1a0b9fc
...@@ -65,6 +65,8 @@ export default { ...@@ -65,6 +65,8 @@ export default {
http.post('soil/v1/experiment/page_exp_allot_his', data).then(res => res), http.post('soil/v1/experiment/page_exp_allot_his', data).then(res => res),
pageTestByExp: data => pageTestByExp: data =>
http.post('soil/v1/experiment/page_test_by_exp', data).then(res => res), http.post('soil/v1/experiment/page_test_by_exp', data).then(res => res),
pageDocumentByExp: data =>
http.post('soil/v1/experiment/page_document_by_exp', data).then(res => res),
pagePrepareByExp: data => pagePrepareByExp: data =>
http.post('soil/v1/experiment/page_prepare_by_exp', data).then(res => res), http.post('soil/v1/experiment/page_prepare_by_exp', data).then(res => res),
pageExperimentTest: data => pageExperimentTest: data =>
...@@ -81,6 +83,16 @@ export default { ...@@ -81,6 +83,16 @@ export default {
JSON.stringify(data.obj) JSON.stringify(data.obj)
) )
.then(res => res), .then(res => res),
pageDocumentTestBath: data =>
https
.post(
'soil/v1/experiment/page_document_test_bath?page=' +
data.page +
'&rows=' +
data.rows,
JSON.stringify(data.obj)
)
.then(res => res),
pageExperimentCheckBath: data => pageExperimentCheckBath: data =>
https https
.post( .post(
......
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,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())
this.formObj.entrustId = this.id this.formObj.entrustId = this.id
const result = await soilTest.pageTestByExp( const result = await soilTest.pageDocumentByExp(
this.$serializeForm(this.formObj) this.$serializeForm(this.formObj)
) )
if (result) { if (result) {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false"> <Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="试样编号:"> <Form-item class="search-item" label="试样编号:">
<Input v-model="formObj.sampleCode" @on-enter="_formSearch" name="sampleCode" placeholder="请输入试样编号" clearable></Input> <Input v-model="formObj.specimenNum" @on-enter="_formSearch" name="specimenNum" placeholder="请输入试样编号" clearable></Input>
</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>
...@@ -60,9 +60,11 @@ export default { ...@@ -60,9 +60,11 @@ export default {
name: '', name: '',
testMethod: '', testMethod: '',
testBasis: '', testBasis: '',
specimenNum: undefined,
obj: { obj: {
entrustId: '', entrustId: '',
nameList: [] nameList: [],
sampleCode: undefined
} }
}, },
entrustId: '', entrustId: '',
...@@ -198,22 +200,15 @@ export default { ...@@ -198,22 +200,15 @@ export default {
_formSearch() { _formSearch() {
this.$refs.pageTable._pageChange(1) this.$refs.pageTable._pageChange(1)
}, },
_searchParams() {
const obj = {}
const obj1 = this.$refs.selInput1._getFormObj()
const obj2 = this.$refs.selInput2._getFormObj()
const obj3 = { foodItemList: this.leftSelectData }
Object.assign(obj, obj1, obj2, obj3)
return obj
},
_page: async function() { _page: async function() {
this.formObj.obj.nameList = [] this.formObj.obj.nameList = []
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.obj.entrustId = this.entrustId this.formObj.obj.entrustId = this.entrustId
this.formObj.obj.nameList = this.leftSelectData this.formObj.obj.nameList = this.leftSelectData
this.formObj.obj.sampleCode = this.formObj.specimenNum
// this.formObj.entrustId = this.entrustId // this.formObj.entrustId = this.entrustId
// this.formObj.nameList = this.leftSelectData.join(',') // this.formObj.nameList = this.leftSelectData.join(',')
const result = await soilTest.pageExperimentTestBath( const result = await soilTest.pageDocumentTestBath(
this.$serializeForm(this.formObj) this.$serializeForm(this.formObj)
) )
if (result) { if (result) {
...@@ -252,6 +247,7 @@ export default { ...@@ -252,6 +247,7 @@ export default {
_clearAll() { _clearAll() {
this.getPage.records = [] this.getPage.records = []
this.selectIds = [] this.selectIds = []
this.formObj.specimenNum = undefined
} }
} }
} }
......
...@@ -50,6 +50,7 @@ export default { ...@@ -50,6 +50,7 @@ export default {
this.id = id this.id = id
this.$refs.leftModal._open(this.id) this.$refs.leftModal._open(this.id)
this.$refs.rightModal._getEntrustId(this.id) this.$refs.rightModal._getEntrustId(this.id)
this.$refs.rightModal._clearAll()
// this.$refs.rightModal._getColumn() // this.$refs.rightModal._getColumn()
}, },
_clearTable() { _clearTable() {
......
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