Skip to content

P
patzn-cloud-web-back-soil
Commit 1122094a by lichengming
Options

修改了中海油服项目

parent 7099ca8d
Showing with 180 additions and 30 deletions
api/soil/soil-entrust.js
......@@ -8,6 +8,7 @@ import { https } from '../https'
export default {
// page
page: data => http.post('soil/v1/entrust/page', data).then(res => res),
pageItem: data => http.post('soil/v1/experiment/page', data).then(res => res),
pageReview: data =>
http.post('soil/v1/entrust/page_review', data).then(res => res),
pageSampleReceive: data =>
......@@ -68,5 +69,17 @@ export default {
photoView: data =>
http
.get('soil/v1/sample_photo/view?objectKey=' + data.objectKey)
.then(res => res)
.then(res => res),
// 试样制备表
preparePage: data =>
http
.post('soil/v1/sample/obtain_prepare_data?ids=' + data)
.then(res => res),
// 试样制备完成
savePrepare: data =>
https
.post('soil/v1/sample/prepare_ok', JSON.stringify(data))
.then(res => res),
// 试验室按样品分页列表
pageTake: data => http.post('soil/v1/sample/page_take', data).then(res => res)
}
components/file/photo-manage/PhotoList.vue
......@@ -123,17 +123,17 @@
</Spin>
</div>
<!--图片预览-->
<!-- <div>-->
<!-- <vue-gallery-slideshow :images="imgViewList" :index="imgViewIndex"-->
<!-- @close="imgViewIndex = null"></vue-gallery-slideshow>-->
<!-- </div>-->
<div>
<vue-gallery-slideshow :images="imgViewList" :index="imgViewIndex"
@close="imgViewIndex = null"></vue-gallery-slideshow>
</div>
</div>
</template>
<script>
// import VueGallerySlideshow from 'vue-gallery-slideshow'
import global from '../../../api/config'
import { meterEntrust, soilEntrust } from '../../../api'
import { meterEntrust } from '../../../api'
/**
* 公共组件modal 弹框（支持上传，下载，预览，删除附件等操作）
*/
......@@ -217,6 +217,7 @@ export default {
this.idsObj = idsObj
this.urlData = data
this.action = global.baseURL + data.uploadFileUrl + data.id
this.downloadFileUrlFile = data.downloadFileUrl
this.$nextTick(() => {
this._page()
})
......@@ -294,14 +295,18 @@ export default {
}
},
// 预览图片（该合同下所有的）
// _viewImg(data) {
_viewImg: async function(data) {
console.log(data)
const viewKey = {}
viewKey.objectKey = data.objectKey
console.log(viewKey)
const result = await soilEntrust.photoView(viewKey)
console.log(result)
_viewImg(data) {
// _viewImg: async function(data) {
// console.log(data)
// const viewKey = {}
// viewKey.objectKey = data.objectKey
// console.log(viewKey)
// const result = await soilEntrust.photoView(viewKey)
// console.log(result)
const imgViewList = []
imgViewList.push(global.baseURL + this.downloadFileUrlFile + data.id)
this.imgViewList = imgViewList
this.imgViewIndex = 0
// if (this.urlData.viewUri === '/meter/v1/entrust_attachment/preview/') {
// const id = data.entrustId
// const result = await meterEntrust.entrustPreview(id)
......
pages/meter-aptitude/item-manage/ItemManageEdit.vue
......@@ -8,6 +8,12 @@
<Form-item label="试验名称" prop="name" class="width-48">
<Input v-model="formObj.name" name="name" placeholder="请输入试验名称"/>
</Form-item>
<Form-item label="检测科室" prop="groupName" class="width-48">
<Input v-model="formObj.groupName" name="groupName" placeholder="请输入试验名称"/>
</Form-item>
<Form-item label="检测依据" prop="testBasis" class="width-48">
<Input v-model="formObj.testBasis" name="testBasis" placeholder="请输入试验名称"/>
</Form-item>
<Form-item label="英文名称" prop="elName" class="width-48">
<Input v-model="formObj.elName" name="elName"
placeholder="请输入英文名称"/>
......@@ -57,7 +63,9 @@ export default {
shortName: '',
mainType: '',
smallType: '',
testMethod: ''
testMethod: '',
groupName: '',
testBasis: ''
},
ruleValidate: {
name: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }]
......
pages/meter-entrust/SoilSampleItemManage.vue
......@@ -9,16 +9,16 @@
<Row>
<!--查询-->
<Col span="24">
<Form v-show="searchOpen" id="search-sample-company" inline onsubmit="return false" :label-width="90">
<Form id="search-sample-company" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item label="检测项目:" class="search-item">
<Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" />
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
</Form-item>
<Form-item label="检测依据:" class="search-item">
<Input v-model="formObj.code" placeholder="请输入检测依据" clearable @on-enter="_formSearch" />
<Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入检测依据" clearable />
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_formSearch">
<Button @click="_formSearch" type="primary">
搜索
</Button>
</Form-item>
......@@ -26,7 +26,7 @@
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" class="contHide" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick"></btn-list>
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
</Col>
<!-- 表格 -->
<Col span="24">
......@@ -44,7 +44,7 @@
<a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
</div>
<div v-else-if="item.key==='epibolyItem'" @click.stop="_handleRow(scope)">
<el-select v-if="showOption" v-model="scope.row.epibolyItem" placeholder="请选择" @change="_optionChange(scope.row)">
<el-select v-if="showOption" v-model="scope.row.epibolyItem" @change="_optionChange(scope.row)" placeholder="请选择">
<el-option
v-for="(item,index) in subOptions"
:key="index"
......@@ -66,35 +66,35 @@
<div v-else-if="item.key==='code'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.code"
@blur="_codeEdit({id:scope.row.id, obj :{code:scope.row.code}})"
style="width: 130px;"
blur
placeholder="请选择检测依据"
@blur="_codeEdit({id:scope.row.id, obj :{code:scope.row.code}})"
/>
<i style="cursor: pointer;font-size: 14px;" class="icons iconfont pt-search icon-search" @click.stop="_selectjudgeBasis(scope.row.id,scope.$index)"></i>
<i @click.stop="_selectjudgeBasis(scope.row.id,scope.$index)" style="cursor: pointer;font-size: 14px;" class="icons iconfont pt-search icon-search"></i>
</div>
<div v-else-if="item.key==='compareSymbol'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.compareSymbol"
@blur="_compareSymbolEdit({id:scope.row.id, obj :{compareSymbol:scope.row.compareSymbol}})"
blur
placeholder="请输入比较符"
@blur="_compareSymbolEdit({id:scope.row.id, obj :{compareSymbol:scope.row.compareSymbol}})"
/>
</div>
<div v-else-if="item.key==='limitValue'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.limitValue"
@blur="_limitValueEdit({id:scope.row.id, obj :{limitValue:scope.row.limitValue}})"
blur
placeholder="请输入限值"
@blur="_limitValueEdit({id:scope.row.id, obj :{limitValue:scope.row.limitValue}})"
/>
</div>
<div v-else-if="item.key==='unit'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.unit"
@blur="_unitEdit({id:scope.row.id, obj :{unit:scope.row.unit}})"
blur
placeholder="请输入单位"
@blur="_unitEdit({id:scope.row.id, obj :{unit:scope.row.unit}})"
/>
</div>
<div v-else>
......@@ -472,7 +472,9 @@ export default {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj = this.$serializeForm(this.formObj)
this.formObj.sampleId = this.sampleId
const result = await soilEntrust.page(this.$serializeForm(this.formObj))
const result = await soilEntrust.pageItem(
this.$serializeForm(this.formObj)
)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......
pages/soil-sample-manage/SoilSampleManage.vue
......@@ -79,6 +79,7 @@
</Modal>
<SoilSampleItemManage ref="sampleItemManage" @on-result-change="_page"></SoilSampleItemManage>
<DescribeDetailModal ref="writeDetailModal" @on-result-change="_page"></DescribeDetailModal>
<PreparationModal ref="preModal" @on-result-change="_page"></PreparationModal>
</div>
</template>
<script>
......@@ -87,9 +88,10 @@ import { soilEntrust } from '../../api'
import { getLodop } from '../../plugins/clodop/LodopFuncs'
import SoilSampleItemManage from './SoilSampleItemManage'
import DescribeDetailModal from './sample-preparation/DescribeDetailModal'
import PreparationModal from './sample-preparation/Preparation'
let LODOP
export default {
components: { SoilSampleItemManage, DescribeDetailModal },
components: { SoilSampleItemManage, DescribeDetailModal, PreparationModal },
data() {
return {
formId: 'soilSampleManage',
......@@ -244,6 +246,7 @@ export default {
this._printLabel()
break
case '试样制备':
this._samplePre()
break
case '批量填写土质描述详情':
this._writeDetail(this.selectIds)
......@@ -266,6 +269,13 @@ export default {
}
})
},
_samplePre() {
if (this.selectIds.length === 0) {
this.$message.warning('至少选择一条数据')
} else {
this.$refs.preModal._open(this.selectIds.join(','))
}
},
_writeDetail(id) {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选中一条样品数据！')
......
pages/soil-sample-manage/sample-preparation/SamplePreparation.vue
......@@ -60,7 +60,11 @@ import Operation from '../../../components/operation/Operation'
import SoilSampleManage from '../SoilSampleManage'
import SamplePreparationEdit from './SamplePreparationEdit'
export default {
components: { Operation, SamplePreparationEdit, SoilSampleManage },
components: {
Operation,
SamplePreparationEdit,
SoilSampleManage
},
data() {
return {
currentComponent: '',
......
pages/soil-sample-manage/sample-take/SampleTakeIndex.vue 0 → 100644
<template>
<div>
<div class="layout-content-padding">
<div class="layout-content-main">
<el-tabs v-model="activeName" @tab-click="_changeTabs">
<el-tab-pane label="按委托接收" name="entrust">
<ReceiveByEntrust ref="entrustTabs"></ReceiveByEntrust>
</el-tab-pane>
<el-tab-pane label="按样品接收" name="sample">
<ReceiveBySample ref="sampleTabs"></ReceiveBySample>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</template>
<script>
import ReceiveByEntrust from './TakeByEntrust'
import ReceiveBySample from './TakeBySample'
export default {
name: 'MeterSummaryEntrustIndex',
components: {
ReceiveByEntrust,
ReceiveBySample
},
data() {
return {
activeName: 'entrust'
}
},
mounted() {
this.activeName = 'entrust'
this._page()
},
methods: {
_changeTabs(tab, event) {
if (tab.name === 'entrust') {
this._page()
} else {
this.$refs.sampleTabs._page()
}
},
_page() {
this.$refs.entrustTabs._page()
}
}
}
</script>
<style scoped>
</style>
pages/soil-sample-manage/surplus-manage/SampleSurplusIndex.vue 0 → 100644
<template>
<div>
<div class="layout-content-padding">
<div class="layout-content-main">
<el-tabs v-model="activeName" @tab-click="_changeTabs">
<el-tab-pane label="余样管理" name="wait">
<SampleBackupsManage ref="waitTabs"></SampleBackupsManage>
</el-tab-pane>
<el-tab-pane label="余样查询" name="query">
<SampleBackupsQuery ref="queryTabs"></SampleBackupsQuery>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</template>
<script>
import SampleBackupsManage from './tab/SampleSurplusManage'
import SampleBackupsQuery from './tab/SampleSurplusQuery'
export default {
components: {
SampleBackupsManage,
SampleBackupsQuery
},
data() {
return {
activeName: 'wait'
}
},
mounted() {
this.activeName = 'wait'
this.$refs.waitTabs._page()
},
methods: {
_changeTabs(tab, event) {
if (tab.name === 'wait') {
this.$refs.waitTabs._page()
} else if (tab.name === 'applyRecord') {
// this.$refs.applyRecordTabs._page()
} else {
this.$refs.queryTabs._page()
}
}
}
}
</script>
router/soil-routes.js
......@@ -11,6 +11,8 @@ import SampleReceiveIndex from '../pages/soil-sample-manage/sample-receive/Sampl
import SamplePreparationIndex from '../pages/soil-sample-manage/sample-preparation/SamplePreparationIndex'
import AddressManage from '../pages/soil-sample-manage/sample-address/AddressManage'
import BackupsManage from '../pages/soil-sample-manage/backups-manage/SampleBackupsIndex'
import SampleTakeIndex from '../pages/soil-sample-manage/sample-take/SampleTakeIndex'
import SurplusManage from '../pages/soil-sample-manage/surplus-manage/SampleSurplusIndex'
import Blank from '~/pages/blank'
export default [
{
......@@ -50,7 +52,7 @@ export default [
},
{
path: 'take',
component: workbench,
component: SampleTakeIndex,
meta: { title: '试验室领样' }
},
{
......@@ -59,6 +61,11 @@ export default [
meta: { title: '备样管理' }
},
{
path: 'surplus',
component: SurplusManage,
meta: { title: '余样管理' }
},
{
path: 'receive_location',
component: AddressManage,
meta: { title: '收样位置管理' }
......
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