Skip to content

P
patzn-cloud-web-back-soil
Commit 345a5659 by wangweidong
Options

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

# Conflicts:
#	pages/soil-sample-manage/backups-manage/SampleParpareApply.vue
parents b295744b 02c0fdf1
Showing with 220 additions and 118 deletions
api/soil/soil-sample.js
......@@ -21,5 +21,29 @@ export default {
http.put('soil/v1/receive_location/' + data.id, data.obj).then(res => res),
// 试验室领样操作
takeSample: data =>
http.post('soil/v1/sample/take_sample?ids=' + data).then(res => res)
http.post('soil/v1/sample/take_sample?ids=' + data).then(res => res),
// 备样管理提交申请
appleHandle: data =>
http.post('soil/v1/sample_backup/apply_handle', data).then(res => res),
// 样品处理分页列表
pageBackupHandleCheck: data =>
http
.post('soil/v1/sample_backup/page_backup_handle_check', data)
.then(res => res),
// 样品处理审批通过
disposalOk: data =>
http.post('soil/v1/sample_backup/disposal_ok?ids=' + data).then(res => res),
// 样品处理审批驳回
disposalFail: data =>
http
.post(
'soil/v1/sample_backup/disposal_fail?ids=' +
data.ids +
'&reason=' +
data.remark
)
.then(res => res),
// 备样管理处理备样申请
handleOk: data =>
http.post('soil/v1/sample_backup/handle_ok?ids=' + data).then(res => res)
}
pages/soil-sample-manage/SoilSampleManage.vue
......@@ -268,7 +268,7 @@ export default {
},
_samplePre() {
if (this.selectIds.length === 0) {
this.$message.warning('至少选择一条数据')
this.$Message.warning('至少选择一条数据')
} else {
this.$refs.preModal._open(this.selectIds.join(','))
}
......@@ -334,9 +334,9 @@ export default {
}
},
_tableResultChange(msg, data) {
const selectIds = []
switch (msg) {
case 'selectData':
const selectIds = []
for (let i = 0; i < data.length; i++) {
selectIds.push(data[i].id)
}
......
pages/soil-sample-manage/sample-dispose/tab/SampleDisposeManage.vue
......@@ -25,14 +25,6 @@
</btn-list>
</Col>
<!--样品数量-->
<Col span="24">
<div style="display: flex;padding-bottom: 10px;">
<div v-for="(item,index) in contList" :key="index" class="reimbursement-item">
<p :class="item.color?item.color:''">{{item.value}}</p>
<p>{{item.name}}</p>
</div>
</div>
</Col>
<!-- 表格 -->
<Col span="24">
<PTVXETable
......@@ -114,16 +106,19 @@
</Row>
</div>
</div>
<Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
</div>
</template>
<script>
import AutoCompletes from '../../../../components/base/AutoCompletes'
import Reason from '../../../../components/base/Reason'
// eslint-disable-next-line no-unused-vars
import http from '../../../../api/http'
import { soilEntrust } from '../../../../api'
import { soilSample } from '../../../../api'
export default {
components: {
AutoCompletes
AutoCompletes,
Reason
},
data() {
return {
......@@ -137,6 +132,16 @@ export default {
btn: [
{
type: 'primary',
id: '',
name: '完成处理'
},
{
type: '',
id: '',
name: '驳回'
},
{
type: 'primary',
id: 'food-sample-preparation-his-all',
name: '制备'
},
......@@ -358,6 +363,12 @@ export default {
},
_btnClick(msg) {
switch (msg) {
case '完成处理':
this._dispose()
break
case '驳回':
this._disposeBack()
break
case '制备':
this._preMethod()
break
......@@ -388,6 +399,54 @@ export default {
break
}
},
// 通过
_dispose() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定通过这 ' + this.selectIds.length + ' 条数据？',
onOk: () => {
this._disposeOk(this.selectIds.join(','))
}
})
}
},
_disposeBack() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条委托！')
} else {
this.$refs.reasonModal._open('退回原因')
}
},
_reasonResult(data) {
if (undefined !== data && data !== '') {
this._reportCheckBack(data)
}
},
_reportCheckBack: async function(data) {
const result = await soilSample.disposalFail({
ids: this.selectIds,
remark: data
})
if (result) {
this.$Message.success('退回成功！')
console.log('退回成功')
await this._page()
}
},
_disposeOk: async function(ids) {
const result = await soilSample.disposalOk(ids)
if (result) {
this._resultChange('提交成功')
}
},
_resultChange(msg) {
this.$Message.success(msg)
this._page()
},
// 制备
_preMethod() {
if (this.selectSampleIds.length === 0) {
......@@ -530,8 +589,7 @@ export default {
_page: async function() {
this.editIndex = -1
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await soilEntrust.pageBackup(
const result = await soilSample.pageBackupHandleCheck(
this.$serializeForm(this.formObj)
)
if (result) {
......
pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue
......@@ -25,14 +25,6 @@
</btn-list>
</Col>
<!--样品数量-->
<Col span="24">
<div style="display: flex;padding-bottom: 10px;">
<div v-for="(item,index) in contList" :key="index" class="reimbursement-item">
<p :class="item.color?item.color:''">{{item.value}}</p>
<p>{{item.name}}</p>
</div>
</div>
</Col>
<!-- 表格 -->
<Col span="24">
<PTVXETable
......@@ -114,6 +106,7 @@
</Row>
</div>
</div>
<SampleParpareApply ref="applyModal" @on-result-change="_page"></SampleParpareApply>
</div>
</template>
<script>
......@@ -121,9 +114,11 @@ import AutoCompletes from '../../../../components/base/AutoCompletes'
// eslint-disable-next-line no-unused-vars
import http from '../../../../api/http'
import { soilEntrust } from '../../../../api'
import SampleParpareApply from '../../backups-manage/SampleParpareApply'
export default {
components: {
AutoCompletes
AutoCompletes,
SampleParpareApply
},
data() {
return {
......@@ -137,6 +132,16 @@ export default {
btn: [
{
type: 'primary',
id: '',
name: '申请处理'
},
{
type: 'primary',
id: '',
name: '处理备样申请'
},
{
type: 'primary',
id: 'food-sample-preparation-his-all',
name: '制备'
},
......@@ -167,6 +172,7 @@ export default {
{ title: '委托商', key: 'client', width: 180 },
{ title: '委托编号', key: 'entrustCode', width: 180 },
{ title: '试样编号', key: 'sampleCode', width: 180 },
{ title: '状态', key: 'status', width: 160 },
{ title: '试样深度', key: 'sampleDepth', width: 180 },
{ title: '样品包装类型', key: 'samplePack', width: 180 },
{ title: '现场编号', key: 'siteNo', width: 180 },
......@@ -176,8 +182,7 @@ export default {
{ title: '备样人', key: 'backupUser', width: 140 },
{ title: '钻孔位置', key: 'boreholeLocation', width: 110 },
{ title: '钻孔名称', key: 'boreholeName', width: 160 },
{ title: '水深（米）', key: 'waterDepth', width: 160 },
{ title: '状态', key: 'status', width: 160 }
{ title: '水深（米）', key: 'waterDepth', width: 160 }
/* {title: '处置方式', key: 'handleMethod', width: 120,}, */
],
conditionList: [],
......@@ -358,6 +363,12 @@ export default {
},
_btnClick(msg) {
switch (msg) {
case '申请处理':
this._applyDispose()
break
case '处理备样申请':
this._handleApply()
break
case '制备':
this._preMethod()
break
......@@ -370,9 +381,6 @@ export default {
case '填写存放信息':
this._batchEdit()
break
case '申请处理':
this._handle()
break
case '导出':
if (this.getPage.records.length === 0) {
this.$Message.warning('暂无数据，不可导出')
......@@ -388,6 +396,30 @@ export default {
break
}
},
_resultChange(msg) {
this.$Message.success(msg)
this._page()
},
_applyDispose() {
if (this.selectIds.length === 0) {
this.$Message.warning('请选择一条或多条数据！')
} else {
this.$refs.applyModal._open(this.selectIds)
}
},
_handleApply() {
if (this.selectIds.length === 0) {
this.$Message.warning('请选择一条或多条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定处理这 ' + this.selectIds.length + ' 条数据？',
onOk: () => {
this._handleOk(this.selectIds.join(','))
}
})
}
},
// 制备
_preMethod() {
if (this.selectSampleIds.length === 0) {
......
plugins/global.js
......@@ -10,6 +10,7 @@ import elementTable from '../components/table/elementTable'
import modalFooter from '../components/base/modalFooter'
import PTVXETable from '../components/table/PTVXETable'
import PTVXETableHeight from '../components/table/PTVXETableHeight'
import PTVXETableTemp from '../components/table/PTVXETableTemp'
import PTVXETableData from '../components/base/PTVXETableData'
import VXEIconList from '../components/base/VXEIconList'
import FileManage from '../components/file/file-manage/FileManage'
......@@ -26,6 +27,7 @@ Vue.component('element-table-height', elementTableHeight)
Vue.component('modal-footer', modalFooter)
Vue.component('PTVXETable', PTVXETable)
Vue.component('PTVXETableHeight', PTVXETableHeight)
Vue.component('PTVXETableTemp', PTVXETableTemp)
Vue.component('PTVXETableData', PTVXETableData)
Vue.component('VXEIconList', VXEIconList)
Vue.component('VXESettingCol', VXESettingCol)
......
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