Skip to content

P
patzn-cloud-web-back-soil
Commit 2d8ef824 by lichengming
Options

修改了制备审核

parent 070f1e66
Showing with 433 additions and 72 deletions
api/soil/soil-entrust.js
......@@ -31,8 +31,16 @@ export default {
http.post('soil/v1/entrust/page_sample_receive_his', data).then(res => res),
pageSamplePrepare: data =>
http.post('soil/v1/entrust/page_sample_prepare', data).then(res => res),
pageSamplePrepareCheck: data =>
http
.post('soil/v1/entrust/page_sample_prepare_check', data)
.then(res => res),
pageSamplePrepareHis: data =>
http.post('soil/v1/entrust/page_sample_prepare_his', data).then(res => res),
pageSamplePrepareCheckHis: data =>
http
.post('soil/v1/entrust/page_sample_prepare_check_his', data)
.then(res => res),
getById: data => http.get('soil/v1/entrust/' + data).then(res => res),
getVOById: data => http.get('soil/v1/entrust/vo/' + data).then(res => res),
deleteById: data =>
......@@ -81,6 +89,8 @@ export default {
http.post('soil/v1/sample/send_sample', data).then(res => res),
pagePrepare: data =>
http.post('soil/v1/sample/page_prepare', data).then(res => res),
pagePrepareCheck: data =>
http.post('soil/v1/sample/page_prepare_check', data).then(res => res),
pagePrepareHis: data =>
http.post('soil/v1/sample/page_prepare_his', data).then(res => res),
pagePrepareDetailHis: data =>
......
api/soil/soil-sample.js
......@@ -179,5 +179,18 @@ export default {
pageSecondaryHis: data =>
http.post('soil/v1/prepare/page_secondary_his', data).then(res => res),
sampleDeleteById: data =>
http.delete('soil/v1/sample/?ids=' + data).then(res => res)
http.delete('soil/v1/sample/?ids=' + data).then(res => res),
// 制备审核通过
prepareCheckOk: data =>
http.post('soil/v1/sample/prepare_check_ok?ids=' + data).then(res => res),
// 制备审核驳回
prepareCheckBack: data =>
http
.post(
'soil/v1/sample/prepare_check_back?ids=' +
data.ids +
'&remark=' +
data.remark
)
.then(res => res)
}
pages/soil-sample-manage/sample-preparation-check/SampleManage.vue
......@@ -4,14 +4,7 @@
class="zIndex-900 modal-footer-none">
<p slot="header">管理样品</p>
<div>
<el-tabs v-model="activeName" @tab-click="_changeTabs">
<el-tab-pane label="制备管理" name="prepareManage">
<SoilSampleManage ref="prepareManage"></SoilSampleManage>
</el-tab-pane>
<el-tab-pane label="原始记录填写" name="recordModal">
<RecordWrite ref="recordModal"></RecordWrite>
</el-tab-pane>
</el-tabs>
<!-- <keep-alive>-->
<!-- &lt;!&ndash; eslint-disable-next-line vue/require-component-is &ndash;&gt;-->
<!-- <component ref="refModal" :is="currentComponent"></component>-->
......@@ -21,12 +14,10 @@
</div>
</template>
<script>
import SoilSampleManage from '../SoilSampleManageTab'
import RecordWrite from './sample-preparation-record/RecordIndex'
import SoilSampleManage from './SoilSampleManage'
export default {
components: {
SoilSampleManage,
RecordWrite
SoilSampleManage
},
data() {
return {
......@@ -36,9 +27,7 @@ export default {
showSampleModal: false,
modalTitle: '',
selectIds: [],
activeName: 'prepareManage',
name: '',
currentComponent: ''
name: ''
}
},
mounted() {},
......@@ -48,7 +37,6 @@ export default {
this.name = name
this.showSampleModal = true
this.entrustId = entrustId // 委托id
this.activeName = 'prepareManage'
this.selectIds = []
this._preparePage()
},
......@@ -56,23 +44,8 @@ export default {
_preparePage() {
this.$refs.prepareManage._open(this.entrustId)
},
// 原始记录填写
_recordPage() {
this.$refs.recordModal._open(this.entrustId)
},
_changeTabs(tab, event) {
if (tab.name === 'prepareManage') {
// this._issuedPage()
this.$refs.prepareManage._open(this.entrustId)
this.$refs.recordModal._clearTable()
} else {
this.$refs.recordModal._open(this.entrustId)
}
},
// 关闭弹框的时候刷新上个界面
_visibleChange(data) {
if (data === false) {
}
this.$emit('on-result-change')
}
}
}
......
pages/soil-sample-manage/sample-preparation-check/SamplePreparation.vue
......@@ -60,8 +60,6 @@ import Operation from '../../../components/operation/Operation'
import global from '../../../api/config'
import SampleManage from './SampleManage'
import SamplePreparationEdit from './SamplePreparationEdit'
import SoilSampleItemManageEdit from './SoilSampleItemManageEdit'
import SoilEntrustItemNum from './SoilItemNum'
export default {
components: {
// eslint-disable-next-line vue/no-unused-components
......@@ -69,11 +67,7 @@ export default {
// eslint-disable-next-line vue/no-unused-components
SamplePreparationEdit,
// eslint-disable-next-line vue/no-unused-components
SampleManage,
// eslint-disable-next-line vue/no-unused-components
SoilSampleItemManageEdit,
// eslint-disable-next-line vue/no-unused-components
SoilEntrustItemNum
SampleManage
},
data() {
return {
......@@ -88,16 +82,6 @@ export default {
name: '试样列表'
},
{
type: 'ios-apps',
id: '',
name: '试验项目列表'
},
{
type: 'ios-calculator-outline',
id: '',
name: '项目量统计'
},
{
type: 'ios-download',
id: '',
name: '导出开土制备记录'
......@@ -182,12 +166,6 @@ export default {
case '编辑':
this._editModal(true, data.id)
break
case '试验项目列表':
this._itemManage(data.id)
break
case '项目量统计':
this._itemNumManage(data.id)
break
case '导出开土制备记录':
this._exportPrepare(data.id)
break
......@@ -315,7 +293,7 @@ export default {
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await soilEntrust.pageSamplePrepare(
const result = await soilEntrust.pageSamplePrepareCheck(
this.$serializeForm(this.formObj)
)
if (result) {
......@@ -346,20 +324,6 @@ export default {
this.$refs.editModal._open()
}
},
// 追加项目
_itemManage(data) {
this.currentComponent = 'SoilSampleItemManageEdit'
this.$nextTick(() => {
this.$refs.refModal._openByEntrustId(data)
})
// this.$refs.itemManageModal._openByEntrustId(data)
},
_itemNumManage(data) {
this.currentComponent = 'SoilEntrustItemNum'
this.$nextTick(() => {
this.$refs.refModal._open(data)
})
},
_uploadPhoto(data) {
// 上传照片文件
this.currentComponent = 'PhotoManage'
......
pages/soil-sample-manage/sample-preparation-check/SamplePreparationHis.vue
......@@ -250,7 +250,7 @@ export default {
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await soilEntrust.pageSamplePrepareHis(this.formObj)
const result = await soilEntrust.pageSamplePrepareCheckHis(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......
pages/soil-sample-manage/sample-preparation-check/SoilSampleManage.vue 0 → 100644
<template>
<div>
<div>
<!--内容-->
<Row>
<!--查询-->
<Col span="24">
<Form id="search-sample-company" v-show="searchOpen" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item label="试样编号:" class="search-item">
<Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable />
</Form-item>
<Form-item class="search-btn">
<Button @click="_page" type="primary">
搜索
</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
</Col>
<!-- 表格 -->
<Col span="24">
<PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" is-edit select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
:field="item.key"
:title="item.title"
:width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined"
:edit-render="item.editCell?{autofocus: 'input'}:null" sortable>
<template v-slot:edit="scope">
<div v-if="item.key==='describeDetail'" @click.stop="_handleRow(scope)">
<!-- <el-input v-model="scope.row.describeDetail" @change="_inputChange(scope.row)" placeholder="请输入土质描述详情">-->
<!-- </el-input>-->
<Input :value="scope.row.describeDetail" @change.native="_inputChange($event.target.value,scope.row)"></Input>
</div>
<div v-else-if="item.key==='remark'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.remark" @change="_remarkChange(scope.row)"></el-input>
</div>
</template>
<template slot-scope="scope">
<div v-if="item.detail">
<a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
</div>
<div v-else-if="item.status">
{{ scope.row[item.key].display }}
</div>
<div v-else-if="item.date">
{{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
</div>
<div v-else>
{{ scope.row[item.key] }}
</div>
</template>
</vxe-table-column>
</PTVXETableHeight>
</Col>
</Row>
</div>
<SoilSampleItemManage ref="sampleItemManage" @on-result-change="_page"></SoilSampleItemManage>
<DescribeDetailModal ref="writeDetailModal" @on-result-change="_page"></DescribeDetailModal>
<Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
</div>
</template>
<script>
import Reason from '../../../components/base/Reason'
import { soilEntrust, soilSample } from '../../../api'
import SoilSampleItemManage from '../SoilSampleItemManage'
import DescribeDetailModal from '../sample-preparation/DescribeDetailModal'
export default {
components: {
SoilSampleItemManage,
DescribeDetailModal,
Reason
},
data() {
return {
formId: 'soilSampleManage',
currentComponent: '',
btn: [
{
type: 'success',
id: '',
name: '通过'
},
{
type: 'error',
id: '',
name: '驳回'
}
],
itemList: [],
indexList: [],
currentIndex: -1,
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '确定', type: 'primary' }
],
iconMsg: [
{
type: 'ios-beaker',
id: '',
name: '管理检测项目'
}
],
contractId: '', // 委托id
showModal: false,
recordHis: false,
searchOpen: true,
modalTitle: '管理样品',
selectIds: [],
selectData: {},
getPage: {},
pageColumns: [
{ title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
{ title: '试样深度', key: 'sampleDepth', width: 100 },
{ title: '现场编号', key: 'siteNo', width: 100 },
{ title: '试验项目', key: 'experimentNames', width: 110 },
{ title: '试验项目简写', key: 'experimentShortNames', width: 120 },
{ title: '土质描述', key: 'sampleDescribe', width: 160 },
{
title: '土质描述详情',
key: 'describeDetail',
width: 200,
editCell: true
},
{
title: '备注',
key: 'remark',
width: 200,
editCell: true
},
{ title: '样品包装类型', key: 'samplePack', width: 120 }
],
sampleId: '',
dateList: [],
formObj: {
name: undefined,
sampleCode: undefined
}
}
},
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('search')
} else {
return this.$tableHeight('noSearch')
}
}
},
mounted() {
this.$refs.pageTable._showLoading()
},
methods: {
_inputChange: async function(info, data) {
this.getPage.records[data.index].describeDetail = info
const result = await soilEntrust.sampleEdit({
id: data.id,
describeDetail: info
})
if (result) {
this.$Message.success('修改成功')
}
},
_remarkChange: async function(info) {
const result = await soilEntrust.sampleRemarkEdit({
id: info.id,
remark: info.remark
})
if (result) {
// this._resultChange('修改成功')
}
},
_handleRow(data) {
this.currentRow = data.row
this.currentIndex = data.rowIndex
},
_footerResult(name) {
switch (name) {
case '取消':
this._cancel()
break
case '确定':
this._ok()
break
}
},
_visibleChange(data) {
if (data === false) {
this.$emit('on-result-change')
}
},
_cancel() {
this.showModal = false
},
_ok() {
this.showModal = false
this.$refs.footerModal._hideLoading()
console.log(this.getPage)
},
_itemImportBack(data) {
if (this.selectIds === undefined || this.selectIds.length === 0) {
return false
}
if (data === undefined || data.length === 0) {
return false
}
this._importItemOk({ sampleIds: this.selectIds, drugItemList: data })
},
_modalResult(data1, data2) {
switch (this.currentComponent) {
case 'CopyModal':
if (data1 === 0) {
this._copySample(data2)
} else {
this._copyAll(data2)
}
break
default:
this._search()
}
},
_dateChange(data) {
this.formObj.ctimeBegin = data[0]
this.formObj.ctimeEnd = data[1]
},
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '通过':
this._pass()
break
case '驳回':
this._back()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_back() {
// 退回
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条委托！')
} else {
this.$refs.reasonModal._open('退回原因')
}
},
_reasonResult(data) {
this.$refs.pageTable._showLoading()
if (undefined !== data && data !== '') {
this._reportCheckBack(data)
}
},
_reportCheckBack: async function(data) {
const result = await soilSample.prepareCheckBack({
ids: this.selectIds,
remark: data
})
if (result) {
this.$Message.success('退回成功！')
await this._page()
this.$refs.pageTable._hideLoading()
}
},
_pass() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定通过？',
onOk: () => {
this._passPrepare()
this.$refs.pageTable._showLoading()
}
})
}
},
_passPrepare: async function() {
const result = await soilSample.prepareCheckOk(this.selectIds.join(','))
if (result) {
this.$Message.success('审核通过')
this._page()
this.$refs.pageTable._hideLoading()
}
},
_writeDetail(id) {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选中一条样品数据！')
} else {
const ids = id.join(',')
this.$refs.writeDetailModal._open(ids)
}
},
_iconClick(res, data, componentName, index) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '管理检测项目':
this._itemManage(data.id)
break
}
})
},
_itemManage(data) {
// 管理检测项目
if (this.recordHis) {
this.$refs.sampleItemManage._openRecord(data)
} else {
this.$refs.sampleItemManage._open(data)
}
},
_tableResultChange(msg, data) {
switch (msg) {
case 'selectData':
const selectIds = []
for (let i = 0; i < data.length; i++) {
selectIds.push(data[i].id)
}
this.selectIds = selectIds
this.selectData = data
break
case 'allSelect':
console.log('123465798', data)
this.allSelect(data)
break
case 'iconClick':
this._iconClick(data.name, data.rowData)
break
case 'changeSize':
this._page()
break
}
},
allSelect(data) {
this.indexList = []
for (let i = 0; i < data.length; i++) {
this.indexList.push(data[i].index)
}
console.log('索引', this.indexList)
},
_open(id) {
this.formObj = this.$resetFields(this.formObj)
this.dateList = []
this.contractId = id // 委托id
console.log(this.contractId)
this.$refs.pageTable._hideLoading()
this._page()
},
_openHis(id) {
this.formObj = this.$resetFields(this.formObj)
this.dateList = []
this.showModal = true
this.contractId = id // 委托id
console.log(this.contractId)
this.$refs.pageTable._hideLoading()
this.recordHis = true
this._page()
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.entrustId = this.contractId
const result = await soilEntrust.pagePrepareCheck(
this.$serializeForm(this.formObj)
)
if (result) {
this.getPage = result
this.$refs.pageTable._hideLoading()
}
},
_search() {
this._page()
},
_resultChange(msg) {
this.$Message.success(msg)
this._page()
}
}
}
</script>
pages/soil-sample-manage/sample-preparation/Preparation.vue
......@@ -36,7 +36,7 @@
placeholder="输入或选择制备方式"></AutoComplete>
</div>
<div v-else-if="item.key==='printNum'" @click="_handleRow(scope)">
<el-input v-model="scope.row.printNum" name="printNum" placeholder="输入打印数量">
<el-input v-model="scope.row.printNum" @input="inputChange(scope)" name="printNum" placeholder="输入打印数量">
</el-input>
</div>
<div v-else-if="item.key==='unit'" @click="_handleRow(scope)">
......@@ -149,6 +149,7 @@ export default {
getPage: {
records: []
},
currentIndex: -1,
selectData: [],
selectIds: [],
pageColumns: [
......@@ -206,6 +207,10 @@ export default {
this.$refs.pageTable._showLoading()
},
methods: {
inputChange(data) {
this.$forceUpdate()
this.getPage.records[data.$rowIndex].printNum = data.row.printNum
},
// 获取存储位置
_locationChange(msg, data, handleObj) {
this.currentRow = handleObj
......@@ -332,6 +337,7 @@ export default {
console.log(result[j].prepareDate)
console.log(new Date(result[j].prepareDate))
this.getPage.records[j].prepareDate = new Date(result[j].prepareDate)
this.getPage.records[j].printNum = 1
}
this.$refs.pageTable._hideLoading()
}
......
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