Skip to content

P
patzn-cloud-web-back-soil
Commit 1a21c7fb by lichengming
Options

Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

parents f0db8a40 02bc9305
Showing with 312 additions and 163 deletions
pages/meter-entrust/entrust-register/EntrustIndex.vue
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<el-tab-pane label="历史记录" name="his"></el-tab-pane> <el-tab-pane label="历史记录" name="his"></el-tab-pane>
</el-tabs> </el-tabs>
<keep-alive> <keep-alive>
<!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent"></component> <component ref="refModal" :is="currentComponent"></component>
</keep-alive> </keep-alive>
</div> </div>
...@@ -20,9 +19,7 @@ import MeterSendEntrustHis from './EntrustRegisterHis' ...@@ -20,9 +19,7 @@ import MeterSendEntrustHis from './EntrustRegisterHis'
export default { export default {
name: 'MeterSendEntrustIndex', name: 'MeterSendEntrustIndex',
components: { components: {
// eslint-disable-next-line vue/no-unused-components
MeterSendEntrust, MeterSendEntrust,
// eslint-disable-next-line vue/no-unused-components
MeterSendEntrustHis MeterSendEntrustHis
}, },
data() { data() {
......
pages/meter-entrust/entrust-register/EntrustRegister.vue
...@@ -62,15 +62,10 @@ import SoilSampleItemManage from '../SoilSampleItemManageEdit' ...@@ -62,15 +62,10 @@ import SoilSampleItemManage from '../SoilSampleItemManageEdit'
import EntrustRegisterEdit from './EntrustRegisterEdit' import EntrustRegisterEdit from './EntrustRegisterEdit'
export default { export default {
components: { components: {
// eslint-disable-next-line vue/no-unused-components
Operation, Operation,
// eslint-disable-next-line vue/no-unused-components
EntrustRegisterEdit, EntrustRegisterEdit,
// eslint-disable-next-line vue/no-unused-components
SoilSampleManage, SoilSampleManage,
// eslint-disable-next-line vue/no-unused-components
importModal, importModal,
// eslint-disable-next-line vue/no-unused-components
SoilSampleItemManage SoilSampleItemManage
}, },
data() { data() {
...@@ -142,7 +137,7 @@ export default { ...@@ -142,7 +137,7 @@ export default {
pageColumns: [ pageColumns: [
{ title: '委托商', key: 'client', width: 230 }, { title: '委托商', key: 'client', width: 230 },
{ title: '委托编号', key: 'entrustCode', width: 120 }, { title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '进度', key: 'progress', width: 120, status: true }, { title: '进度', key: 'progress', width: 95, status: true },
{ title: '委托日期', key: 'entrustDate', width: 120, date: true }, { title: '委托日期', key: 'entrustDate', width: 120, date: true },
{ title: '项目名称', key: 'projectName', width: 120 }, { title: '项目名称', key: 'projectName', width: 120 },
{ title: '钻孔位置', key: 'boreholeLocation', width: 120 }, { title: '钻孔位置', key: 'boreholeLocation', width: 120 },
......
pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
placeholder="请选择委托日期" name="entrustDate"></Date-picker> placeholder="请选择委托日期" name="entrustDate"></Date-picker>
</Form-item> </Form-item>
<Form-item label="项目名称" prop="projectName" class="width-48"> <Form-item label="项目名称" prop="projectName" class="width-48">
<!-- <Input v-model="formObj.projectName" name="projectName" placeholder="请输入项目名称"/>-->
<AutoComplete ref="autoInput" v-model="formObj.projectName" :down-data="projectData" <AutoComplete ref="autoInput" v-model="formObj.projectName" :down-data="projectData"
@on-result-change="_projectChange" name="projectName" placeholder="请输入或选择项目名称" @on-result-change="_projectChange" name="projectName" placeholder="请输入或选择项目名称"
></AutoComplete> ></AutoComplete>
...@@ -44,9 +43,6 @@ ...@@ -44,9 +43,6 @@
<Form-item @click.native="_selectPerson" label="制表人" prop="tabulater" class="width-48"> <Form-item @click.native="_selectPerson" label="制表人" prop="tabulater" class="width-48">
<Input v-model="formObj.tabulater" name="tabulater" placeholder="请输入名称"/> <Input v-model="formObj.tabulater" name="tabulater" placeholder="请输入名称"/>
</Form-item> </Form-item>
<!-- <Form-item label="检验类别" prop="testType" class="width-48">-->
<!-- <Input v-model="formObj.testType" name="testType" placeholder="请输入名称"/>-->
<!-- </Form-item>-->
<Form-item label="检验类别：" prop="testType" class="width-48"> <Form-item label="检验类别：" prop="testType" class="width-48">
<el-select @change="typeChange" v-model="formObj.testType" name="testType" placeholder="请选择" <el-select @change="typeChange" v-model="formObj.testType" name="testType" placeholder="请选择"
size="small" size="small"
...@@ -755,15 +751,9 @@ export default { ...@@ -755,15 +751,9 @@ export default {
this.formObj = formObj this.formObj = formObj
this._showTime(formObj) this._showTime(formObj)
if (formObj.sampleList) { if (formObj.sampleList) {
this.getPage.records = formObj.sampleList.reverse() // this.getPage.records = formObj.sampleList.reverse()
} this.getPage.records = formObj.sampleList
// for (let i = 0; i < formObj.sampleList.length; i++) { }
// if (formObj.sampleList[i].lastTime !== undefined) {
// this.getPage.records[i].lastTime = new Date(
// formObj.sampleList[i].lastTime
// )
// }
// }
}, },
_getUser() { _getUser() {
const user = Global.getUserInfo() const user = Global.getUserInfo()
......
pages/soil-alone-sample-instock/RegisterDetail.vue
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
} else { } else {
this.showMoney = false this.showMoney = false
} }
this.height = '350px' this.height = '140px'
} }
} }
} }
......
pages/soil-alone-sample-instock/ViewDetail.vue
<template> <template>
<div> <div>
<Modal v-model="showDetailModal" v-drag :width="700" title="人员信息" class="modal-footer-none"> <Modal v-model="showDetailModal" v-drag :width="700" title="收样信息" class="modal-footer-none">
<div :style="{height}" style="overflow-y: auto"> <div :style="{height}" style="overflow-y: auto">
<table class="tableClass"> <table class="tableClass">
<tbody> <tbody>
<tr> <tr>
<th colspan="6" class="tableClass_back">人员信息</th> <th colspan="6" class="tableClass_back">收样信息</th>
</tr> </tr>
<tr> <tr>
<th>接收人</th> <th>接收人</th>
...@@ -69,7 +69,7 @@ export default { ...@@ -69,7 +69,7 @@ export default {
} else { } else {
this.showMoney = false this.showMoney = false
} }
this.height = '350px' this.height = '220px'
} }
} }
} }
......
pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegisterEdit.vue
...@@ -682,7 +682,7 @@ export default { ...@@ -682,7 +682,7 @@ export default {
this.formObj.client = '' this.formObj.client = ''
this.id = '' this.id = ''
this.formObj.entrustDate = new Date() this.formObj.entrustDate = new Date()
this.modalTitle = '委托单新增' this.modalTitle = '收样新增'
} }
}, },
_openEdit(formObj) { _openEdit(formObj) {
......
pages/soil-alone-sample-manage/storehouse-sample-manage/stockSampleEdit.vue
...@@ -670,7 +670,7 @@ export default { ...@@ -670,7 +670,7 @@ export default {
this.formObj.client = '' this.formObj.client = ''
this.id = '' this.id = ''
this.formObj.entrustDate = new Date() this.formObj.entrustDate = new Date()
this.modalTitle = '委托单新增' this.modalTitle = '收样新增'
} }
this._getUser() this._getUser()
}, },
......
pages/soil-alone-sample/EntrustRegisterEdit.vue
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
<p slot="header">{{modalTitle}}</p> <p slot="header">{{modalTitle}}</p>
<div> <div>
<Form id="MeterSendTestEdit" ref="formObj" :model="formObj" :label-width="90" inline> <Form id="MeterSendTestEdit" ref="formObj" :model="formObj" :label-width="90" inline>
<!-- <Form-item label="委托商" prop="client" class="width-48">-->
<!-- <AutoComplete ref="autoInput" v-model="formObj.client" :down-data="customerData"-->
<!-- @on-result-change="_cusNameChange" name="client" placeholder="请输入或选择委托单位"-->
<!-- ></AutoComplete>-->
<!-- </Form-item>-->
<Form-item @click.native="_selectReceiverPerson" label="接收人" prop="receiver" class="width-48"> <Form-item @click.native="_selectReceiverPerson" label="接收人" prop="receiver" class="width-48">
<Input v-model="formObj.receiver" name="receiver" placeholder="请输入接收人"/> <Input v-model="formObj.receiver" name="receiver" placeholder="请输入接收人"/>
</Form-item> </Form-item>
...@@ -17,7 +12,6 @@ ...@@ -17,7 +12,6 @@
placeholder="请选择接收日期" name="receiveTime"></Date-picker> placeholder="请选择接收日期" name="receiveTime"></Date-picker>
</Form-item> </Form-item>
<Form-item label="项目名称" prop="projectName" class="width-48"> <Form-item label="项目名称" prop="projectName" class="width-48">
<!-- <Input v-model="formObj.projectName" name="projectName" placeholder="请输入项目名称"/>-->
<AutoComplete ref="autoInput" v-model="formObj.projectName" :down-data="projectData" <AutoComplete ref="autoInput" v-model="formObj.projectName" :down-data="projectData"
@on-result-change="_projectChange" name="projectName" placeholder="请输入或选择项目名称" @on-result-change="_projectChange" name="projectName" placeholder="请输入或选择项目名称"
></AutoComplete> ></AutoComplete>
...@@ -38,9 +32,6 @@ ...@@ -38,9 +32,6 @@
<Date-picker v-model="formObj.registTime" @on-change="_tabulateChange" name="registTime" type="date" split-panels style="width:100%;" <Date-picker v-model="formObj.registTime" @on-change="_tabulateChange" name="registTime" type="date" split-panels style="width:100%;"
placeholder="请选择登记日期"></Date-picker> placeholder="请选择登记日期"></Date-picker>
</Form-item> </Form-item>
<!-- <Form-item label="检验类别" prop="testType" class="width-48">-->
<!-- <Input v-model="formObj.testType" name="testType" placeholder="请输入名称"/>-->
<!-- </Form-item>-->
</Form> </Form>
</div> </div>
<div slot="footer"> <div slot="footer">
...@@ -127,11 +118,6 @@ export default { ...@@ -127,11 +118,6 @@ export default {
{ {
type: 'success', type: 'success',
id: '', id: '',
name: '导入样品'
},
{
type: 'success',
id: '',
name: '导入试验项目' name: '导入试验项目'
} }
], ],
...@@ -335,26 +321,12 @@ export default { ...@@ -335,26 +321,12 @@ export default {
case '添加': case '添加':
this._add() this._add()
break break
case '导入试验项目':
this._importItem()
break
case '导入样品':
this._importSample()
break
case 'search': case 'search':
this.searchOpen = !this.searchOpen this.searchOpen = !this.searchOpen
break break
} }
}) })
}, },
_importItem() {
if (this.selectIds.length === 0) {
this.$Message.warning('请选择至少一条数据！')
} else {
this.$refs.sampleItemSelectModal._open()
this.allSelect(this.selectData)
}
},
_getByEntrustId: async function(id) { _getByEntrustId: async function(id) {
const result = await soilEntrust.getVOById(id) const result = await soilEntrust.getVOById(id)
if (result) { if (result) {
...@@ -483,15 +455,6 @@ export default { ...@@ -483,15 +455,6 @@ export default {
this.soilList = soilRemark this.soilList = soilRemark
} }
}, },
_importSample() {
const data = {
importUrl: '/soil/v1/entrust/edit_import_entrust/?id=' + this.id,
downloadUrl: '/meter/v1/excel/template/MeterSampleImport',
title: '样品导入'
}
this.$refs.importModal._open(data, '样品导入')
},
_tableResultChange(msg, data, selData) { _tableResultChange(msg, data, selData) {
switch (msg) { switch (msg) {
case 'selectIds': case 'selectIds':
...@@ -512,51 +475,6 @@ export default { ...@@ -512,51 +475,6 @@ export default {
} }
console.log('索引', this.indexList) console.log('索引', this.indexList)
}, },
// 省 市 区
_cascaderResult(name, data, msg) {
switch (name) {
case 'cus':
this._casChange(data, msg)
break
case 'tested':
this._testedChange(data, msg)
break
}
},
_emptyProvince() {
this.cityData = []
this.testedCityData = []
// this.formObj.tested.testedProvince = ''
// this.formObj.tested.testedCity = ''
// this.formObj.tested.testedCounty = ''
// this.formObj.testedTemp.testedProvince = ''
// this.formObj.testedTemp.testedCity = ''
// this.formObj.testedTemp.testedCounty = ''
},
_testedChange(data, msg) {
// 省、市、区
if (msg === 'clear') {
// this.formObj.tested.testedProvince = ''
// this.formObj.tested.testedCity = ''
// this.formObj.tested.testedCounty = ''
this.formObj.testedTemp.testedProvince = ''
this.formObj.testedTemp.testedCity = ''
this.formObj.testedTemp.testedCounty = ''
this.formObj.province = ''
this.formObj.city = ''
this.formObj.county = ''
this.testedCityData = []
} else {
// this.formObj.tested.testedProvince = data.value[0]
// this.formObj.tested.testedCity = data.value[1]
// this.formObj.tested.testedCounty = data.value[2]
this.formObj.province = data.value[0]
this.formObj.city = data.value[1]
this.formObj.county = data.value[2]
this.testedCityData = [data.value[0], data.value[1], data.value[2]]
}
},
_iconClick(res, data, index) { _iconClick(res, data, index) {
switch (res) { switch (res) {
case '编辑': case '编辑':
...@@ -687,7 +605,7 @@ export default { ...@@ -687,7 +605,7 @@ export default {
this.formObj.client = '' this.formObj.client = ''
this.id = '' this.id = ''
this.formObj.entrustDate = new Date() this.formObj.entrustDate = new Date()
this.modalTitle = '委托单新增' this.modalTitle = '收样新增'
} }
this._getUser() this._getUser()
}, },
...@@ -706,13 +624,6 @@ export default { ...@@ -706,13 +624,6 @@ export default {
this.id = formObj.id this.id = formObj.id
this.formObj = formObj this.formObj = formObj
this._showTime(formObj) this._showTime(formObj)
// for (let i = 0; i < formObj.sampleList.length; i++) {
// if (formObj.sampleList[i].lastTime !== undefined) {
// this.getPage.records[i].lastTime = new Date(
// formObj.sampleList[i].lastTime
// )
// }
// }
}, },
_getUser() { _getUser() {
const user = Global.getUserInfo() const user = Global.getUserInfo()
...@@ -738,18 +649,6 @@ export default { ...@@ -738,18 +649,6 @@ export default {
this.formObj.registTime = new Date(formObj.registTime) this.formObj.registTime = new Date(formObj.registTime)
} }
}, },
_showAddress(formObj) {
this.testedCityData = []
if (
formObj.province !== undefined &&
formObj.city !== undefined &&
formObj.county !== undefined
) {
this.testedCityData.push(formObj.province)
this.testedCityData.push(formObj.city)
this.testedCityData.push(formObj.county)
}
},
_getList: async function() { _getList: async function() {
const result = await meterEntrust.pageList() const result = await meterEntrust.pageList()
const list = [] const list = []
......
pages/soil-alone-sample/ViewDetail.vue
<template> <template>
<div> <div>
<Modal v-model="showDetailModal" v-drag :width="700" title="人员信息" class="modal-footer-none"> <Modal v-model="showDetailModal" v-drag :width="700" title="收样信息" class="modal-footer-none">
<div :style="{height}" style="overflow-y: auto"> <div :style="{height}" style="overflow-y: auto">
<table class="tableClass"> <table class="tableClass">
<tbody> <tbody>
<tr> <tr>
<th colspan="6" class="tableClass_back">人员信息</th> <th colspan="6" class="tableClass_back">收样信息</th>
</tr> </tr>
<tr> <tr>
<th>接收人</th> <th>接收人</th>
...@@ -63,13 +63,12 @@ export default { ...@@ -63,13 +63,12 @@ export default {
_open(obj, flag) { _open(obj, flag) {
this.showDetailModal = true this.showDetailModal = true
this.obj = obj this.obj = obj
console.log('obj', obj)
if (flag === 'showMoney') { if (flag === 'showMoney') {
this.showMoney = true this.showMoney = true
} else { } else {
this.showMoney = false this.showMoney = false
} }
this.height = '350px' this.height = '250px'
} }
} }
} }
......
pages/soil-statistics/experiment-progress/ExperimrntProgressDetail.vue 0 → 100644
<template>
<div>
<div class="layout-content-padding">
<div class="layout-content-main">
<Row style="margin-top: 10px;">
<Form id="search-form-sample-progress" :label-width="80" inline onsubmit="return false">
<Form-item label="试验名称:" class="search-item">
<Input v-model="formObj.name" name="name" placeholder="请输入试验名称" style="width:100%" clearable @on-enter="_search"></Input>
</Form-item>
<Form-item label="钻孔名称:" class="search-item">
<Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入钻孔名称" style="width:100%" clearable @on-enter="_search"></Input>
</Form-item>
<Form-item class="search-item">
<Button type="primary" class="width-80" @click="_search">搜索</Button>
</Form-item>
</Form>
<Col style="height: 100%;" span="24">
<VScrollFull ref="myscrollfull" :page-size="rows" @load="_loadData">
<div slot="empty" style="text-align:center" class="gray-color">暂无数据</div>
<SampleSteps ref="stepsModal" :info="sampleInfo"></SampleSteps>
</VScrollFull>
</Col>
</Row>
</div>
</div>
</div>
</template>
<script>
import VScrollFull from '../../../components/base/VScrollFull'
import { soilStatistics } from '../../../api'
import SampleSteps from './SampleSteps'
export default {
components: {
SampleSteps,
VScrollFull
},
computed: {
tableHeight: function() {
return this.$tableHeight('noSearch')
}
},
data() {
return {
dateList: [],
sampleProgressList: ['已分配', '检测完成', '复核', '校核'],
// 样品信息
sampleInfo: [],
testTypeList: [],
// 合同id
contractId: '',
//
page: 0,
rows: 10,
formObj: {},
processObj: {
height: document.documentElement.clientHeight - 300 + 'px'
},
typeList: [{ name: '企业', value: 0 }, { name: '政府', value: 1 }]
}
},
mounted() {
// this._initData()
},
methods: {
_reportDateChange(data) {
$('input[name="reportDateBegin"]').val(data[0])
$('input[name="reportDateEnd"]').val(data[1])
},
// 日期
_ctimeChange(data) {
$('input[name="beginDate"]').val(data[0])
$('input[name="endDate"]').val(data[1])
},
_search() {
// 超期未完成(默认的)
// 重置
this.$refs.myscrollfull.$_init()
},
_loadData: async function(pageIndex) {
console.log('pageIndex', pageIndex)
this.page = pageIndex
if (pageIndex === 1) {
this.sampleInfo = []
}
Object.assign(this.formObj, this._searchParams())
const result = await soilStatistics.listExperimentProgress(
this.$serializeForm(this.formObj)
)
if (result) {
const records = result.records
const pages = result.pages
for (let i = 0; i < records.length; i++) {
// 获取下标
if (records[i].auditTime) {
records[i].progressIndex = 3
} else if (records[i].checkTime) {
records[i].progressIndex = 2
} else if (records[i].testEndTime) {
records[i].progressIndex = 1
} else if (records[i].allotTime) {
records[i].progressIndex = 0
} else {
records[i].progressIndex = -1
}
}
// this.sampleInfo = records
this.sampleInfo = this.sampleInfo.concat(records)
this.$refs.myscrollfull.endByPage(this.sampleInfo.length, pages)
}
// this.$store
// .dispatch('StbSampleProgress/list', this._searchParams())
// .then(() => {
// const result = this.$store.state.StbSampleProgress.list
// const records = result.records
// const pages = result.pages
// for (let i = 0; i < records.length; i++) {
// // 获取下标
// records[i].statisStatusIndex = this.sampleProgressList.indexOf(
// records[i].statisStatus
// )
// }
// this.sampleInfo = this.sampleInfo.concat(records)
// this.$refs.myscrollfull.endByPage(this.sampleInfo.length, pages)
// })
},
// 获取模块数量
_statusChange(data, list) {
const temp = []
const blueList = list.blueList
const redList = list.redList
const greenList = list.greenList
const orgList = list.orgList
for (let i = 0; i < blueList.length; i++) {
temp.push(blueList[i])
}
for (let i = 0; i < redList.length; i++) {
temp.push(redList[i])
}
for (let i = 0; i < greenList.length; i++) {
temp.push(greenList[i])
}
for (let i = 0; i < orgList.length; i++) {
temp.push(orgList[i])
}
if (temp.length !== 0) {
$('input[name=queryTypeList]').val(temp.join(','))
} else {
$('input[name=queryTypeList]').val('')
}
this._search()
},
_searchParams() {
const data = this.$serialize('search-form-sample-progress')
data.page = this.page
data.rows = this.rows
return this.$extend(data)
}
}
}
</script>
pages/soil-statistics/experiment-progress/SampleSteps.vue 0 → 100644
<template>
<div>
<div v-for="(itemInfo, index) in info" :key="index" class="contract-box">
<Row>
<!--样品信息-->
<Col span="6">
<ul class="progress-ul">
<li>
<div class="title">样品编号</div>
<div class="cont">
<a
:class="{
'blue-color':itemInfo.queryType === 0,
'green-color':itemInfo.queryType === 1,
'red-color':itemInfo.queryType === 2,
'warning-color':itemInfo.queryType === 3
}"
style="font-weight: bold"
>{{itemInfo.sampleCode}}</a>
</div>
</li>
<li>
<div class="title">试验名称</div>
<div class="cont">
{{itemInfo.name}}
</div>
</li>
<li>
<div class="title">钻孔编号</div>
<div class="cont">
{{itemInfo.boreholeName}}
</div>
</li>
</ul>
</Col>
<!--样品进度信息-->
<Col span="18">
<ProgressList :progressList="[{name:'已分配',time:itemInfo.allotTime,user:itemInfo.alloter},
{name:'检测完成',time:itemInfo.testEndTime,user:itemInfo.testEnder},{name:'已复核',time:itemInfo.checkTime,user:itemInfo.checker},
{name:'已审核',time:itemInfo.auditTime,user:itemInfo.auditor}]"
:state="itemInfo.progressIndex"></ProgressList>
</Col>
</Row>
</div>
</div>
</template>
<script>
import ProgressList from '../../../components/statistic/ProgressList'
export default {
components: { ProgressList },
props: {
info: null
},
data() {
return {
progressList: [],
sampleInfo: []
}
},
watch: {
info: function(newVal, oldVal) {
console.log('newVal===========', newVal.oldValue)
}
},
mounted() {
this._console(this.info)
},
methods: {
_sampleClick(data) {
// 样品详情
this.$refs.detail._open(data)
},
_console(info) {
console.log('info', info)
}
}
}
</script>
<style>
.progress-ul li {
border: 1px solid #ddd;
overflow: hidden;
}
.progress-ul li .title {
padding: 13px;
}
.progress-ul li .title {
width: 35%;
background: #eee;
padding: 13px;
border-right: 1px solid #ddd;
float: left;
}
.progress-ul li .cont {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding-top: 15px;
padding-left: 15px;
float: left;
width: 65%;
}
.contract-box {
margin: 10px 0;
}
.contract-box {
border: 1px solid #dcdcdc;
}
</style>
pages/soil-statistics/sample-progress/SampleProgressDetail.vue
...@@ -90,14 +90,15 @@ export default { ...@@ -90,14 +90,15 @@ export default {
], ],
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{ title: '委托编号', key: 'entrustCode', width: 140 }, { title: '委托编号', key: 'entrustCode', width: 130 },
{ title: '钻孔名称', key: 'boreholeName', width: 140 }, { title: '钻孔名称', key: 'boreholeName', width: 140 },
{ title: '样品编号', key: 'sampleCode', width: 140 },
{ title: '现场编号', key: 'siteNo', width: 140 },
{ title: '项目名称', key: 'projectName', width: 140 }, { title: '项目名称', key: 'projectName', width: 140 },
{ title: '深度', key: 'sampleDepth', width: 140 }, { title: '样品编号', key: 'sampleCode', width: 130 },
{ title: '现场编号', key: 'siteNo', width: 100 },
{ title: '深度', key: 'sampleDepth', width: 90 },
{ title: '状态', key: 'status', width: 80, status: true }, { title: '状态', key: 'status', width: 80, status: true },
{ title: '检测进度', key: 'testProgress', width: 160 } { title: '检测进度', key: 'testProgress', width: 160 },
{ title: '未完成试验项目', key: 'expNotEnd', width: 140 }
], ],
selectIds: [], selectIds: [],
selectData: [], selectData: [],
......
pages/workbench/sample-progress/SampleProgress.vue
...@@ -6,14 +6,18 @@ ...@@ -6,14 +6,18 @@
<Row style="margin-top: 10px;"> <Row style="margin-top: 10px;">
<Form id="search-form-sample-progress" :label-width="80" inline onsubmit="return false"> <Form id="search-form-sample-progress" :label-width="80" inline onsubmit="return false">
<Form-item label="试验名称:" class="search-item"> <Form-item label="试验名称:" class="search-item">
<Input @on-enter="_search" v-model="formObj.name" name="name" placeholder="请输入试验名称" style="width:100%" clearable></Input> <Input v-model="formObj.name" name="name" placeholder="请输入试验名称" style="width:100%" clearable @on-enter="_search"></Input>
</Form-item> </Form-item>
<Form-item label="钻孔名称:" class="search-item"> <Form-item label="钻孔名称:" class="search-item">
<Input @on-enter="_search" v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入钻孔名称" style="width:100%" clearable></Input> <Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入钻孔名称" style="width:100%" clearable @on-enter="_search"></Input>
</Form-item> </Form-item>
<Form-item class="search-item"> <Form-item class="search-item">
<Button @click="_search" type="primary" class="width-80">搜索</Button> <Button type="primary" class="width-80" @click="_search">搜索</Button>
</Form-item> </Form-item>
<Form-item class="search-item">
<Button class="width-80" @click="_more">查看更多</Button>
</Form-item>
</Form> </Form>
<!--查询条件--> <!--查询条件-->
<!--样品进度--> <!--样品进度-->
...@@ -21,7 +25,7 @@ ...@@ -21,7 +25,7 @@
<!--<SampleSteps :info="sampleInfo" ref="stepsModal"></SampleSteps>--> <!--<SampleSteps :info="sampleInfo" ref="stepsModal"></SampleSteps>-->
<!--</Col>--> <!--</Col>-->
<Col style="height: 300px;" span="24"> <Col style="height: 300px;" span="24">
<VScrollFull ref="myscrollfull" @load="_loadData" :pageSize="rows"> <VScrollFull ref="myscrollfull" :page-size="rows" @load="_loadData">
<div slot="empty" style="text-align:center" class="gray-color">暂无数据</div> <div slot="empty" style="text-align:center" class="gray-color">暂无数据</div>
<SampleSteps ref="stepsModal" :info="sampleInfo"></SampleSteps> <SampleSteps ref="stepsModal" :info="sampleInfo"></SampleSteps>
</VScrollFull> </VScrollFull>
...@@ -36,6 +40,7 @@ ...@@ -36,6 +40,7 @@
<script> <script>
import VScrollFull from '../../../components/base/VScrollFull' import VScrollFull from '../../../components/base/VScrollFull'
import { soilStatistics } from '../../../api' import { soilStatistics } from '../../../api'
// import Global from '../../../api/config'
import SampleSteps from './SampleSteps' import SampleSteps from './SampleSteps'
export default { export default {
...@@ -51,8 +56,6 @@ export default { ...@@ -51,8 +56,6 @@ export default {
sampleInfo: [], sampleInfo: [],
testTypeList: [], testTypeList: [],
// 合同id // 合同id
contractId: '',
//
page: 0, page: 0,
rows: 10, rows: 10,
formObj: {}, formObj: {},
...@@ -76,10 +79,13 @@ export default { ...@@ -76,10 +79,13 @@ export default {
$('input[name="endDate"]').val(data[1]) $('input[name="endDate"]').val(data[1])
}, },
_search() { _search() {
// 超期未完成(默认的)
// 重置
this.$refs.myscrollfull.$_init() this.$refs.myscrollfull.$_init()
}, },
_more() {
window.open('/soil/statistics/experiment_progress', '_blank')
},
_loadData: async function(pageIndex) { _loadData: async function(pageIndex) {
console.log('pageIndex', pageIndex) console.log('pageIndex', pageIndex)
this.page = pageIndex this.page = pageIndex
...@@ -107,25 +113,9 @@ export default { ...@@ -107,25 +113,9 @@ export default {
records[i].progressIndex = -1 records[i].progressIndex = -1
} }
} }
// this.sampleInfo = records
this.sampleInfo = this.sampleInfo.concat(records) this.sampleInfo = this.sampleInfo.concat(records)
this.$refs.myscrollfull.endByPage(this.sampleInfo.length, pages) this.$refs.myscrollfull.endByPage(this.sampleInfo.length, pages)
} }
// this.$store
// .dispatch('StbSampleProgress/list', this._searchParams())
// .then(() => {
// const result = this.$store.state.StbSampleProgress.list
// const records = result.records
// const pages = result.pages
// for (let i = 0; i < records.length; i++) {
// // 获取下标
// records[i].statisStatusIndex = this.sampleProgressList.indexOf(
// records[i].statisStatus
// )
// }
// this.sampleInfo = this.sampleInfo.concat(records)
// this.$refs.myscrollfull.endByPage(this.sampleInfo.length, pages)
// })
}, },
// 获取模块数量 // 获取模块数量
_statusChange(data, list) { _statusChange(data, list) {
......
router/soil-routes.js
...@@ -33,6 +33,7 @@ import MeterCustomerEntrust from '../pages/soil-statistics/customer-entrust/Mete ...@@ -33,6 +33,7 @@ import MeterCustomerEntrust from '../pages/soil-statistics/customer-entrust/Mete
import MeterPersonalTask from '../pages/soil-statistics/personal-task/MeterPersonalTask' import MeterPersonalTask from '../pages/soil-statistics/personal-task/MeterPersonalTask'
import MeterAnnualEntrust from '../pages/soil-statistics/annual-entrust/MeterAnnualEntrust' import MeterAnnualEntrust from '../pages/soil-statistics/annual-entrust/MeterAnnualEntrust'
import SampleProgressDetail from '../pages/soil-statistics/sample-progress/SampleProgressDetail' import SampleProgressDetail from '../pages/soil-statistics/sample-progress/SampleProgressDetail'
import ExperimrntProgressDetail from '../pages/soil-statistics/experiment-progress/ExperimrntProgressDetail'
import ReportAuditIndex from '../pages/soil-report-manage/report-audit/ReportAuditIndex' import ReportAuditIndex from '../pages/soil-report-manage/report-audit/ReportAuditIndex'
import ReportIssueIndex from '../pages/soil-report-manage/report-issue/ReportIssueIndex' import ReportIssueIndex from '../pages/soil-report-manage/report-issue/ReportIssueIndex'
import SampleDisposeIndex from '../pages/soil-sample-manage/sample-dispose/SampleDisposeIndex' import SampleDisposeIndex from '../pages/soil-sample-manage/sample-dispose/SampleDisposeIndex'
...@@ -273,6 +274,11 @@ export default [ ...@@ -273,6 +274,11 @@ export default [
meta: { title: '样品进度查询' } meta: { title: '样品进度查询' }
}, },
{ {
path: 'experiment_progress',
component: ExperimrntProgressDetail,
meta: { title: '试验项目进度' }
},
{
path: 'year_declara_count', path: 'year_declara_count',
component: yearDeclara, component: yearDeclara,
meta: { title: '年度报检量统计' } 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