Commit 1aabe897 by lichengming

修改了数据复核和数据审核

parent 5e818777
...@@ -184,7 +184,11 @@ export default { ...@@ -184,7 +184,11 @@ export default {
switch (res) { switch (res) {
case '查看原始记录': case '查看原始记录':
console.log(data) console.log(data)
this._viewRecord('1309434759937146882') if (data.recordId) {
this._viewRecord(data.recordId)
} else {
this.$Message.warning('尚未填写原始记录')
}
break break
case '查看指标': case '查看指标':
this._indexManage(data) this._indexManage(data)
......
...@@ -436,7 +436,11 @@ export default { ...@@ -436,7 +436,11 @@ export default {
switch (res) { switch (res) {
case '查看原始记录': case '查看原始记录':
console.log(data) console.log(data)
this._viewRecord(data.id) if (data.recordId) {
this._viewRecord(data.recordId)
} else {
this.$Message.warning('尚未填写原始记录')
}
break break
case '查看指标': case '查看指标':
this._indexManage(data) this._indexManage(data)
......
...@@ -184,7 +184,11 @@ export default { ...@@ -184,7 +184,11 @@ export default {
switch (res) { switch (res) {
case '查看原始记录': case '查看原始记录':
console.log(data) console.log(data)
this._viewRecord(data.id) if (data.recordId) {
this._viewRecord(data.recordId)
} else {
this.$Message.warning('尚未填写原始记录')
}
break break
case '查看指标': case '查看指标':
this._indexManage(data) this._indexManage(data)
......
...@@ -436,8 +436,8 @@ export default { ...@@ -436,8 +436,8 @@ export default {
switch (res) { switch (res) {
case '查看原始记录': case '查看原始记录':
console.log(data) console.log(data)
if (data.originalRecordId) { if (data.recordId) {
this._viewRecord(data.originalRecordId) this._viewRecord(data.recordId)
} else { } else {
this.$Message.warning('尚未填写原始记录') this.$Message.warning('尚未填写原始记录')
} }
......
...@@ -194,16 +194,14 @@ export default { ...@@ -194,16 +194,14 @@ export default {
_equipManage(data) { _equipManage(data) {
this.$refs.equipModal._open(data) this.$refs.equipModal._open(data)
}, },
_viewRecord(originalRecordId) { _viewRecord(recordId) {
console.log(recordId)
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
layx.iframe( layx.iframe(
'labRecordWriteOriView', 'labRecordWriteOriView',
'原始记录预览', '原始记录预览',
Global.recordURL + Global.recordURL + '/print/v1/form/' + recordId + '?type=ENVTESTMAKE',
'/print/v1/form/' +
originalRecordId +
'?type=ENVTESTMAKE',
{ {
event: { event: {
onload: { onload: {
......
...@@ -373,7 +373,7 @@ export default { ...@@ -373,7 +373,7 @@ export default {
const errorInfo = [] const errorInfo = []
for (let i = 0; i < this.selectData.length; i++) { for (let i = 0; i < this.selectData.length; i++) {
console.log(this.selectData[i].recorded) console.log(this.selectData[i].recorded)
if (this.selectData[i].recorded !== '否') { if (this.selectData[i].recorded === '是') {
errorInfo.push(this.selectData[i].index + 1) errorInfo.push(this.selectData[i].index + 1)
} }
} }
...@@ -506,16 +506,13 @@ export default { ...@@ -506,16 +506,13 @@ export default {
_equipManage(data) { _equipManage(data) {
this.$refs.equipModal._open(data) this.$refs.equipModal._open(data)
}, },
_viewRecord(originalRecordId) { _viewRecord(recordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
layx.iframe( layx.iframe(
'labRecordWriteOriView', 'labRecordWriteOriView',
'原始记录预览', '原始记录预览',
Global.recordURL + Global.recordURL + '/print/v1/form/' + recordId + '?type=ENVTESTMAKE',
'/print/v1/form/' +
originalRecordId +
'?type=ENVTESTMAKE',
{ {
event: { event: {
onload: { onload: {
......
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