suojin
/
jonhon-mes-web
17
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

槽液接口联调

Browse Source
master
jinna 2 days ago
parent e76664e9aa
commit 5dba6c85d5
4 changed files with 106 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/api/tankSolutionSystem/resultsCon.js
  2. 31
      src/views/qualityManagement/tankSolutionSystem/components/disposeDialog.vue
  3. 100
      src/views/qualityManagement/tankSolutionSystem/inspectionReport.vue
  4. 2
      src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue

18
src/api/tankSolutionSystem/resultsCon.js
Unescape View File

@ -7,4 +7,22 @@ export const getReportList = params =>{
method:'get',
params
})
}
// 生成报告列表
export const generateReport = (params) =>{
return request({
url:"/api/blade-desk/QA/LiquidTankTaskCopy/list",
method:'get',
params
})
}
// 生成报告接口
export const createReport = (params) =>{
return request({
url:'/api/blade-desk/QA/LiquidTankTaskCopy/generateReport',
method:'post',
data
})
}

31
src/views/qualityManagement/tankSolutionSystem/components/disposeDialog.vue
Unescape View File

@ -79,24 +79,24 @@
<div v-show="detailForm.status != 10 && detailForm.status > 1">
<el-row class="item_item" :gutter="20">
<el-col :span="6">
<span>测量值：</span><span>{{ detailForm.meterNum }}</span>
<span>测量值：</span><span>{{ detailForm.firstTestValue }}</span>
</el-col>
<el-col :span="6">
<span>电导率测量值：</span><span>{{ detailForm.condNum }}</span>
<span>电导率测量值：</span><span>{{ detailForm.conductivityFirstTestValue }}</span>
</el-col>
<el-col :span="6">
<span>化验人：</span><span>{{ detailForm.testMan.userName }}</span>
<span>化验人：</span><span>{{ detailForm.testUserRealName }}</span>
</el-col>
<el-col :span="6">
<span>化验时间：</span><span>{{ detailForm.testTime }}</span>
<span>化验时间：</span><span>{{ detailForm.firstTestDate }}</span>
</el-col>
</el-row>
<el-row class="item_item" :gutter="20">
<el-col :span="6">
<span>需加药量：</span><span>{{ detailForm.needAdd }}</span>
<span>需加药量：</span><span>{{ detailForm.needAddValue }}</span>
</el-col>
<el-col :span="6">
<span>实际加药量：</span><span>{{ detailForm.actualAdd }}</span>
<span>实际加药量：</span><span>{{ detailForm.actualAddValue }}</span>
</el-col>
<el-col :span="6">
<span>填报时间：</span><span>{{ detailForm.initialInspectionTime }}</span>
@ -221,18 +221,18 @@
</el-form>
</div>
</div>
<div style="font-weight: 550;" v-show="detailForm.status > 6 && detailForm.status != 10">领药信息</div>
<div class="info_box" v-show="detailForm.status > 6 && detailForm.status != 10">
<div style="font-weight: 550;" v-show="detailForm.status > 8 && detailForm.status != 10">领药信息</div>
<div class="info_box" v-show="detailForm.status > 8 && detailForm.status != 10">
<div v-show="detailForm.status != 3">
<el-row class="item_item" :gutter="20">
<el-col :span="6">
<span>药品批次：</span><span>{{ detailForm.drugBatch }}</span>
<span>药品批次：</span><span>{{ detailForm.drugBatCode }}</span>
</el-col>
<el-col :span="6">
<span>领药人：</span><span>{{ detailForm.drugRecipientName }}</span>
</el-col>
<el-col :span="6">
<span>领药时间：</span><span>{{ detailForm.drugTime }}</span>
<span>领药时间：</span><span>{{ detailForm.receiveDrugDate }}</span>
</el-col>
<el-col :span="6">
<span></span>
@ -259,18 +259,18 @@
</el-form>
</div>
</div>
<div style="font-weight: 550;" v-show="detailForm.status > 7 && detailForm.status != 10">复检信息</div>
<div class="info_box" v-show="detailForm.status > 7 && detailForm.status != 10">
<div style="font-weight: 550;" v-show="detailForm.status == 11 && detailForm.status != 10">复检信息</div>
<div class="info_box" v-show="detailForm.status == 11 && detailForm.status != 10">
<div v-show="detailForm.status != 4">
<el-row class="item_item" :gutter="20">
<el-col :span="6">
<span>测量值：</span><span>{{ detailForm.meterNumTwo }}</span>
<span>测量值：</span><span>{{ detailForm.repeatTestValue }}</span>
</el-col>
<el-col :span="6">
<span>电导率测量值：</span><span>{{ detailForm.condNumTwo }}</span>
<span>电导率测量值：</span><span>{{ detailForm.conductivityRepeatTestValue }}</span>
</el-col>
<el-col :span="6">
<span>化验人：</span><span>{{ detailForm.recheckUser }}</span>
<span>化验人：</span><span>{{ detailForm.repeatTestUserId }}</span>
</el-col>
<el-col :span="6">
<span>化验时间：</span><span>{{ detailForm.recheckTime }}</span>
@ -432,6 +432,7 @@ export default {
// this.detailForm = this.rowObj
getDetail({id:this.rowId}).then(res =>{
this.detailForm = res.data.data
console.log('deta------------',this.detailForm)
})
},
closeDialog() {

100
src/views/qualityManagement/tankSolutionSystem/inspectionReport.vue
Unescape View File

@ -32,20 +32,21 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<!-- <el-col :span="5">
<el-form-item label="槽液信息:" prop="tank">
<el-select v-model="lineForm.tank" placeholder="请选择" style="width: 220px;">
<el-option v-for="item in tankData" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="5">
<el-form-item label="分析项目:" prop="tank">
<el-select v-model="lineForm.tank" placeholder="请选择" style="width: 220px;">
<el-form-item label="分析项目:" prop="testElement">
<!-- <el-select v-model="lineForm.tank" placeholder="请选择" style="width: 220px;">
<el-option v-for="item in tankData" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-select> -->
<el-input v-model="lineForm.testElement" style="width: 220px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -64,7 +65,7 @@
</el-row>
</el-form>
<div style="height: 600px;">
<avue-crud :option="addoption" :table-loading="loading" :data="data" v-model="form" v-model:page="page"
<avue-crud :option="addoption" :table-loading="loading" :data="reportData" v-model="form" v-model:page="page"
ref="crud" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad" :before-open="beforeOpen">
@ -102,7 +103,7 @@
<script>
import { detail } from '@/api/flow/flow'
import {getReportList} from '@/api/tankSolutionSystem/resultsCon'
import {getReportList,generateReport} from '@/api/tankSolutionSystem/resultsCon'
import {getWorkCenter,getTank,getPerson,getManager,getTeam,addInfo,getDetail,editInfo} from '@/api/tankSolutionSystem/info'
export default {
data() {
@ -116,6 +117,7 @@ export default {
detailForm: {},
tankList:[],
workList:[],
reportData:[],
lineBox: false,
page: {
pageSize: 10,
@ -272,6 +274,7 @@ export default {
{
label: '取样时间',
prop: 'lineName',
type:'date',
sortable: true,
filter: true,
span: 8,
@ -281,7 +284,7 @@ export default {
},
{
label: '温度(℃)',
prop: 'wcName',
prop: 'temperatureActual',
sortable: true,
filter: true,
span: 8,
@ -292,7 +295,7 @@ export default {
},
{
label: '槽号',
prop: 'slotNo',
prop: 'workTankId',
search: false,
type: 'select',
sortable: true,
@ -301,13 +304,18 @@ export default {
editDisplay: false,
viewDisplay: false,
span: 24,
width: 100,
width: 180,
cell: true,
dicUrl:'/api/blade-desk/BA/WorkTank/listForSelect',
props:{
label:'name',
value:'id'
}
},
{
label: '体积(L)',
prop: 'testName',
prop: 'volume',
sortable: true,
filter: true,
span: 8,
@ -318,7 +326,7 @@ export default {
},
{
label: '分析项目',
prop: 'lineTime',
prop: 'testElement',
sortable: true,
filter: true,
span: 8,
@ -329,7 +337,7 @@ export default {
},
{
label: '规范下限(g/L)',
prop: 'createTime',
prop: 'normValueMin',
sortable: true,
filter: true,
span: 8,
@ -339,7 +347,7 @@ export default {
},
{
label: '目标下限(g/L)',
prop: 'createUser',
prop: 'targetValueMin',
sortable: true,
filter: true,
span: 8,
@ -349,7 +357,7 @@ export default {
},
{
label: '添加点(g/L)',
prop: 'createUser',
prop: 'fillingLocation',
sortable: true,
filter: true,
span: 8,
@ -360,7 +368,7 @@ export default {
},
{
label: '目标值(g/L)',
prop: 'createUser',
prop: 'targetValue',
sortable: true,
filter: true,
span: 8,
@ -371,7 +379,7 @@ export default {
},
{
label: '目标上限(g/L)',
prop: 'createUser',
prop: 'targetValueMax',
sortable: true,
filter: true,
span: 8,
@ -382,7 +390,7 @@ export default {
},
{
label: '规范上限(g/L)',
prop: 'createUser',
prop: 'normValueMax',
sortable: true,
filter: true,
span: 8,
@ -404,7 +412,7 @@ export default {
},
{
label: '化验值(g/L)',
prop: 'createUser',
prop: 'firstTestValue',
sortable: true,
filter: true,
span: 8,
@ -426,7 +434,7 @@ export default {
},
{
label: '药品添加量',
prop: 'createUser',
prop: 'actualAddValue',
sortable: true,
filter: true,
span: 8,
@ -437,7 +445,7 @@ export default {
},
{
label: '药品批次号',
prop: 'createUser',
prop: 'drugBatCode',
sortable: true,
filter: true,
span: 8,
@ -469,18 +477,29 @@ export default {
},
{
label: '调整后化验值(g/L)',
prop: 'createUser',
prop: 'repeatTestValue',
sortable: true,
filter: true,
span: 8,
search: false,
width: 170,
cell: true,
type:'select',
dictData:[
{
label:'合格',
value:1,
},
{
label:"不合格",
value:2
}
]
},
{
label: '是否合格',
prop: 'createUser',
prop: 'qualified',
sortable: true,
filter: true,
span: 8,
@ -541,15 +560,38 @@ export default {
},
methods: {
handleLine() {
this.reportData = []
this.lineBox = true
},
createLine() {
this.data = [
{ $cellEdit: true, id: '1', lineName: '氰化钠', wcName: '化学镀镍作业中心', slotNo: '#21', testName: '氰化钠', lineTime: '2016-10-15 ~ 2016-10-21', createTime: '2016-09-21 08:50:08', createUser: '张三' },
{ $cellEdit: true, id: '2', lineName: '氰化钠', wcName: '化学镀镍作业中心', slotNo: '#21', testName: '氰化钠', lineTime: '2016-10-15 ~ 2016-10-21', createTime: '2016-09-21 08:50:08', createUser: '张三' },
{ $cellEdit: true, id: '3', lineName: '氰化钠', wcName: '化学镀镍作业中心', slotNo: '#21', testName: '氰化钠', lineTime: '2016-10-10 ~ 2016-10-21', createTime: '2016-09-21 08:50:08', createUser: '张三' },
{ $cellEdit: true, id: '4', lineName: '氰化钠', wcName: '化学镀镍作业中心', slotNo: '#21', testName: '氰化钠', lineTime: '2016-10-18 ~ 2016-10-21', createTime: '2016-09-21 08:50:08', createUser: '张三' },
]
// 传 作业中心 workCenterId 作业槽workTankId 槽液liquidTankId 分析项目testElement 时间范围 createTimeStart createTimeEnd
console.log('lineForm--------',this.lineForm)
let params = {
workCenterId:this.lineForm.workCenterId,
workTankId:this.lineForm.workTankId,
testElement:this.lineForm.testElement,
createTimeStart:this.lineForm.timeRange.length != 0 ? this.lineForm.timeRange[0] : '',
createTimeEnd:this.lineForm.timeRange.length != 0 ? this.lineForm.timeRange[1] : '',
}
generateReport(params).then(res =>{
this.reportData = res.data.data.records.map(item =>{
return {
$cellEdit:true,
...item
}
})
console.log('this.reportData===============',this.reportData)
})
// this.data = [
// { $cellEdit: true, id: '1', lineName: '氰化钠', wcName: '化学镀镍作业中心', slotNo: '#21', testName: '氰化钠', lineTime: '2016-10-15 ~ 2016-10-21', createTime: '2016-09-21 08:50:08', createUser: '张三' },
// { $cellEdit: true, id: '2', lineName: '氰化钠', wcName: '化学镀镍作业中心', slotNo: '#21', testName: '氰化钠', lineTime: '2016-10-15 ~ 2016-10-21', createTime: '2016-09-21 08:50:08', createUser: '张三' },
// { $cellEdit: true, id: '3', lineName: '氰化钠', wcName: '化学镀镍作业中心', slotNo: '#21', testName: '氰化钠', lineTime: '2016-10-10 ~ 2016-10-21', createTime: '2016-09-21 08:50:08', createUser: '张三' },
// { $cellEdit: true, id: '4', lineName: '氰化钠', wcName: '化学镀镍作业中心', slotNo: '#21', testName: '氰化钠', lineTime: '2016-10-18 ~ 2016-10-21', createTime: '2016-09-21 08:50:08', createUser: '张三' },
// ]
},
// 作业中心下拉
getWorkCenterList(){

2
src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
Unescape View File

@ -378,7 +378,7 @@ export default {
},
{
label: '上次化验时间',
prop: 'lastTest',
prop: 'firstTestDate',
search: false,
sortable: true,
filter: true,

Write Preview
Loading…
Cancel
Save