Skip to content

P
patzn-cloud-web-back-soil
Commit 7b7fc2e8 by lichengming
Options

修改了试样检测

parent 5a105f4a
Showing with 225 additions and 16 deletions
api/soil/soil-test.js
...@@ -19,5 +19,7 @@ export default { ...@@ -19,5 +19,7 @@ export default {
pageAllot: data => pageAllot: data =>
http.post('soil/v1/experiment/page_allot', data).then(res => res), http.post('soil/v1/experiment/page_allot', data).then(res => res),
pageExpTest: data => pageExpTest: data =>
http.post('soil/v1/entrust/page_exp_test', data).then(res => res) http.post('soil/v1/entrust/page_exp_test', data).then(res => res),
samplePage: data => http.post('soil/v1/sample/page', data).then(res => res),
pageItem: data => http.post('soil/v1/experiment/page', data).then(res => res)
} }
pages/meter-entrust/SoilSampleManage.vue
...@@ -129,13 +129,6 @@ export default { ...@@ -129,13 +129,6 @@ export default {
selectData: {}, selectData: {},
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{
title: '样品编号',
key: 'num',
width: 180,
detail: true,
fixed: 'left'
},
{ title: '试样编号', key: 'sampleCode', width: 160, fixed: 'left' }, { title: '试样编号', key: 'sampleCode', width: 160, fixed: 'left' },
{ title: '试样深度', key: 'sampleDepth', width: 160 }, { title: '试样深度', key: 'sampleDepth', width: 160 },
{ title: '土质描述', key: 'sampleDescribe', width: 160 }, { title: '土质描述', key: 'sampleDescribe', width: 160 },
......
pages/soil-test-manage/test-input/tabs/dataEntry.vue 0 → 100644
<template>
<div>
<Modal v-model="showModal" width="1000">
<p slot="header">
{{ modalTitle }}
</p>
<Row>
<!--查询-->
<Col span="24">
<Form
v-show="searchOpen"
:label-width="70"
inline
onsubmit="return false"
class="search-form"
>
<label class="label-sign" />
<Form-item class="search-item" label="样本号:">
<Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样本号" clearable />
</Form-item>
<Form-item class="search-item" label="样品名称:">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable />
</Form-item>
<!-- <Form-item label="检测类型:" class="search-item" prop="category">-->
<!-- <Input v-model="formObj.category" placeholder="请输入检测类型" clearable @on-enter="_formSearch" />-->
<!-- </Form-item>-->
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">
搜索
</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" show-search-btn="true" style="height: 30px;" />
</Col>
<!--table-->
<Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
:field="item.key"
:title="item.title"
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope">
<!-- <template v-if="item.dateTime">-->
<!-- {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }}-->
<!-- </template>-->
<template v-if="item.status">
{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}
</template>
<template v-else-if="item.key==='sampleType'">
<span v-if="scope.row[item.key]==='HY'">
化学药品
</span>
<span v-else-if="scope.row[item.key]==='HG'">
有机化工品
</span>
<span v-else>
{{ scope.row[item.key] }}
</span>
</template>
<template v-else-if="item.key === 'allInput'">
{{ scope.row[item.key]?scope.row[item.key] === "f" ? '未全部录入': '已全部录入':'' }}
</template>
<template v-else-if="item.key==='judged'">
{{ scope.row[item.key]===1?'是':'否' }}
</template>
<template v-else>
{{ scope.row[item.key] }}
</template>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
<fillResult ref="resultModal" @on-result-change="_formSearch" />
</Modal>
</div>
</template>
<script>
import { soilTest } from '../../../../api'
import fillResult from '../fillResult'
export default {
components: { fillResult },
data() {
return {
searchOpen: true,
showModal: false,
formObj: {
sampleCode: '',
name: '',
category: ''
},
btn: [
// { type: 'primary', id: '', name: '提交至复核' }
],
selectIds: [],
pageColumns: [
{ title: '试样编号', key: 'sampleCode', fixed: 'left' },
{ title: '试样深度', key: 'sampleDepth' },
{ title: '土质描述', key: 'sampleDescribe' },
{ title: '样品包装类型', key: 'samplePack' },
{ title: '现场编号', key: 'siteNo' }
// { title: '录入时间', key: '', dateTime: true }
],
getPage: {},
iconMsg: [
{ type: 'md-create', id: '', name: '填写结果' },
{ type: 'md-clock', id: '', name: '操作日志' }
],
typeList: [
{ value: 'ORIGINAL', label: '进场原料' },
{ value: 'OTHER', label: '其他原料' }
]
}
},
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('', 305)
} else {
return this.$tableHeight('', 261)
}
}
},
methods: {
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
_open(id) {
this.showModal = true
this._page(id)
},
_page: async function(id) {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.entrustId = id
const result = await soilTest.samplePage(
this.$serializeForm(this.formObj)
)
if (result) {
this.getPage = result
this.$refs.pageTable._hideLoading()
}
},
_searchParams(formId) {
return this.$refs.pageTable._searchParams(formId)
},
_tableResultChange(msg, data) {
const selectIds = []
switch (msg) {
case 'page':
this._page()
break
case 'iconClick':
this._iconClick(data.name, data.rowData)
break
case 'selectData':
for (let i = 0; i < data.length; i++) {
selectIds.push(data[i].id)
}
this.selectIds = selectIds
this.selectData = data
break
// case 'selectIds':
// this.selectIds = data
// break
}
},
_btnClick(msg) {
switch (msg) {
case '提交至复核':
this._submitToCheck()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
},
_submitToCheck() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定提交至复核？',
onOk: async () => {
const result = await soilTest.submitForReview(this.selectIds)
if (result) {
this.$Message.success('提交成功')
this._page()
}
}
})
}
},
_iconClick(res, data) {
switch (res) {
case '操作日志':
this._record(data.id)
break
case '填写结果':
this._fillResult(data.id)
break
}
},
_fillResult(id) {
this.$refs.resultModal._open(id)
},
// 操作日志
_record(id) {
this.$refs.recordModal._open(id)
}
}
}
</script>
pages/soil-test-manage/test-task-manage/entrust-sample-manage/SampleManage.vue
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<div> <div>
<el-tabs v-model="activeName" @tab-click="_changeTabs"> <el-tabs v-model="activeName" @tab-click="_changeTabs">
<el-tab-pane label="按项目分配" name="waitReceive"> <el-tab-pane label="按项目分配" name="waitReceive">
<WaitReceive ref="waitReceiveModal" @on-result-change="_search"></WaitReceive> <WaitReceive ref="waitReceiveModal"></WaitReceive>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="按样品分配" name="waitScan"> <el-tab-pane label="按样品分配" name="waitScan">
<WaitScan ref="waitScanModal" @-result-change="_search"></WaitScan> <WaitScan ref="waitScanModal"></WaitScan>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
...@@ -38,12 +38,6 @@ export default { ...@@ -38,12 +38,6 @@ export default {
} }
}, },
methods: { methods: {
_initTab() {
if (this.$showBtn('food-wait-Issue-sample')) {
this.activeName = 'waitScan'
this._waitSend()
}
},
_open(contractId, type, name) { _open(contractId, type, name) {
this.type = type // 类型（采样或送样） this.type = type // 类型（采样或送样）
this.name = name this.name = name
......
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