Skip to content

P
patzn-cloud-web-back-soil
Commit e8e0daf6 by wangweidong
Options

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

# Conflicts:
#	pages/soil-statistics/sample-progress/SampleProgressDetail.vue
parents 27607fb1 9e0cd698
Showing with 480 additions and 51 deletions
api/soil/soil-entrust.js
......@@ -165,5 +165,9 @@ export default {
pageWaitStorageHis: data =>
http
.post('soil/v1/alone_sample/page_wait_storage_his', data)
.then(res => res),
bathChangeStorehouse: data =>
http
.post('soil/v1/alone_sample/bath_change_storehouse', data)
.then(res => res)
}
api/soil/soil-sample.js
......@@ -262,5 +262,7 @@ export default {
pageStorehouseSample: data =>
http
.post('soil/v1/alone_sample/page_storehouse_sample', data)
.then(res => res)
.then(res => res),
aloneSampleDelete: data =>
http.delete('soil/v1/alone_sample/?ids=' + data).then(res => res)
}
components/file/file-manage/FileManageCont.vue
......@@ -111,7 +111,7 @@ export default {
viewUri: '/soil/v1/standard_annex/preview/'
}
break
case 'sampleId':
case 'aloneSampleId':
// 样品
this.entrustId = id
this.urlData = {
......
components/file/file-manage/FilesList.vue
......@@ -208,7 +208,7 @@ export default {
},
methods: {
_batchUpload() {
if (this.formObj.sampleId) {
if (this.formObj.aloneSampleId) {
this.$refs.batchUploadSample._open(this.id)
} else {
this.$refs.batchUpload._open(this.id)
......
pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManage.vue
......@@ -8,6 +8,9 @@
<!--搜索表单-->
<Form id="search-form" :label-width="90" v-show="searchOpen" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="钻孔名称:">
<Input @on-enter="_formSearch" v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入钻孔名称" clearable/>
</Form-item>
<Form-item class="search-item" label="库房号:">
<Input @on-enter="_formSearch" v-model="formObj.warehouse" name="warehouse" placeholder="请输入库房号" clearable/>
</Form-item>
......@@ -60,18 +63,25 @@
</div>
<!--组件加载-->
<ViewSample ref="viewSample"></ViewSample>
<StandardsManageEdit ref="editModal" @on-result-change="_page"></StandardsManageEdit>
<ViewDetail ref="viewDetail"></ViewDetail>
<FileManage ref="FileManage" @on-result-change="_page"></FileManage>
<BatchModal ref="batchModal" @on-result-change="_page"></BatchModal>
<stockSampleEdit ref="editModal" @on-result-change="_page"></stockSampleEdit>
</div>
</template>
<script>
import { soilSample } from '../../../api'
import StandardsManageEdit from './AddressManageEdit' // 添加、编辑
import { soilEntrust, soilSample } from '../../../api'
import ViewDetail from '../../soil-alone-sample/ViewDetail'
import ViewSample from './ViewLocationEntrust'
import stockSampleEdit from './stockSampleEdit'
import BatchModal from './BatchModal'
export default {
components: {
StandardsManageEdit,
ViewSample
stockSampleEdit,
ViewSample,
ViewDetail,
BatchModal
},
data() {
return {
......@@ -84,10 +94,9 @@ export default {
{
type: 'success',
id: '',
name: '添加',
componentName: 'StandardsManageEdit'
name: '出库'
},
{ type: 'error', id: '', name: '删除' }
{ type: 'success', id: '', name: '批量填写' }
],
// 表格
pageColumns: [
......@@ -107,9 +116,14 @@ export default {
componentName: 'StandardsManageEdit'
},
{
type: 'md-apps',
type: 'ios-list',
id: '',
name: '查看'
},
{
type: 'md-cloud',
id: '',
name: '查看试样'
name: '附件'
},
{ type: 'md-remove-circle', id: '', name: '删除' }
],
......@@ -142,6 +156,9 @@ export default {
this._editModal(false)
})
break
case '批量填写':
this._bathChange()
break
case '删除':
this._deleteSelected()
break
......@@ -159,6 +176,13 @@ export default {
break
}
},
_bathChange() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据')
} else {
this.$refs.batchModal._open(this.selectIds.join(','))
}
},
// 表格中操作
_iconClick(res, data, currentComponent) {
this.currentComponent = currentComponent
......@@ -170,28 +194,70 @@ export default {
case '查看试样':
this._viewSample(data.name)
break
case '查看':
this._viewModal(true, data.id)
break
case '附件':
this._upload(data.id)
break
case '删除':
this._deleteById(data.id)
break
}
})
},
_viewSample(data) {
this.$refs.viewSample._open(data)
_upload(id) {
// 上传文件
this.$refs.FileManage._open(id, 'aloneSampleId')
},
_editModal: async function(edit, id) {
_viewModal(edit, id) {
if (edit) {
const result = await soilSample.aloneWarehouseLocationGetById(id)
this.$refs.pageTable._showLoading()
// 编辑
this._getDetailById(id)
} else {
// 添加
this.$nextTick(() => {
this.$refs.refModal._open()
})
}
},
_getDetailById: async function(id) {
const result = await soilEntrust.aloneSampleGetById(id)
if (result) {
this.$refs.editModal._open(result)
this.$refs.viewDetail._open(result)
this.$refs.pageTable._hideLoading()
} else {
this.$refs.pageTable._hideLoading()
}
},
_viewSample(data) {
this.$refs.viewSample._open(data)
},
_editModal(edit, id) {
if (edit) {
this.$refs.pageTable._showLoading()
// 编辑
this._getById(id)
} else {
// 添加
this.$refs.editModal._open()
this.$nextTick(() => {
this.$refs.refModal._open()
})
}
},
_getById: async function(id) {
const result = await soilEntrust.aloneSampleGetById(id)
if (result) {
this.$refs.editModal._openEdit(result)
this.$refs.pageTable._hideLoading()
} else {
this.$refs.pageTable._hideLoading()
}
},
// 获取数据
_page: async function() {
this.selectIds = []
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilSample.pageStorehouseSample(
this.$serializeForm(this.formObj)
......@@ -231,7 +297,7 @@ export default {
})
},
_delOk: async function(ids) {
const result = await soilSample.aloneWarehouseLocationDelete(ids)
const result = await soilSample.aloneSampleDelete(ids)
if (result) {
this._page()
this.$Modal.remove()
......
pages/soil-alone-sample-manage/storehouse-sample-manage/BatchModal.vue 0 → 100644
<template>
<div>
<Modal v-model="showEditModal" v-drag :mask-closable="false" :width="500" class="zIndex-1200">
<p slot="header">{{modalTitle}}</p>
<div>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
<Form-item label="库房号" prop="storehouse " style="width: 100%">
<Input v-model="formObj.storehouse " name="storehouse" placeholder="请输入库房号"></Input>
</Form-item>
<Form-item label="架位号" prop="shelfCode " style="width: 100%">
<Input v-model="formObj.shelfCode " name="shelfCode" placeholder="请输入架位号"></Input>
</Form-item>
</Form>
</div>
<div slot="footer">
<ModalFooter ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></ModalFooter>
</div>
</Modal>
</div>
</template>
<script>
/**
* 添加编辑
*/
import ModalFooter from '../../../components/base/modalFooter'
import { soilAptitude, soilEntrust, soilSample } from '../../../api'
export default {
components: {
ModalFooter
},
data() {
return {
formId: '',
modalTitle: '批量填写存放架位',
formObj: {
detail: ''
},
ruleValidate: {},
showEditModal: false,
ids: '',
options: [],
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '保存', type: 'primary' }
]
}
},
methods: {
/** *modal-footer */
selectLocation(data) {
this._getLocationById(data)
},
_footerResult(name) {
switch (name) {
case '取消':
this._cancel()
break
case '保存':
this._ok()
break
}
},
_hideLoading() {
this.$refs.footerModal._hideLoading()
},
_resultChange(msg) {
this.showEditModal = false
this.$Message.success(msg)
this.$emit('on-result-change')
this._hideLoading()
},
_ok() {
this.$refs.formObj.validate(valid => {
if (valid) {
this.formObj.ids = this.ids
this._receive(this.formObj)
} else {
this.$Message.error('表单验证失败!')
this._hideLoading()
}
})
},
_receive: async function(data) {
const result = await soilEntrust.bathChangeStorehouse(data)
if (result) {
this._resultChange('填写成功!')
}
},
_save: async function(data) {
const result = await soilAptitude.standardSave(data)
if (result) {
this._resultChange('添加成功!')
}
},
_edit: async function(data) {
const result = await soilAptitude.standardEdit(data)
if (result) {
this._resultChange('编辑成功!')
}
},
_cancel() {
this._hideLoading()
this.showEditModal = false
},
_open(ids) {
this.formObj.storehouse = ''
this.formObj.shelfCode = ''
this.ids = ids
this.showEditModal = true
},
_getLocation: async function() {
const result = await soilSample.locationList()
if (result) {
console.log(result)
this.options = result
console.log(this.options)
}
},
_getLocationById: async function(id) {
console.log(id)
const result = await soilSample.locationGetById(id)
if (result) {
this.formObj.receiveLocation = result.name
}
console.log(this.formObj.receiveLocation)
},
_registerAdd() {
this.formId = this.$randomCode()
this._hideLoading()
this.$refs.formObj.resetFields()
this.modalTitle = '添加'
this.formObj.id = ''
this.formObj.type = 3
this.showEditModal = true
}
}
}
</script>
pages/soil-alone-sample/EntrustRegister.vue
......@@ -376,7 +376,7 @@ export default {
// 上传文件
this.currentComponent = 'FileManage'
this.$nextTick(() => {
this.$refs.refModal._open(id, 'sampleId')
this.$refs.refModal._open(id, 'aloneSampleId')
})
},
_getById: async function(id) {
......
pages/soil-sample-manage/sample-preparation/DescribeDetailModal.vue
......@@ -5,7 +5,7 @@
<div>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
<Form-item label="土质描述详情" prop="detail " style="width: 100%">
<el-input v-model="formObj.detail " name="detail "></el-input>
<Input v-model="formObj.detail " name="detail "></Input>
</Form-item>
</Form>
</div>
......
pages/soil-statistics/sample-progress/SampleProgressDetail.vue
......@@ -4,36 +4,45 @@
<!--查询条件-->
<Col span="24">
<div>
<Form v-show="searchOpen" :label-width="100" inline onsubmit="return false">
<Form :label-width="100" v-show="searchOpen" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item label="委托编号:" class="search-item">
<Input v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
<Form-item label="钻孔名称:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.boreholeName" placeholder="请输入钻孔名称" clearable/>
</Form-item>
<Form-item label="样品编号:" class="search-item">
<Input v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable/>
</Form-item>
<Form-item label="委托编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable/>
</Form-item>
<Form-item label="项目名称:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.projectName" placeholder="请输入项目名称" clearable/>
</Form-item>
<Form-item label="现场编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.siteNo" placeholder="请输入现场编号" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button>
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</div>
</Col>
<Col span="24">
<BtnList :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick">
<BtnList :msg="btn" :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick"
class="contHide">
</BtnList>
</Col>
<Col span="24">
<PTVXETable ref="pageTable" :page-columns="pageColumns" :table-name="tableName"
:table-height="tableHeight"
:get-page="getPage" select-data @on-result-change="_tableResultChange">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
:field="item.key"
:title="item.title"
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined"
:key="item.key"
sortable>
<template slot-scope="scope">
<div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
......@@ -69,18 +78,11 @@ export default {
userColumns: [],
searchOpen: true,
formObj: {
cname: '',
num: '',
contractName: '',
code: '',
finished: '',
reportDateBegin: '',
reportDateEnd: '',
myGroupData: 0,
name: '',
groupIds: '',
salesmans: '',
type: ''
boreholeName: undefined,
sampleCode: undefined,
entrustCode: undefined,
projectName: undefined,
siteNo: undefined
},
btn: [
{ type: 'primary', id: '', name: '导出' },
......@@ -91,6 +93,9 @@ export default {
{ title: '委托编号', key: 'entrustCode', width: 140 },
{ title: '钻孔名称', key: 'boreholeName', width: 140 },
{ title: '样品编号', key: 'sampleCode', width: 140 },
{ title: '现场编号', key: 'siteNo', width: 140 },
{ title: '项目名称', key: 'projectName', width: 140 },
{ title: '深度', key: 'sampleDepth', width: 140 },
{ title: '状态', key: 'status', width: 80, status: true },
{ title: '检测进度', key: 'testProgress', width: 160 }
],
......@@ -106,9 +111,9 @@ export default {
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('', 400)
return this.$tableHeight('', 300)
} else {
return this.$tableHeight('noSearch') + 50
return this.$tableHeight('noSearch')
}
}
},
......
pages/workbench/SampleProgressDetail.vue 0 → 100644
<template>
<div>
<Row style="border: 2px solid #EEEEEE">
<!--查询条件-->
<Col span="24">
<div>
<Form :label-width="100" v-show="searchOpen" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item label="钻孔名称:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.boreholeName" placeholder="请输入钻孔名称" clearable/>
</Form-item>
<Form-item label="样品编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable/>
</Form-item>
<Form-item label="委托编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable/>
</Form-item>
<Form-item label="项目名称:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.projectName" placeholder="请输入项目名称" clearable/>
</Form-item>
<Form-item label="现场编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.siteNo" placeholder="请输入现场编号" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</div>
</Col>
<Col span="24">
<PTVXETableHeight ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="300"
@on-result-change="_tableResultChange" :getPage="getPage" select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:field="item.key"
:title="item.title"
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined"
:key="item.key"
sortable>
<template slot-scope="scope">
<div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
<div v-else-if="item.key==='testProgress'" style="position: relative">
<Progress :percent="scope.row.testProgressPer" :stroke-width="30" status="active" hide-info>
</Progress>
<div style="position: absolute;top: 0;bottom: 0;text-align: center;width: 100%;line-height: 30px">
{{scope.row[item.key]}}
</div>
</div>
<div v-else-if="item.status">
{{scope.row[item.key]?scope.row[item.key].display:''}}
</div>
<div v-else-if="item.type">{{$sampleType(scope.row[item.key])}}</div>
<div v-else>{{scope.row[item.key]}}</div>
</template>
</vxe-table-column>
</PTVXETableHeight>
</Col>
</Row>
</div>
</template>
<script>
import { soilStatistics } from '../../api'
export default {
components: {},
data() {
return {
tableName: 'food-test-progress-table',
// 用户自己选中的列
userColumns: [],
searchOpen: true,
formObj: {
boreholeName: undefined,
sampleCode: undefined,
entrustCode: undefined,
projectName: undefined,
siteNo: undefined
},
btn: [
{ type: 'primary', id: '', name: '导出' },
{ type: 'primary', id: '', name: '催单' }
],
getPage: {},
pageColumns: [
{ title: '委托编号', key: 'entrustCode', width: 140 },
{ title: '钻孔名称', key: 'boreholeName', width: 140 },
{ title: '样品编号', key: 'sampleCode', width: 140 },
{ title: '现场编号', key: 'siteNo', width: 140 },
{ title: '项目名称', key: 'projectName', width: 140 },
{ title: '深度', key: 'sampleDepth', width: 140 },
{ title: '状态', key: 'status', width: 80, status: true },
{ title: '检测进度', key: 'testProgress', width: 160 }
],
selectIds: [],
selectData: [],
groupData: [],
salesmanData: [],
selectGroupIds: [],
selectSalesmans: [],
typeList: [{ name: '企业', value: 0 }, { name: '政府', value: 1 }]
}
},
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('', 300)
} else {
return this.$tableHeight('noSearch')
}
}
},
mounted() {
this._page()
},
methods: {
// 重置column
_resetColumn(colList) {
this.userColumns = colList
this.$refs.pageTable._loadColumn(colList)
},
// 获取业务员数据
_getSalesManList() {
this.$store.dispatch('LmsEquipInfo/userList').then(() => {
const list = this.$store.state.LmsEquipInfo.userList
const tempList = []
list.forEach(item => {
if (item.status.display !== '待激活' && item.realname !== undefined) {
tempList.push({ id: item.id, realname: item.realname })
}
})
this.salesmanData = JSON.parse(JSON.stringify(tempList))
})
},
_salesmanDataChange(data) {
this.formObj.salesmans = data.join(',')
},
// 所选检测科室的ids
_groupDataChange(data) {
this.formObj.groupIds = data.join(',')
},
// 获取当前的检测科室下拉
_getGroupList() {
this.$store.dispatch('LmsUserGroup/list').then(() => {
this.groupData = this.$store.state.LmsUserGroup.list
})
},
// 应出报告日期
_reportDueDateChange(data) {
this.formObj.reportDateBegin = data[0]
this.formObj.reportDateEnd = data[1]
},
_btnClick(msg) {
switch (msg) {
case '导出':
if (this.getPage.records.length === 0) {
this.$Message.warning('暂无数据，不可导出')
} else {
this._export()
}
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
},
_page: async function() {
// this.$refs.pageTable._page('search-form-package', 'FoodJudgeBasis/page')
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilStatistics.listSampleProgress(
this.$serializeForm(this.formObj)
)
if (result) {
this.getPage = result
this.$refs.pageTable._hideLoading()
}
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'page':
this.selectIds = []
this.getPage = this.$store.state.FoodSample.page
break
case 'selectData':
this.selectData = data
this.selectIds = []
for (let i = 0; i < data.length; i++) {
this.selectIds.push(data[i].id)
}
break
case 'changeSize':
this._page()
break
case 'table-col':
// 用户选中的表格列
this.userColumns = data
break
}
}
}
}
</script>
pages/workbench/sample-progress/SampleProgress.vue
......@@ -19,7 +19,7 @@
<!--<Col span="24">-->
<!--<SampleSteps :info="sampleInfo" ref="stepsModal"></SampleSteps>-->
<!--</Col>-->
<Col :style="processObj" span="24">
<Col style="height: 300px;" span="24">
<VScrollFull ref="myscrollfull" @load="_loadData" :pageSize="rows">
<div slot="empty" style="text-align:center" class="gray-color">暂无数据</div>
<SampleSteps ref="stepsModal" :info="sampleInfo"></SampleSteps>
......@@ -52,7 +52,7 @@ export default {
contractId: '',
//
page: 0,
rows: 30,
rows: 10,
formObj: {},
processObj: {
height: document.documentElement.clientHeight - 300 + 'px'
......
pages/workbench/workbench.vue
......@@ -27,7 +27,10 @@
<UnfinishedContract></UnfinishedContract>
</Col>
<Col span="24">
<SampleProgress></SampleProgress>
<SampleProgress style="margin-bottom: 20px;"></SampleProgress>
</Col>
<Col span="24" style="margin-bottom: 10px;">
<SampleProgressDetail></SampleProgressDetail>
</Col>
<Col span="12">
<UnfinishedItem></UnfinishedItem>
......@@ -88,6 +91,7 @@ import YearOverItem from './YearOverItem'
import GroupItem from './GroupItem'
import CustomerContract from './CustomerContract'
import SampleProgress from './sample-progress/SampleProgress'
import SampleProgressDetail from './SampleProgressDetail'
export default {
name: 'Workbench',
components: {
......@@ -122,7 +126,9 @@ export default {
// eslint-disable-next-line vue/no-unused-components
CustomerContract,
// eslint-disable-next-line vue/no-unused-components
SampleProgress
SampleProgress,
// eslint-disable-next-line vue/no-unused-components
SampleProgressDetail
},
data() {
return {
......
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