Skip to content

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

修改了查看原始记录删除按钮

parent 261e9363
Showing with 18 additions and 140 deletions
api/soil/soil-test.js
...@@ -157,5 +157,7 @@ export default { ...@@ -157,5 +157,7 @@ export default {
collectFilePage: data => collectFilePage: data =>
http.post('soil/v1/experiment_collect_file/page', data).then(res => res), http.post('soil/v1/experiment_collect_file/page', data).then(res => res),
pageExpAuditHis: data => pageExpAuditHis: data =>
http.post('soil/v1/entrust/page_exp_audit_his', data).then(res => res) http.post('soil/v1/entrust/page_exp_audit_his', data).then(res => res),
deleteRecord: data =>
http.delete('soil/v1/original_record/?ids=' + data).then(res => res)
} }
pages/soil-test-manage/test-input/OriginalRecordView.vue
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<Form :label-width="80" v-show="searchOpen" inline onsubmit="return false"> <Form :label-width="80" v-show="searchOpen" 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.templateTitle" @on-enter="_formSearch" placeholder="请输入模板名称" clearable></Input> <Input v-model="formObj.title" @on-enter="_formSearch" placeholder="请输入模板名称" clearable></Input>
</Form-item> </Form-item>
<Form-item class="search-item" label="委托单位:"> <Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.cusNames" @on-enter="_formSearch" placeholder="请输入委托单位" clearable></Input> <Input v-model="formObj.entrustCode" @on-enter="_formSearch" 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>
...@@ -39,18 +39,6 @@ ...@@ -39,18 +39,6 @@
<div v-else>{{scope.row[item.key]}}</div> <div v-else>{{scope.row[item.key]}}</div>
</template> </template>
</vxe-table-column> </vxe-table-column>
<!-- <template slot="col">-->
<!-- <vxe-table-column-->
<!-- :width="190"-->
<!-- title="操作"-->
<!-- align="center"-->
<!-- fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <VXEIconList :msg="(scope.row.hasInputItem===1) ? iconMsg : iconMsgDisable"-->
<!-- @on-result-change="_iconClick" :rowData="scope.row"></VXEIconList>-->
<!-- </template>-->
<!-- </vxe-table-column>-->
<!-- </template>-->
</PTVXETable> </PTVXETable>
</Col> </Col>
</Row> </Row>
...@@ -76,16 +64,7 @@ export default { ...@@ -76,16 +64,7 @@ export default {
return { return {
currentComponent: '', currentComponent: '',
getPage: {}, getPage: {},
btn: [ btn: [],
{
type: '',
id: '',
name: '纠正填写时间',
componentName: 'EditDateModal'
},
{ type: '', id: '', name: '设置填写人乙' },
{ type: 'error', id: '', name: '删除' }
],
selectIds: [], selectIds: [],
iconMsg: [ iconMsg: [
{ {
...@@ -102,55 +81,8 @@ export default { ...@@ -102,55 +81,8 @@ export default {
type: 'ios-list', type: 'ios-list',
id: '', id: '',
name: '查看试验项目' name: '查看试验项目'
}
// {
// type: 'erlenmeyer-flask',
// id: '',
// name: '查看样品',
// componentName: 'SampleView'
// },
// {
// type: 'document-text',
// id: '',
// name: '查看检测项目',
// componentName: 'ItemView'
// },
// { type: 'cloud', id: '', name: '附件', componentName: 'FileManage' },
// { type: 'trash-a', id: '', name: '删除' },
// {
// type: 'ios-clock',
// id: '',
// name: '操作记录',
// componentName: 'ElnFormRecord'
// }
],
iconMsgDisable: [
{ type: 'md-create', id: '', name: '编辑', disabled: true },
{
type: '',
id: '',
name: '查看原始记录',
componentName: 'OriginalItemView'
}, },
{ { type: 'md-trash', id: '', name: '删除' }
type: 'ios-list',
id: '',
name: '查看试验项目'
}
// {
// type: 'document-text',
// id: '',
// name: '查看检测项目',
// componentName: 'ItemView'
// },
// { type: 'cloud', id: '', name: '附件', componentName: 'FileManage' },
// { type: 'trash-a', id: '', name: '删除', disabled: true },
// {
// type: 'ios-clock',
// id: '',
// name: '操作记录',
// componentName: 'ElnFormRecord'
// }
], ],
pageColumns: [ pageColumns: [
{ title: '模板名称', key: 'title' }, { title: '模板名称', key: 'title' },
...@@ -159,16 +91,7 @@ export default { ...@@ -159,16 +91,7 @@ export default {
{ title: '创建时间', key: 'ctime', dateTime: true } { title: '创建时间', key: 'ctime', dateTime: true }
], ],
formObj: { formObj: {
entrustId: '', entrustId: ''
batchNos: '',
sampleNums: '',
templateTitle: '',
fillInTimeBegin: '',
fillInTimeEnd: '',
cusNames: '',
codes: '',
itemNames: '',
testAccordings: ''
}, },
searchOpen: false searchOpen: false
} }
...@@ -212,40 +135,12 @@ export default { ...@@ -212,40 +135,12 @@ export default {
this.currentComponent = componentName this.currentComponent = componentName
this.$nextTick(function() { this.$nextTick(function() {
switch (msg) { switch (msg) {
case '纠正填写时间':
this._editWriteTime()
break
case '设置填写人乙':
this._setAnotherTester()
break
case '删除':
this._batchDelete()
break
case 'search': case 'search':
this.searchOpen = !this.searchOpen this.searchOpen = !this.searchOpen
break break
} }
}) })
}, },
// 设置填写人乙
_setAnotherTester() {
if (this.selectIds.length === 0) {
this.$msgTip('warning')
} else {
this.$refs.testerModal._open(this.selectIds)
}
},
_editWriteTime() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据')
} else {
this.$refs.refModal._open('填写时间')
}
},
_dateChange(data) {
this.formObj.fillInTimeBegin = data[0]
this.formObj.fillInTimeEnd = data[1]
},
_iconClick(res, data, currentComponent) { _iconClick(res, data, currentComponent) {
this.currentComponent = currentComponent this.currentComponent = currentComponent
this.$nextTick(() => { this.$nextTick(() => {
...@@ -262,21 +157,9 @@ export default { ...@@ -262,21 +157,9 @@ export default {
case '查看试验项目': case '查看试验项目':
this._itemView(data.id) this._itemView(data.id)
break break
case '查看检测项目':
this.$refs.refModal._open(data)
break
case '查看样品':
this.$refs.refModal._open(data.id)
break
case '附件':
this.$refs.refModal._open(data.id, 'originalId')
break
case '删除': case '删除':
this._deleteByIds([data.id]) this._deleteByIds([data.id])
break break
case '操作记录':
this.$refs.refModal._open(data.id)
break
} }
}) })
}, },
...@@ -286,7 +169,6 @@ export default { ...@@ -286,7 +169,6 @@ export default {
}, },
// 查看原始记录 // 查看原始记录
_recordView(originalRecordId) { _recordView(originalRecordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
let recordUrl = '' let recordUrl = ''
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com' recordUrl = 'http://record.patzn.com'
...@@ -343,28 +225,22 @@ export default { ...@@ -343,28 +225,22 @@ export default {
this.getPage = result this.getPage = result
} }
}, },
// 批量删除原始记录 // 删除原始记录
_batchDelete() {
if (this.selectIds.length > 0) {
const content = '确定删除这' + this.selectIds.length + '条数据？'
this._deleteByIds(this.selectIds, content)
} else {
this.$msgTip('warning')
}
},
_deleteByIds(ids, content) { _deleteByIds(ids, content) {
this.$Modal.confirm({ this.$Modal.confirm({
title: '提示', title: '提示',
content: content || '确定删除该记录？', content: content || '确定删除该记录？',
onOk: () => { onOk: () => {
this.$store.dispatch('EnvItem/deleteOriRecord', ids).then(() => { this._deleteOk(ids)
if (this.$store.state.EnvItem.success) {
this._page()
this.$Message.success('删除成功!')
}
})
} }
}) })
},
_deleteOk: async function(ids) {
const result = await soilTest.deleteRecord(ids)
if (result) {
this.$Message.success('删除成功')
this._page()
}
} }
} }
} }
......
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