Skip to content

P
patzn-cloud-web-back-soil
Commit a476bb29 by lichengming
Options

修改了委托单登记

parent d3ee366c
Showing with 102 additions and 104 deletions
api/soil/soil-statistics.js
......@@ -39,5 +39,13 @@ export default {
pageWaitEnd: data =>
http
.post('soil/v1/statistics/page_wait_end_entrust_statistics', data)
.then(res => res),
pagePersonalExpStatistics: data =>
http
.post('soil/v1/statistics/page_personal_exp_statistics', data)
.then(res => res),
pageGroupExpStatistics: data =>
http
.post('soil/v1/statistics/page_group_exp_statistics', data)
.then(res => res)
}
pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue
......@@ -478,7 +478,7 @@ export default {
siteNo: '',
experiments: ''
}
this.getPage.records.unshift(data)
this.getPage.records.push(data)
},
_getPackList: async function() {
const result = await soilEntrust.testType('样品包装类型')
......@@ -721,7 +721,7 @@ export default {
this.formObj = formObj
this._showTime(formObj)
if (formObj.sampleList) {
this.getPage.records = formObj.sampleList
this.getPage.records = formObj.sampleList.reverse()
}
// for (let i = 0; i < formObj.sampleList.length; i++) {
// if (formObj.sampleList[i].lastTime !== undefined) {
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/SoilSampleItemManage.vue
......@@ -14,6 +14,12 @@
<Form-item label="试验名称:" class="search-item">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验名称" clearable />
</Form-item>
<Form-item label="大类:" class="search-item">
<Input v-model="formObj.mainType" @on-enter="_formSearch" placeholder="请输入大类" clearable />
</Form-item>
<Form-item label="小类:" class="search-item">
<Input v-model="formObj.smallType" @on-enter="_formSearch" placeholder="请输入小类" clearable />
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">
搜索
......@@ -159,7 +165,9 @@ export default {
formObj: {
name: undefined,
sampleId: undefined,
code: undefined
code: undefined,
mainType: undefined,
smallType: undefined
}
}
},
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue
......@@ -15,7 +15,7 @@
<Option v-for="(item,index) in itemData" :value="item.value" :key="index">{{item.name}}</Option>
</Select>
</Form-item>
<Form-item label="试验项目:" class="search-item">
<Form-item label="筛选试样:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.experimentNames" name="experimentNames" placeholder="请输入试验项目" clearable></Input>
</Form-item>
<Form-item class="search-btn">
......
pages/workbench/GroupItem.vue
......@@ -14,11 +14,11 @@
</Select>
</Form-item>
<Form-item label="日期:">
<DatePicker v-model="formObj.date" :editable="false" @on-change="_dateChange" type="year"
<DatePicker v-model="formObj.date" :editable="false" type="year"
style="width:90px"></DatePicker>
</Form-item>
<Form-item class="search-btn">
<Button @click="_search" type="primary">搜索</Button>
<Button @click="_page" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
......@@ -31,6 +31,7 @@
</div>
</template>
<script>
import { soilStatistics } from '../../api'
import GroupItemBar from './GroupItemBar'
export default {
......@@ -47,25 +48,24 @@ export default {
}
},
mounted() {
// this._getEquipList()
this._page()
},
methods: {
// 检测科室
_getEquipList() {
this.$store.dispatch('LmsUserGroup/list').then(() => {
this.groupData = this.$store.state.LmsUserGroup.list
this.formObj.groupId = this.groupData[0].id
this.formObj.groupName = this.groupData[0].name
this.$nextTick(function() {
this.$refs.barModal._openBar(this.formObj)
})
})
},
_dateChange(data) {
this.$refs.barModal._openBar(this.formObj)
},
_search() {
this.$refs.barModal._openBar(this.formObj)
_page: async function() {
const result = await soilStatistics.pageGroupExpStatistics()
if (result) {
console.log('bar', result)
const obj = {
mounth: [],
num: []
}
for (let i = 0; i < result.records.length; i++) {
obj.num.push(result.records[i].testCount)
obj.mounth.push(result.records[i].testMonth)
}
this.$refs.barModal._openBar(obj)
}
}
}
}
......
pages/workbench/GroupItemBar.vue
......@@ -29,9 +29,6 @@ export default {
containLabel: true,
x: 130
},
legend: {
data: ['检测量']
},
xAxis: [
{
type: 'category',
......@@ -67,7 +64,7 @@ export default {
{
name: '检测量',
type: 'bar',
data: [10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]
data: []
}
]
},
......@@ -76,33 +73,37 @@ export default {
}
},
methods: {
_openBar(obj) {
this.year = obj.date.getFullYear()
this.groupId = obj.groupId
_openBar: function(obj) {
this.option.series[0].data = []
this.option.xAxis[0].data = []
for (let i = 1; i < 13; i++) {
if (i < 10) {
this.option.xAxis[0].data.push(this.year + '-0' + i)
} else {
this.option.xAxis[0].data.push(this.year + '-' + i)
}
}
this.$store
.dispatch('FoodContract/groupYearNum', {
year: this.year,
groupId: this.groupId
})
.then(() => {
const result = this.$store.state.FoodContract.page
this.option.series[0].data = []
for (let j = 0; j < result.length; j++) {
for (let k = 0; k < this.option.xAxis[0].data.length; k++) {
if (result[j].testMonth === this.option.xAxis[0].data[k]) {
this.option.series[0].data[k] = result[j].testCount
}
}
}
})
this.option.xAxis[0].data = obj.mounth
this.option.series[0].data = obj.num
// this.year = obj.date.getFullYear()
// this.groupId = obj.groupId
// this.option.xAxis[0].data = []
// for (let i = 1; i < 13; i++) {
// if (i < 10) {
// this.option.xAxis[0].data.push(this.year + '-0' + i)
// } else {
// this.option.xAxis[0].data.push(this.year + '-' + i)
// }
// }
// this.$store
// .dispatch('FoodContract/groupYearNum', {
// year: this.year,
// groupId: this.groupId
// })
// .then(() => {
// const result = this.$store.state.FoodContract.page
// this.option.series[0].data = []
// for (let j = 0; j < result.length; j++) {
// for (let k = 0; k < this.option.xAxis[0].data.length; k++) {
// if (result[j].testMonth === this.option.xAxis[0].data[k]) {
// this.option.series[0].data[k] = result[j].testCount
// }
// }
// }
// })
}
}
}
......
pages/workbench/UnfinishedItem.vue
......@@ -2,89 +2,70 @@
<div>
<Card style="width:100%">
<div class="config_meta">
<p class="fl">待检检测项目 {{total}} </p>
<p class="fl">个人试验项目查询 {{total}} </p>
<div class="fr">
<Tooltip content="刷新" placement="left-start">
<Icon @click="_request" type="ios-refresh" size="30" color="#2d8cf0" style="cursor:pointer;"></Icon>
</Tooltip>
<Tooltip content="查看更多" placement="left-start" style="margin-left: 5px">
<Icon @click="_detail" type="ios-more" size="30" color="#2d8cf0" style="cursor:pointer;"></Icon>
<Icon @click="_page" type="ios-refresh" size="30" color="#2d8cf0" style="cursor:pointer;"></Icon>
</Tooltip>
</div>
<div class="clear"></div>
</div>
<div style="width: 100%;">
<element-table ref="pageTable" :pageColumns="pageColumns"
:tableHeight="tableHeight" :getPage="tableData" hide-checkbox>
<el-table-column
:prop="item.key"
:label="item.title"
:min-width="item.width"
:fixed="item.fixed?item.fixed:undefined"
<PTVXETableHeight ref="pageTable" :page-columns="pageColumns"
:get-page="getPage" :table-height="tableHeight">
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
show-overflow-tooltip sortable>
:field="item.key"
:title="item.title"
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope">
<span v-if="item.status">{{scope.row.progress.display}}</span>
<span v-else>{{scope.row[item.key]}}</span>
<span>{{scope.row[item.key]}}</span>
</template>
</el-table-column>
</element-table>
</vxe-table-column>
</PTVXETableHeight>
</div>
</Card>
<!--未完成检测项目列表-->
<!-- <FoodUnfinishedItem ref="unfinishedDetail"></FoodUnfinishedItem>-->
</div>
</template>
<script>
import { soilStatistics } from '../../api'
export default {
components: {},
data() {
return {
tableData: { records: [] },
formObj: {},
getPage: {},
pageColumns: [
{ title: '状态', key: 'progress', width: 110, status: true },
{ title: '检测项目名称', key: 'name', width: 150 },
{ title: '检测依据', key: 'testBasis', width: 140 },
{ title: '样品编号', key: 'num', width: 180 },
{ title: '样品名称', key: 'sampleName', width: 120 },
{ title: '所属科室', key: 'groupName', width: 100 }
{ title: '委托编号', key: 'entrustCode', width: 150 },
{ title: '试验名称', key: 'name', width: 140 },
{ title: '试样编号', key: 'sampleCode', width: 140 },
{ title: '试验项目英文简写', key: 'shortName', width: 180 },
{ title: '检测依据', key: 'testBasis', width: 100 }
],
tableHeight: '280',
total: ''
}
},
mounted() {
// this._request()
this._page()
},
methods: {
_detail() {
this.$refs.unfinishedDetail._open()
},
_request() {
this.$refs.pageTable._hideLoading()
this.$store
.dispatch('StatisticContract/pageItem', { page: 1, rows: 7 })
.then(() => {
const tableData = this.$store.state.StatisticContract.page.records
const total = this.$store.state.StatisticContract.page.total
if (total === 0) {
this.total = ''
} else {
this.total = '（共 ' + total + ' 条）'
}
let num = 0
if (tableData.length < 7) {
num = tableData.length
} else {
num = 7
}
for (let i = 0; i < num; i++) {
this.tableData.records.push(tableData[i])
}
})
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await soilStatistics.pagePersonalExpStatistics(
this.formObj
)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
}
// const result = await
// this.$refs.pageTable._page('search-form', 'SysFileTemplate/page')
}
}
}
......
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