Commit 9590fc8a by lichengming

修改了试验项目查看试验项目

parent 9226d4e2
...@@ -53,5 +53,7 @@ export default { ...@@ -53,5 +53,7 @@ export default {
updateItem: data => updateItem: data =>
http http
.post('soil/v1/original_record/update_original_record', data) .post('soil/v1/original_record/update_original_record', data)
.then(res => res) .then(res => res),
pageOriginalExp: data =>
http.post('soil/v1/experiment/page_original_exp', data).then(res => res)
} }
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
</Col> </Col>
</Row> </Row>
<ItemOriginalRecordEdit ref="recordEditModal"></ItemOriginalRecordEdit> <ItemOriginalRecordEdit ref="recordEditModal"></ItemOriginalRecordEdit>
<ItemView ref="itemViewModal"></ItemView>
</div> </div>
</template> </template>
<script> <script>
...@@ -64,10 +65,12 @@ ...@@ -64,10 +65,12 @@
import Global from '../../../api/config' import Global from '../../../api/config'
import { soilTest } from '../../../api' import { soilTest } from '../../../api'
import ItemOriginalRecordEdit from './OriginalRecordEdit' import ItemOriginalRecordEdit from './OriginalRecordEdit'
import ItemView from './ItemView'
export default { export default {
components: { components: {
ItemOriginalRecordEdit ItemOriginalRecordEdit,
ItemView
}, },
data() { data() {
return { return {
...@@ -94,6 +97,11 @@ export default { ...@@ -94,6 +97,11 @@ export default {
type: 'ios-book', type: 'ios-book',
id: '', id: '',
name: '查看原始记录' name: '查看原始记录'
},
{
type: 'ios-list',
id: '',
name: '查看试验项目'
} }
// { // {
// type: 'erlenmeyer-flask', // type: 'erlenmeyer-flask',
...@@ -123,14 +131,13 @@ export default { ...@@ -123,14 +131,13 @@ export default {
id: '', id: '',
name: '查看原始记录', name: '查看原始记录',
componentName: 'OriginalItemView' componentName: 'OriginalItemView'
},
{
type: 'ios-list',
id: '',
name: '查看试验项目'
} }
// { // {
// type: 'erlenmeyer-flask',
// id: '',
// name: '查看样品',
// componentName: 'SampleView'
// },
// {
// type: 'document-text', // type: 'document-text',
// id: '', // id: '',
// name: '查看检测项目', // name: '查看检测项目',
...@@ -252,6 +259,9 @@ export default { ...@@ -252,6 +259,9 @@ export default {
case '查看原始记录': case '查看原始记录':
this._recordView(data.originalRecordId) this._recordView(data.originalRecordId)
break break
case '查看试验项目':
this._itemView(data.id)
break
case '查看检测项目': case '查看检测项目':
this.$refs.refModal._open(data) this.$refs.refModal._open(data)
break break
...@@ -270,6 +280,10 @@ export default { ...@@ -270,6 +280,10 @@ export default {
} }
}) })
}, },
// 查看试验项目
_itemView(id) {
this.$refs.itemViewModal._open(id)
},
// 查看原始记录 // 查看原始记录
_recordView(originalRecordId) { _recordView(originalRecordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
......
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