Skip to content

P
patzn-cloud-web-back-soil
Commit 799ca6b8 by lichengming
Options

修改了导入检测项目

parent c4219da5
Showing with 109 additions and 69 deletions
components/base/VXESettingCol.vue
......@@ -22,7 +22,7 @@
</el-checkbox-group>
</div>
<div slot="footer" class="btn-width">
<Button @click="_cancel" type="ghost" style="margin-left: 8px">取消</Button>
<Button @click="_cancel" style="margin-left: 8px">取消</Button>
<Button @click="_ok" :loading="isLoading" type="primary">保存</Button>
</div>
</Modal>
......
pages/meter-review/contractTab/ContractLeftList.vue
......@@ -60,6 +60,7 @@
</div>
</template>
<script>
import { meterManage } from '../../../api'
import SelectInput from './SelectInput'
// import FoodContractCompanyDetail from '../../../marketManage/food-contract-company/FoodContractCompanyDetail'
// import FoodContractGovernDetail from '../../../marketManage/food-contract-govern/FoodContractGovernDetail'
......@@ -128,6 +129,7 @@ export default {
},
_open() {
// this._dicSearch()
this._page()
},
_searchParams() {
const obj = {}
......@@ -138,13 +140,28 @@ export default {
}
return obj
},
_page() {
this.$refs.pageTable._page(
'data-input-contract-left',
'FoodContract/dataInputContractLeft',
this._searchParams()
)
_page: async function() {
console.log(9522123)
// this.$refs.pageTable._page('search-form-package', 'FoodJudgeBasis/page')
// Object.assign(this.formObj, this.$refs.pageTable._searchParams())
// console.log('this.formObj', this.formObj)
const result = await meterManage.page(this.formObj)
if (result) {
console.log(55555)
console.log(result)
this.getPage = result
console.log(123456789)
console.log(this.getPage)
this.$refs.pageTable._hideLoading()
}
},
// _page() {
// // this.$refs.pageTable._page(
// // 'data-input-contract-left',
// // 'FoodContract/dataInputContractLeft',
// // this._searchParams()
// // )
// },
_tableResultChange(msg, data) {
switch (msg) {
case 'page':
......
pages/meter-review/contractTab/ContractRightList.vue
......@@ -25,7 +25,7 @@
</Col>
<!--操作-->
<Col span="24">
<BtnList :msg="btn" @on-result-change="_btnClick" :showBtnNum="7" class="contHide"></BtnList>
<btn-list :msg="btn" @on-result-change="_btnClick" :showBtnNum="7" class="contHide"></btn-list>
</Col>
<Col span="24">
<PTVXETableData
......@@ -241,6 +241,7 @@
</div>
</template>
<script>
import { meterManageItem } from '../../../api'
// import AutoCompletes from '../../../components/base/AutoCompletes'
import SelEquip from '../../../components/select-equip/SelEquip'
import AssignPerson from '../../../components/user-info-single/AssignPerson'
......@@ -307,6 +308,12 @@ export default {
},
data() {
return {
formObj: {
aptitudeId: [],
name: '',
code: '',
standardName: ''
},
tableName: 'food-data-input-contract-right',
// 用户自己选中的列
userColumns: [],
......@@ -320,12 +327,12 @@ export default {
optionList: [
{ key: 'name', name: '检测项目', placeholder: '请输入检测项目' },
{ key: 'testBasis', name: '检测依据', placeholder: '请输入检测依据' },
{
key: 'qualifiedValue',
name: '结果判定',
placeholder: '请选择结果判定',
multiple: true
},
// {
// key: 'qualifiedValue',
// name: '结果判定',
// placeholder: '请选择结果判定',
// multiple: true
// },
{ key: 'num', name: '样品编号', placeholder: '请输入样品编号' },
{ key: 'code', name: '委托编号', placeholder: '请输入委托编号' },
{ key: 'sampleName', name: '样品名称', placeholder: '请输入样品名称' },
......@@ -453,58 +460,60 @@ export default {
singleConclusionList: [],
detectionTypeList: [],
detectionDate: '',
getPage: {},
getPage: {
records: []
},
pageColumns: [
{ title: '检测项目', key: 'name', width: 120, fixed: 'left' },
{ title: '样品编号', key: 'num', width: 180, fixed: 'left' },
{ title: '样品名称', key: 'sampleName', width: 140 },
{ title: '产品', key: 'subClass', width: 160 },
{ title: '检测值', key: 'testValue', width: 120, editCell: true },
{ title: '单位', key: 'unit', width: 120, editCell: true },
{ title: '限量', key: 'limitDefault', width: 120, editCell: true },
{ title: '限量类别', key: 'limitType', width: 160, editCell: true },
{ title: '说明', key: 'labRemark', width: 140, editCell: true },
{ title: '结果判定', key: 'qualified', width: 120, editCell: true },
{
title: '单项结论',
key: 'singleConclusion',
width: 200,
editCell: true
},
{ title: '复测值', key: 'retestValue', width: 120, editCell: true },
{ title: '是否判定', key: 'judged', width: 100 },
{ title: '委托单位', key: 'cname', width: 180 },
{ title: '委托编号', key: 'code', width: 180 },
{ title: '制单日期', key: 'ctime', width: 120, date: true },
{ title: '数据出具日期', key: 'resultDate', width: 120, date: true },
{ title: '计划完成时间', key: 'planEndDate', width: 120, date: true },
{ title: '距离收检工作日', key: 'distanceWeekdays', width: 130 },
{ title: '应出报告日期', key: 'reportDueDate', width: 120, date: true },
{ title: '检测依据', key: 'testBasisFull', width: 380, editCell: true },
{ title: '检测方法', key: 'testMethod', width: 220, editCell: true },
{ title: '检出类别', key: 'detectionType', width: 140, editCell: true },
{ title: '检出限', key: 'detection', width: 120, editCell: true },
{
title: '检出限单位',
key: 'detectionUnit',
width: 120,
editCell: true
},
{ title: '判定依据', key: 'judgeBasis', width: 160, editCell: true },
{
title: '判定依据名称',
key: 'judgeBasisName',
width: 220,
editCell: true
},
{ title: '仪器编号', key: 'equipNum', width: 200 },
{ title: '仪器名称', key: 'equipName', width: 220 },
{ title: '分析时间', key: 'analysisDate', width: 240, editCell: true },
{ title: '排序号', key: 'sortNo', width: 220 },
{ title: '类别', key: 'firstDetectClass', width: 220 },
{ title: '项目备注', key: 'remark' },
{ title: '样品备注', key: 'sampleRemark' },
{ title: '委托备注', key: 'contractRemark' }
{ title: '比较符', key: 'compare', width: 180, fixed: 'left' },
{ title: '限量值', key: 'limitValue', width: 140 },
{ title: '单位', key: 'unit', width: 160 },
{ title: '是否判定', key: 'judged', width: 120, editCell: true },
{ title: '备注', key: 'remark', width: 120, editCell: true }
// { title: '限量', key: 'limitDefault', width: 120, editCell: true },
// { title: '限量类别', key: 'limitType', width: 160, editCell: true },
// { title: '说明', key: 'labRemark', width: 140, editCell: true },
// { title: '结果判定', key: 'qualified', width: 120, editCell: true },
// {
// title: '单项结论',
// key: 'singleConclusion',
// width: 200,
// editCell: true
// },
// { title: '复测值', key: 'retestValue', width: 120, editCell: true },
// { title: '是否判定', key: 'judged', width: 100 },
// { title: '委托单位', key: 'cname', width: 180 },
// { title: '委托编号', key: 'code', width: 180 },
// { title: '制单日期', key: 'ctime', width: 120, date: true },
// { title: '数据出具日期', key: 'resultDate', width: 120, date: true },
// { title: '计划完成时间', key: 'planEndDate', width: 120, date: true },
// { title: '距离收检工作日', key: 'distanceWeekdays', width: 130 },
// { title: '应出报告日期', key: 'reportDueDate', width: 120, date: true },
// { title: '检测依据', key: 'testBasisFull', width: 380, editCell: true },
// { title: '检测方法', key: 'testMethod', width: 220, editCell: true },
// { title: '检出类别', key: 'detectionType', width: 140, editCell: true },
// { title: '检出限', key: 'detection', width: 120, editCell: true },
// {
// title: '检出限单位',
// key: 'detectionUnit',
// width: 120,
// editCell: true
// },
// { title: '判定依据', key: 'judgeBasis', width: 160, editCell: true },
// {
// title: '判定依据名称',
// key: 'judgeBasisName',
// width: 220,
// editCell: true
// },
// { title: '仪器编号', key: 'equipNum', width: 200 },
// { title: '仪器名称', key: 'equipName', width: 220 },
// { title: '分析时间', key: 'analysisDate', width: 240, editCell: true },
// { title: '排序号', key: 'sortNo', width: 220 },
// { title: '类别', key: 'firstDetectClass', width: 220 },
// { title: '项目备注', key: 'remark' },
// { title: '样品备注', key: 'sampleRemark' },
// { title: '委托备注', key: 'contractRemark' }
// {title: '委托编号', key: 'code', width: 180},
// {title: '状态', key: 'progress', width: 120,},
// {title: '样品状态', key: 'sampleStatus', width: 120,},
......@@ -988,8 +997,21 @@ export default {
break
}
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
// _formSearch() {
// // this.$refs.pageTable._pageChange(1)
// },
_formSearch: async function() {
// this.formObj.aptitudeId = this.leftSelectIds[i]
// Object.assign(this.formObj, this.$refs.pageTable._searchParams())
// console.log('this.formObj', this.formObj)
const result = await meterManageItem.page(this.leftSelectIds)
console.log('请求的结果', result)
if (result) {
this.getPage = result
// this.getPage.records.push(result[i])
this.$refs.pageTable._hideLoading()
console.log(result)
}
},
// 获取检测标准
_testBasisList(data) {
......
pages/meter-review/contractTab/ContractTab.vue
......@@ -33,14 +33,15 @@ export default {
_open() {
// this.formObj.entrustId = id
this.showModal = true
this.$refs.leftModal._open()
// this._page()
},
_leftResult(data, personal) {
// this.$refs.rightModal._open(data, personal)
console.log(data, personal)
this.$refs.rightModal._open(data, personal)
// console.log(data, personal)
},
_rightResult() {
// this.$refs.leftModal._page()
this.$refs.leftModal._page()
}
// _open() {
// this.$refs.leftModal._open()
......
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