Skip to content

P
patzn-cloud-web-back-soil
Commit 57a2dc8e by wangweidong
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 8ae257d8 157dfe61
Showing with 276 additions and 37 deletions
pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue
......@@ -354,6 +354,12 @@ export default {
}
const result = await soilSample.queryUserList(query)
if (result) {
for (let i = 0; i < result.records.length; i++) {
console.log('---records---', result.records[i])
result.records[i].realname =
result.records[i].realname + result.records[i].mobile
this.projectLeaderName.push(result.records[i].realname)
}
this.projectLeaderData = result.records
}
},
......
pages/soil-exp-report/report-check/tabs/ExpReportCheckHis.vue
......@@ -87,7 +87,12 @@
<script>
// eslint-disable-next-line import/named
import { soilReport, soilStatistics } from '../../../../api'
import {
soilEntrust,
soilReport,
soilSample,
soilStatistics
} from '../../../../api'
import global from '../../../../api/config'
import OperationModal from '../../../../components/operation/Operation'
export default {
......@@ -124,10 +129,11 @@ export default {
selectIds: [],
selectData: [],
iconMsg: [
{ id: '', type: 'pt-a-view', name: '预览报告' },
// { id: '', type: 'pt-a-view', name: '预览PDF' },
{ id: '', type: 'pt-a-cloud', name: '附件' },
{ id: '', type: 'pt-a-clock', name: '操作日志' }
{ id: '', type: 'md-image', name: '预览报告' },
// { id: '', type: 'ios-cloud', name: '项目报告' },
{ id: '', type: 'ios-cloud', name: '附件' },
{ id: '', type: 'ios-clock', name: '操作日志' },
{ id: '', type: 'md-trash', name: '删除' }
]
}
},
......@@ -283,6 +289,25 @@ export default {
case '操作日志':
this._record(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
}
},
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await soilEntrust.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
},
// 没有生成pdf先生成在预览
......@@ -311,12 +336,13 @@ export default {
this.$refs.operationModal._open(id)
},
_getObjectKey: async function(data) {
const result = await soilStatistics.getObjectKey(data.id)
const result = await soilSample.getReport(data.id)
if (result) {
this.$openWindowModeless({
objectKey: result,
objectKey: result.objectKey,
id: data.id,
isReport: 0
isReport: 4,
idType: 11
})
}
},
......@@ -359,6 +385,9 @@ export default {
this.selectIds.push(this.selectData[i].id)
}
break
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
default:
this._page()
}
......
pages/soil-exp-report/report-issue/tabs/ExpReportIssueHis.vue
......@@ -87,7 +87,12 @@
<script>
// eslint-disable-next-line import/named
import { soilReport, soilStatistics } from '../../../../api'
import {
soilEntrust,
soilReport,
soilSample,
soilStatistics
} from '../../../../api'
import global from '../../../../api/config'
import OperationModal from '../../../../components/operation/Operation'
export default {
......@@ -124,10 +129,11 @@ export default {
selectIds: [],
selectData: [],
iconMsg: [
{ id: '', type: 'pt-a-view', name: '预览报告' },
// { id: '', type: 'pt-a-view', name: '预览PDF' },
{ id: '', type: 'pt-a-cloud', name: '附件' },
{ id: '', type: 'pt-a-clock', name: '操作日志' }
{ id: '', type: 'md-image', name: '预览报告' },
// { id: '', type: 'ios-cloud', name: '项目报告' },
{ id: '', type: 'ios-cloud', name: '附件' },
{ id: '', type: 'ios-clock', name: '操作日志' },
{ id: '', type: 'md-trash', name: '删除' }
]
}
},
......@@ -283,6 +289,25 @@ export default {
case '操作日志':
this._record(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
}
},
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await soilEntrust.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
},
// 没有生成pdf先生成在预览
......@@ -311,12 +336,13 @@ export default {
this.$refs.operationModal._open(id)
},
_getObjectKey: async function(data) {
const result = await soilStatistics.getObjectKey(data.id)
const result = await soilSample.getReport(data.id)
if (result) {
this.$openWindowModeless({
objectKey: result,
objectKey: result.objectKey,
id: data.id,
isReport: 0
isReport: 4,
idType: 11
})
}
},
......@@ -359,6 +385,9 @@ export default {
this.selectIds.push(this.selectData[i].id)
}
break
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
default:
this._page()
}
......
pages/soil-exp-report/report-make/tabs/ExpReportMakeHis.vue
......@@ -87,7 +87,12 @@
<script>
// eslint-disable-next-line import/named
import { soilReport, soilStatistics } from '../../../../api'
import {
soilEntrust,
soilReport,
soilSample,
soilStatistics
} from '../../../../api'
import global from '../../../../api/config'
import OperationModal from '../../../../components/operation/Operation'
export default {
......@@ -124,10 +129,10 @@ export default {
selectIds: [],
selectData: [],
iconMsg: [
{ id: '', type: 'pt-a-view', name: '预览报告' },
// { id: '', type: 'pt-a-view', name: '预览PDF' },
{ id: '', type: 'pt-a-cloud', name: '附件' },
{ id: '', type: 'pt-a-clock', name: '操作日志' }
{ id: '', type: 'md-image', name: '预览报告' },
{ id: '', type: 'ios-cloud', name: '附件' },
{ id: '', type: 'ios-clock', name: '操作日志' },
{ id: '', type: 'md-trash', name: '删除' }
]
}
},
......@@ -283,6 +288,25 @@ export default {
case '操作日志':
this._record(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
}
},
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await soilEntrust.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
},
// 没有生成pdf先生成在预览
......@@ -311,12 +335,13 @@ export default {
this.$refs.operationModal._open(id)
},
_getObjectKey: async function(data) {
const result = await soilStatistics.getObjectKey(data.id)
const result = await soilSample.getReport(data.id)
if (result) {
this.$openWindowModeless({
objectKey: result,
objectKey: result.objectKey,
id: data.id,
isReport: 0
isReport: 4,
idType: 11
})
}
},
......@@ -359,6 +384,9 @@ export default {
this.selectIds.push(this.selectData[i].id)
}
break
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
default:
this._page()
}
......
pages/soil-report-manage/report-audit/tabs/historyTask.vue
......@@ -71,7 +71,7 @@
<script>
// eslint-disable-next-line import/named
import { soilReport, soilStatistics } from '../../../../api'
import { soilEntrust, soilReport, soilStatistics } from '../../../../api'
import global from '../../../../api/config'
import OperationModal from '../../../../components/operation/Operation'
export default {
......@@ -108,9 +108,13 @@ export default {
selectIds: [],
selectData: [],
iconMsg: [
{ id: '', type: 'pt-a-view', name: '预览报告' },
{ id: '', type: 'pt-a-cloud', name: '附件' },
{ id: '', type: 'pt-a-clock', name: '操作日志' }
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'ios-clock',
id: '',
name: '操作日志'
},
{ id: '', type: 'md-trash', name: '删除' }
]
}
},
......@@ -263,6 +267,25 @@ export default {
case '操作日志':
this._record(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
}
},
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await soilEntrust.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
},
_record(id) {
......@@ -321,6 +344,9 @@ export default {
this.selectIds.push(this.selectData[i].id)
}
break
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
default:
this._page()
}
......
pages/soil-report-manage/report-issue/tabs/historyTask.vue
......@@ -87,7 +87,7 @@
<script>
// eslint-disable-next-line import/named
import { soilReport, soilStatistics } from '../../../../api'
import { soilEntrust, soilReport, soilStatistics } from '../../../../api'
import global from '../../../../api/config'
import OperationModal from '../../../../components/operation/Operation'
export default {
......@@ -124,10 +124,13 @@ export default {
selectIds: [],
selectData: [],
iconMsg: [
{ id: '', type: 'pt-a-view', name: '预览报告' },
// { id: '', type: 'pt-a-view', name: '预览PDF' },
{ id: '', type: 'pt-a-cloud', name: '附件' },
{ id: '', type: 'pt-a-clock', name: '操作日志' }
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'ios-clock',
id: '',
name: '操作日志'
},
{ id: '', type: 'md-trash', name: '删除' }
]
}
},
......@@ -283,6 +286,25 @@ export default {
case '操作日志':
this._record(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
}
},
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await soilEntrust.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
},
// 没有生成pdf先生成在预览
......@@ -359,6 +381,9 @@ export default {
this.selectIds.push(this.selectData[i].id)
}
break
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
default:
this._page()
}
......
pages/soil-report-manage/report-make/ReportMakeHis.vue
......@@ -72,7 +72,7 @@
</template>
<script>
import UserInfo from '../../../components/user-info-single/assignPerson'
import { soilReport } from '../../../api'
import { soilEntrust, soilReport } from '../../../api'
import Operation from '../../../components/operation/Operation'
export default {
// eslint-disable-next-line vue/no-unused-components
......@@ -95,6 +95,11 @@ export default {
type: 'ios-clock',
id: '',
name: '操作日志'
},
{
type: 'md-trash',
id: '',
name: '删除'
}
],
getPage: {},
......@@ -361,9 +366,28 @@ export default {
case '操作日志':
this._operationRecord(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
}
})
},
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await soilEntrust.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
},
_editModal(id, type, name) {
this.$refs.sampleManageModal._open(id, type, name)
},
......
pages/soil-test-manage/test-data-audit/DataAuditHis.vue
......@@ -69,7 +69,7 @@
</template>
<script>
import UserInfo from '../../../components/user-info-single/assignPerson'
import { soilTest } from '../../../api'
import { soilEntrust, soilTest } from '../../../api'
import Operation from '../../../components/operation/Operation'
import SoilSampleManageHis from './SoilSampleManageHis'
export default {
......@@ -93,6 +93,11 @@ export default {
type: 'ios-clock',
id: '',
name: '操作日志'
},
{
type: 'md-trash',
id: '',
name: '删除'
}
],
getPage: {},
......@@ -357,9 +362,28 @@ export default {
case '操作日志':
this._operationRecord(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
}
})
},
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await soilEntrust.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
},
_editModal(id, type, name) {
this.currentComponent = 'SoilSampleManageHis'
this.$nextTick(() => {
......
pages/soil-test-manage/test-data-check/DataCheckHis.vue
......@@ -69,7 +69,7 @@
</template>
<script>
import UserInfo from '../../../components/user-info-single/assignPerson'
import { soilTest } from '../../../api'
import { soilEntrust, soilTest } from '../../../api'
import Operation from '../../../components/operation/Operation'
import SoilSampleManageHis from './SoilSampleManageHis'
export default {
......@@ -93,6 +93,11 @@ export default {
type: 'ios-clock',
id: '',
name: '操作日志'
},
{
type: 'md-trash',
id: '',
name: '删除'
}
],
getPage: {},
......@@ -353,9 +358,28 @@ export default {
case '操作日志':
this._operationRecord(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
}
})
},
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await soilEntrust.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
},
_editModal(id, type, name) {
this.currentComponent = 'SoilSampleManageHis'
this.$nextTick(() => {
......
pages/soil-test-manage/test-input/TestInputHis.vue
......@@ -69,7 +69,7 @@
</template>
<script>
import UserInfo from '../../../components/user-info-single/assignPerson'
import { soilTest } from '../../../api'
import { soilEntrust, soilTest } from '../../../api'
import Operation from '../../../components/operation/Operation'
import SoilSampleManageHis from './SoilSampleManageHis'
export default {
......@@ -93,6 +93,11 @@ export default {
type: 'ios-clock',
id: '',
name: '操作日志'
},
{
type: 'md-trash',
id: '',
name: '删除'
}
],
getPage: {},
......@@ -357,9 +362,28 @@ export default {
case '操作日志':
this._operationRecord(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
}
})
},
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await soilEntrust.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
},
_editModal(id, type, name) {
this.currentComponent = 'SoilSampleManageHis'
this.$nextTick(() => {
......
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